← Back to branch summary

~ubuntu-branches/ubuntu/wily/scribus/wily-proposed

« back to all changes in this revision

Viewing changes to scribus/scrapbookpalette.cpp

  • Committer: Package Import Robot
  • Author(s): Oleksandr Moskalenko
  • Date: 2012-02-09 21:50:56 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120209215056-2wrx1ara0jbm7fi5
Tags: 1.4.0.dfsg+r17287-1
http://bugs.debian.org/654703
http://bugs.debian.org/655885
http://bugs.debian.org/630751
* New upstream stable release upload into Debian (Closes: #654703).
* Applied the Ubuntu armel patch.
* Removed non-free color swatches from resources.
* debian/control:
  - Moved icc-profiles from Recommends to Suggests (Closes: #655885).
  - Updated Standards-Version to 3.9.2.
  - Updated extended description per lintian warning.
* debian/rules:
  - Update mailcap (Closes: #630751). A request for mime.types update has
    been sent to the mime-support maintainer.
  - Added build-arch and build-indep targets per lintian warning.
* debian/patches:
  - top_cmakelists.patch - don't copy extra docs and changelogs.
  - scribus_cmakelists.patch - don't copy extra docs and changelogs.
  - scribus_cmakelists.patch - don't install the non-free "doc" dir.
  - profiles_cmakelists.patch - don't install non-free sRGB profile.
* debian/copyright: 
  - Converted to the DEP5 machine readable foramt.
  - Added licenses for free color swatches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scribus/scrapbookpalette.cpp
134
134
                        return;
135
135
                QString nam, tmp = "";
136
136
                QString text = e->mimeData()->text();
137
 
                if (text.startsWith("<SCRIBUSELEM"))
 
137
                int startElemPos = text.left(512).indexOf("<SCRIBUSELEM");
 
138
                if (startElemPos >= 0)
138
139
                        emit objDropped(text);
139
140
        }
140
141
        else
181
182
        if (hasImage)
182
183
        {
183
184
                QDir dd = QDir(dir);
184
 
                dd.mkdir(QDir::cleanPath(QDir::convertSeparators(dir + "/" + fid.baseName())));
 
185
                dd.mkdir(QDir::cleanPath(QDir::toNativeSeparators(dir + "/" + fid.baseName())));
185
186
        }
186
187
        QString source = "";
187
188
        QString target = "";
203
204
                                {
204
205
                                        if (static_cast<bool>(pg.attribute("relativePaths", "0").toInt()))
205
206
                                        {
206
 
                                                QFileInfo pfi2(QDir::cleanPath(QDir::convertSeparators(dir+"/"+Pfile)));
 
207
                                                QFileInfo pfi2(QDir::cleanPath(QDir::toNativeSeparators(dir+"/"+Pfile)));
207
208
                                                source = pfi2.absoluteFilePath();
208
209
                                        }
209
210
                                        else
210
211
                                        {
211
212
                                                QFileInfo fi(Pfile);
212
 
                                                source = QDir::cleanPath(QDir::convertSeparators(QDir::homePath()+"/"+Pfile));
 
213
                                                source = QDir::cleanPath(QDir::toNativeSeparators(QDir::homePath()+"/"+Pfile));
213
214
                                        }
214
215
                                        QFileInfo fi(Pfile);
215
 
                                        QString target = QDir::cleanPath(QDir::convertSeparators(dir + "/" + fid.baseName() + "/" + fi.fileName()));
 
216
                                        QString target = QDir::cleanPath(QDir::toNativeSeparators(dir + "/" + fid.baseName() + "/" + fi.fileName()));
216
217
                                        copyFile(source, target);
217
218
                                        pg.setAttribute("PFILE", fid.baseName() + "/" + fi.fileName());
218
219
                                }
221
222
                                {
222
223
                                        if (static_cast<bool>(pg.attribute("relativePaths", "0").toInt()))
223
224
                                        {
224
 
                                                QFileInfo pfi2(QDir::cleanPath(QDir::convertSeparators(dir+"/"+Pfile2)));
 
225
                                                QFileInfo pfi2(QDir::cleanPath(QDir::toNativeSeparators(dir+"/"+Pfile2)));
225
226
                                                source = pfi2.absoluteFilePath();
226
227
                                        }
227
228
                                        else
228
229
                                        {
229
230
                                                QFileInfo fi(Pfile2);
230
 
                                                source = QDir::cleanPath(QDir::convertSeparators(QDir::homePath()+"/"+Pfile));
 
231
                                                source = QDir::cleanPath(QDir::toNativeSeparators(QDir::homePath()+"/"+Pfile));
231
232
                                        }
232
233
                                        QFileInfo fi(Pfile2);
233
 
                                        QString target = QDir::cleanPath(QDir::convertSeparators(dir + "/" + fid.baseName() + "/" + fi.fileName()));
 
234
                                        QString target = QDir::cleanPath(QDir::toNativeSeparators(dir + "/" + fid.baseName() + "/" + fi.fileName()));
234
235
                                        copyFile(source, target);
235
236
                                        pg.setAttribute("PFILE2", fid.baseName() + "/" + fi.fileName());
236
237
                                }
239
240
                                {
240
241
                                        if (static_cast<bool>(pg.attribute("relativePaths", "0").toInt()))
241
242
                                        {
242
 
                                                QFileInfo pfi2(QDir::cleanPath(QDir::convertSeparators(dir+"/"+Pfile3)));
 
243
                                                QFileInfo pfi2(QDir::cleanPath(QDir::toNativeSeparators(dir+"/"+Pfile3)));
243
244
                                                source = pfi2.absoluteFilePath();
244
245
                                        }
245
246
                                        else
246
247
                                        {
247
248
                                                QFileInfo fi(Pfile3);
248
 
                                                source = QDir::cleanPath(QDir::convertSeparators(QDir::homePath()+"/"+Pfile3));
 
249
                                                source = QDir::cleanPath(QDir::toNativeSeparators(QDir::homePath()+"/"+Pfile3));
249
250
                                        }
250
251
                                        QFileInfo fi(Pfile3);
251
 
                                        QString target = QDir::cleanPath(QDir::convertSeparators(dir + "/" + fid.baseName() + "/" + fi.fileName()));
 
252
                                        QString target = QDir::cleanPath(QDir::toNativeSeparators(dir + "/" + fid.baseName() + "/" + fi.fileName()));
252
253
                                        copyFile(source, target);
253
254
                                        pg.setAttribute("PFILE3", fid.baseName() + "/" + fi.fileName());
254
255
                                }
275
276
                for (uint dc = 0; dc < d.count(); ++dc)
276
277
                {
277
278
                        QByteArray cf;
278
 
                        if (!loadRawText(QDir::cleanPath(QDir::convertSeparators(oldName + "/" + d[dc])), cf))
 
279
                        if (!loadRawText(QDir::cleanPath(QDir::toNativeSeparators(oldName + "/" + d[dc])), cf))
279
280
                                continue;
280
281
                        QString ff = QString::fromUtf8(cf.data());
281
282
                        QPixmap pm;
282
 
                        QFileInfo fi(QDir::cleanPath(QDir::convertSeparators(oldName + "/" + d[dc])));
283
 
                        QFileInfo fi2(QDir::cleanPath(QDir::convertSeparators(fi.path()+"/"+fi.baseName()+".png")));
 
283
                        QFileInfo fi(QDir::cleanPath(QDir::toNativeSeparators(oldName + "/" + d[dc])));
 
284
                        QFileInfo fi2(QDir::cleanPath(QDir::toNativeSeparators(fi.path()+"/"+fi.baseName()+".png")));
284
285
                        if (fi2.exists())
285
 
                                pm.load(QDir::cleanPath(QDir::convertSeparators(fi.path()+"/"+fi.baseName()+".png")));
 
286
                                pm.load(QDir::cleanPath(QDir::toNativeSeparators(fi.path()+"/"+fi.baseName()+".png")));
286
287
                        else
287
288
                        {
288
289
                                QString f;
294
295
                                pm = pre->createPreview(f);
295
296
                                delete pre;
296
297
                        }
297
 
                        QFileInfo fi3(QDir::cleanPath(QDir::convertSeparators(name + "/" + d[dc])));
298
 
                        pm.save(QDir::cleanPath(QDir::convertSeparators(fi3.path()+"/"+fi3.baseName()+".png")), "PNG");
299
 
                        checkAndChange(ff, QDir::cleanPath(QDir::convertSeparators(name + "/" + d[dc])), QDir::cleanPath(QDir::convertSeparators(name)));
 
298
                        QFileInfo fi3(QDir::cleanPath(QDir::toNativeSeparators(name + "/" + d[dc])));
 
299
                        pm.save(QDir::cleanPath(QDir::toNativeSeparators(fi3.path()+"/"+fi3.baseName()+".png")), "PNG");
 
300
                        checkAndChange(ff, QDir::cleanPath(QDir::toNativeSeparators(name + "/" + d[dc])), QDir::cleanPath(QDir::toNativeSeparators(name)));
300
301
                }
301
302
        }
302
303
        QDir d2(oldName, "*.sml", QDir::Name, QDir::Files | QDir::Readable | QDir::NoSymLinks);
305
306
                for (uint dc = 0; dc < d2.count(); ++dc)
306
307
                {
307
308
                        QByteArray cf;
308
 
                        if (!loadRawText(QDir::cleanPath(QDir::convertSeparators(oldName + "/" + d2[dc])), cf))
 
309
                        if (!loadRawText(QDir::cleanPath(QDir::toNativeSeparators(oldName + "/" + d2[dc])), cf))
309
310
                                continue;
310
 
                        QFile fil(QDir::cleanPath(QDir::convertSeparators(name + "/" + d2[dc])));
 
311
                        QFile fil(QDir::cleanPath(QDir::toNativeSeparators(name + "/" + d2[dc])));
311
312
                        if(!fil.open(QIODevice::WriteOnly))
312
313
                                continue ;
313
314
                        QDataStream s(&fil);
314
315
                        s.writeRawData(cf.data(), cf.length());
315
316
                        fil.close();
316
317
                        QPixmap pm;
317
 
                        QFileInfo fi(QDir::cleanPath(QDir::convertSeparators(oldName + "/" + d2[dc])));
318
 
                        QFileInfo fi2(QDir::cleanPath(QDir::convertSeparators(fi.path()+"/"+fi.baseName()+".png")));
 
318
                        QFileInfo fi(QDir::cleanPath(QDir::toNativeSeparators(oldName + "/" + d2[dc])));
 
319
                        QFileInfo fi2(QDir::cleanPath(QDir::toNativeSeparators(fi.path()+"/"+fi.baseName()+".png")));
319
320
                        if (fi2.exists())
320
 
                                pm.load(QDir::cleanPath(QDir::convertSeparators(fi.path()+"/"+fi.baseName()+".png")));
 
321
                                pm.load(QDir::cleanPath(QDir::toNativeSeparators(fi.path()+"/"+fi.baseName()+".png")));
321
322
                        else
322
323
                        {
323
324
                                QString f = QString::fromUtf8(cf.data());
325
326
                                pm = pre->createPreview(f);
326
327
                                delete pre;
327
328
                        }
328
 
                        QFileInfo fi3(QDir::cleanPath(QDir::convertSeparators(name + "/" + d2[dc])));
329
 
                        pm.save(QDir::cleanPath(QDir::convertSeparators(fi3.path()+"/"+fi3.baseName()+".png")), "PNG");
 
329
                        QFileInfo fi3(QDir::cleanPath(QDir::toNativeSeparators(name + "/" + d2[dc])));
 
330
                        pm.save(QDir::cleanPath(QDir::toNativeSeparators(fi3.path()+"/"+fi3.baseName()+".png")), "PNG");
330
331
                }
331
332
        }
332
333
        QDir d3(name, "*.shape", QDir::Name, QDir::Files | QDir::Readable | QDir::NoSymLinks);
335
336
                for (uint dc = 0; dc < d3.count(); ++dc)
336
337
                {
337
338
                        QByteArray cf;
338
 
                        if (!loadRawText(QDir::cleanPath(QDir::convertSeparators(oldName + "/" + d3[dc])), cf))
 
339
                        if (!loadRawText(QDir::cleanPath(QDir::toNativeSeparators(oldName + "/" + d3[dc])), cf))
339
340
                                continue;
340
 
                        QFile fil(QDir::cleanPath(QDir::convertSeparators(name + "/" + d3[dc])));
 
341
                        QFile fil(QDir::cleanPath(QDir::toNativeSeparators(name + "/" + d3[dc])));
341
342
                        if(!fil.open(QIODevice::WriteOnly))
342
343
                                continue ;
343
344
                        QDataStream s(&fil);
344
345
                        s.writeRawData(cf.data(), cf.length());
345
346
                        fil.close();
346
347
                        QPixmap pm;
347
 
                        QFileInfo fi(QDir::cleanPath(QDir::convertSeparators(oldName + "/" + d3[dc])));
348
 
                        QFileInfo fi2(QDir::cleanPath(QDir::convertSeparators(fi.path()+"/"+fi.baseName()+".png")));
 
348
                        QFileInfo fi(QDir::cleanPath(QDir::toNativeSeparators(oldName + "/" + d3[dc])));
 
349
                        QFileInfo fi2(QDir::cleanPath(QDir::toNativeSeparators(fi.path()+"/"+fi.baseName()+".png")));
349
350
                        if (fi2.exists())
350
 
                                pm.load(QDir::cleanPath(QDir::convertSeparators(fi.path()+"/"+fi.baseName()+".png")));
 
351
                                pm.load(QDir::cleanPath(QDir::toNativeSeparators(fi.path()+"/"+fi.baseName()+".png")));
351
352
                        else
352
353
                        {
353
354
                                QString f = QString::fromUtf8(cf.data());
358
359
                                delete pre;
359
360
                                delete pre2;
360
361
                        }
361
 
                        QFileInfo fi3(QDir::cleanPath(QDir::convertSeparators(name + "/" + d3[dc])));
362
 
                        pm.save(QDir::cleanPath(QDir::convertSeparators(fi3.path()+"/"+fi3.baseName()+".png")), "PNG");
 
362
                        QFileInfo fi3(QDir::cleanPath(QDir::toNativeSeparators(name + "/" + d3[dc])));
 
363
                        pm.save(QDir::cleanPath(QDir::toNativeSeparators(fi3.path()+"/"+fi3.baseName()+".png")), "PNG");
363
364
                }
364
365
        }
365
366
}
390
391
                QDomElement dc=DOC.toElement();
391
392
                if (dc.tagName()=="OBJEKT")
392
393
                {
393
 
                        QFile fi(QDir::cleanPath(QDir::convertSeparators(newName + "/" + GetAttr(&dc, "NAME") + ".sce")));
 
394
                        QFile fi(QDir::cleanPath(QDir::toNativeSeparators(newName + "/" + GetAttr(&dc, "NAME") + ".sce")));
394
395
                        if(!fi.open(QIODevice::WriteOnly))
395
396
                                continue ;
396
397
                        QDataStream s(&fi);
408
409
        clear();
409
410
        objectMap.clear();
410
411
        QString nd;
411
 
        if (name.endsWith(QDir::convertSeparators("/")))
 
412
        if (name.endsWith(QDir::toNativeSeparators("/")))
412
413
                nd = name.left(name.length()-1);
413
414
        QDir d(name, "*.sce", QDir::Name, QDir::Files | QDir::Readable | QDir::NoSymLinks);
414
415
        if ((d.exists()) && (d.count() != 0))
417
418
                {
418
419
                        QPixmap pm;
419
420
                        QByteArray cf;
420
 
                        if (!loadRawText(QDir::cleanPath(QDir::convertSeparators(name + "/" + d[dc])), cf))
 
421
                        if (!loadRawText(QDir::cleanPath(QDir::toNativeSeparators(name + "/" + d[dc])), cf))
421
422
                                continue;
422
 
                        QFileInfo fi(QDir::cleanPath(QDir::convertSeparators(name + "/" + d[dc])));
423
 
                        QFileInfo fi2(QDir::cleanPath(QDir::convertSeparators(fi.path()+"/"+fi.baseName()+".png")));
 
423
                        QFileInfo fi(QDir::cleanPath(QDir::toNativeSeparators(name + "/" + d[dc])));
 
424
                        QFileInfo fi2(QDir::cleanPath(QDir::toNativeSeparators(fi.path()+"/"+fi.baseName()+".png")));
424
425
                        if (fi2.exists())
425
 
                                pm.load(QDir::cleanPath(QDir::convertSeparators(fi.path()+"/"+fi.baseName()+".png")));
 
426
                                pm.load(QDir::cleanPath(QDir::toNativeSeparators(fi.path()+"/"+fi.baseName()+".png")));
426
427
                        else
427
428
                        {
428
429
                                QString f;
433
434
                                ScPreview *pre = new ScPreview();
434
435
                                pm = pre->createPreview(f);
435
436
                                if (canWrite)
436
 
                                        pm.save(QDir::cleanPath(QDir::convertSeparators(fi.path()+"/"+fi.baseName()+".png")), "PNG");
 
437
                                        pm.save(QDir::cleanPath(QDir::toNativeSeparators(fi.path()+"/"+fi.baseName()+".png")), "PNG");
437
438
                                delete pre;
438
439
                        }
439
 
                        AddObj(fi.baseName(), QDir::cleanPath(QDir::convertSeparators(name + "/" + d[dc])), pm);
 
440
                        AddObj(fi.baseName(), QDir::cleanPath(QDir::toNativeSeparators(name + "/" + d[dc])), pm);
440
441
                }
441
442
        }
442
443
        QDir d2(name, "*.sml", QDir::Name, QDir::Files | QDir::Readable | QDir::NoSymLinks);
446
447
                {
447
448
                        QPixmap pm;
448
449
                        QByteArray cf;
449
 
                        if (!loadRawText(QDir::cleanPath(QDir::convertSeparators(name + "/" + d2[dc])), cf))
 
450
                        if (!loadRawText(QDir::cleanPath(QDir::toNativeSeparators(name + "/" + d2[dc])), cf))
450
451
                                continue;
451
 
                        QFileInfo fi(QDir::cleanPath(QDir::convertSeparators(name + "/" + d2[dc])));
452
 
                        QFileInfo fi2(QDir::cleanPath(QDir::convertSeparators(fi.path()+"/"+fi.baseName()+".png")));
 
452
                        QFileInfo fi(QDir::cleanPath(QDir::toNativeSeparators(name + "/" + d2[dc])));
 
453
                        QFileInfo fi2(QDir::cleanPath(QDir::toNativeSeparators(fi.path()+"/"+fi.baseName()+".png")));
453
454
                        if (fi2.exists())
454
 
                                pm.load(QDir::cleanPath(QDir::convertSeparators(fi.path()+"/"+fi.baseName()+".png")));
 
455
                                pm.load(QDir::cleanPath(QDir::toNativeSeparators(fi.path()+"/"+fi.baseName()+".png")));
455
456
                        else
456
457
                        {
457
458
                                QString f = QString::fromUtf8(cf.data());
458
459
                                StencilReader *pre = new StencilReader();
459
460
                                pm = pre->createPreview(f);
460
461
                                if (canWrite)
461
 
                                        pm.save(QDir::cleanPath(QDir::convertSeparators(fi.path()+"/"+fi.baseName()+".png")), "PNG");
 
462
                                        pm.save(QDir::cleanPath(QDir::toNativeSeparators(fi.path()+"/"+fi.baseName()+".png")), "PNG");
462
463
                                delete pre;
463
464
                        }
464
 
                        AddObj(fi.baseName(), QDir::cleanPath(QDir::convertSeparators(name + "/" + d2[dc])), pm);
 
465
                        AddObj(fi.baseName(), QDir::cleanPath(QDir::toNativeSeparators(name + "/" + d2[dc])), pm);
465
466
                }
466
467
        }
467
468
        QDir d3(name, "*.shape", QDir::Name, QDir::Files | QDir::Readable | QDir::NoSymLinks);
471
472
                {
472
473
                        QPixmap pm;
473
474
                        QByteArray cf;
474
 
                        if (!loadRawText(QDir::cleanPath(QDir::convertSeparators(name + "/" + d3[dc])), cf))
 
475
                        if (!loadRawText(QDir::cleanPath(QDir::toNativeSeparators(name + "/" + d3[dc])), cf))
475
476
                                continue;
476
 
                        QFileInfo fi(QDir::cleanPath(QDir::convertSeparators(name + "/" + d3[dc])));
477
 
                        QFileInfo fi2(QDir::cleanPath(QDir::convertSeparators(fi.path()+"/"+fi.baseName()+".png")));
478
 
                        QFileInfo fi2p(QDir::cleanPath(QDir::convertSeparators(fi.path()+"/"+fi.baseName()+".xpm")));
 
477
                        QFileInfo fi(QDir::cleanPath(QDir::toNativeSeparators(name + "/" + d3[dc])));
 
478
                        QFileInfo fi2(QDir::cleanPath(QDir::toNativeSeparators(fi.path()+"/"+fi.baseName()+".png")));
 
479
                        QFileInfo fi2p(QDir::cleanPath(QDir::toNativeSeparators(fi.path()+"/"+fi.baseName()+".xpm")));
479
480
                        if ((fi2.exists()) || (fi2p.exists()))
480
481
                        {
481
482
                                if (fi2.exists())
482
 
                                        pm.load(QDir::cleanPath(QDir::convertSeparators(fi.path()+"/"+fi.baseName()+".png")));
 
483
                                        pm.load(QDir::cleanPath(QDir::toNativeSeparators(fi.path()+"/"+fi.baseName()+".png")));
483
484
                                else
484
 
                                        pm.load(QDir::cleanPath(QDir::convertSeparators(fi.path()+"/"+fi.baseName()+".xpm")));
 
485
                                        pm.load(QDir::cleanPath(QDir::toNativeSeparators(fi.path()+"/"+fi.baseName()+".xpm")));
485
486
                        }
486
487
                        else
487
488
                        {
491
492
                                ScPreview *pre2 = new ScPreview();
492
493
                                pm = pre2->createPreview(f2);
493
494
                                if (canWrite)
494
 
                                        pm.save(QDir::cleanPath(QDir::convertSeparators(fi.path()+"/"+fi.baseName()+".png")), "PNG");
 
495
                                        pm.save(QDir::cleanPath(QDir::toNativeSeparators(fi.path()+"/"+fi.baseName()+".png")), "PNG");
495
496
                                delete pre;
496
497
                                delete pre2;
497
498
                        }
498
 
                        AddObj(fi.baseName(), QDir::cleanPath(QDir::convertSeparators(name + "/" + d3[dc])), pm);
 
499
                        AddObj(fi.baseName(), QDir::cleanPath(QDir::toNativeSeparators(name + "/" + d3[dc])), pm);
499
500
                }
500
501
        }
501
502
        QMap<QString,Elem>::Iterator itf;
753
754
        
754
755
        if (!s.isEmpty())
755
756
        {
756
 
                dirs->set("old_scrap_load", s.left(s.lastIndexOf(QDir::convertSeparators("/"))));
 
757
                dirs->set("old_scrap_load", s.left(s.lastIndexOf(QDir::toNativeSeparators("/"))));
757
758
                
758
759
                QString scrapbookFileO = s;
759
760
                QFileInfo scrapbookFileInfoO = QFileInfo(scrapbookFileO);
924
925
        BibView* bv = (BibView*)Frame3->widget(id);
925
926
        if (bv->objectMap.contains(nam))
926
927
        {
927
 
                Query *dia = new Query(this, "tt", 1, 0, tr("&Name:"), tr("New Entry"));
928
 
                dia->setEditText(nam, true);
929
 
                if (dia->exec())
930
 
                {
931
 
                        nam = dia->getEditText();
932
 
                        while (activeBView->objectMap.contains(nam))
933
 
                        {
934
 
                                if (!dia->exec())
935
 
                                {
936
 
                                        delete dia;
937
 
                                        return false;
938
 
                                }
939
 
                                nam = dia->getEditText();
940
 
                        }
941
 
                }
 
928
                Query dia(this, "tt", 1, 0, tr("&Name:"), tr("New Entry"));
 
929
                dia.setEditText(nam, true);
 
930
                dia.setTestList(activeBView->objectMap.keys());
 
931
                if (dia.exec())
 
932
                        nam = dia.getEditText();
942
933
                else
943
 
                {
944
 
                        delete dia;
945
934
                        return false;
946
 
                }
947
935
        }
948
936
        QPixmap pm;
949
937
        QByteArray cf;
952
940
        pm = activeBView->objectMap[ite->text()].Preview;
953
941
        QString dt = activeBView->objectMap[ite->text()].Data;
954
942
        QFileInfo fi(dt);
955
 
        QFile f(QDir::cleanPath(QDir::convertSeparators(bv->ScFilename + "/" + nam + "." + fi.completeSuffix().toLower())));
 
943
        QFile f(QDir::cleanPath(QDir::toNativeSeparators(bv->ScFilename + "/" + nam + "." + fi.completeSuffix().toLower())));
956
944
        if(!f.open(QIODevice::WriteOnly))
957
945
                return false;
958
946
        QDataStream s;
959
947
        s.setDevice(&f);
960
948
        s.writeRawData(cf.data(), cf.length());
961
949
        f.close();
962
 
        bv->AddObj(nam, QDir::cleanPath(QDir::convertSeparators(bv->ScFilename + "/" + nam + "." + fi.completeSuffix().toLower())), pm);
963
 
        pm.save(QDir::cleanPath(QDir::convertSeparators(bv->ScFilename + "/" + nam +".png")), "PNG");
964
 
        QFileInfo fiD(QDir::convertSeparators(activeBView->ScFilename + "/" + fi.baseName()));
 
950
        bv->AddObj(nam, QDir::cleanPath(QDir::toNativeSeparators(bv->ScFilename + "/" + nam + "." + fi.completeSuffix().toLower())), pm);
 
951
        pm.save(QDir::cleanPath(QDir::toNativeSeparators(bv->ScFilename + "/" + nam +".png")), "PNG");
 
952
        QFileInfo fiD(QDir::toNativeSeparators(activeBView->ScFilename + "/" + fi.baseName()));
965
953
        if ((fiD.exists()) && (fiD.isDir()))
966
954
        {
967
 
                QDir dd = QDir(QDir::cleanPath(QDir::convertSeparators(bv->ScFilename)));
968
 
                dd.mkdir(QDir::cleanPath(QDir::convertSeparators(bv->ScFilename + "/" + nam)));
969
 
                QDir d(QDir::convertSeparators(activeBView->ScFilename + "/" + fi.baseName()), "*", QDir::Name, QDir::Files | QDir::Readable | QDir::NoSymLinks);
 
955
                QDir dd = QDir(QDir::cleanPath(QDir::toNativeSeparators(bv->ScFilename)));
 
956
                dd.mkdir(QDir::cleanPath(QDir::toNativeSeparators(bv->ScFilename + "/" + nam)));
 
957
                QDir d(QDir::toNativeSeparators(activeBView->ScFilename + "/" + fi.baseName()), "*", QDir::Name, QDir::Files | QDir::Readable | QDir::NoSymLinks);
970
958
                if ((d.exists()) && (d.count() != 0))
971
959
                {
972
960
                        for (uint dc = 0; dc < d.count(); ++dc)
973
961
                        {
974
 
                                QString source = QDir::cleanPath(QDir::convertSeparators(activeBView->ScFilename + "/" + fi.baseName() + "/" + d[dc]));
975
 
                                QString target = QDir::cleanPath(QDir::convertSeparators(bv->ScFilename + "/" + nam + "/" + d[dc]));
 
962
                                QString source = QDir::cleanPath(QDir::toNativeSeparators(activeBView->ScFilename + "/" + fi.baseName() + "/" + d[dc]));
 
963
                                QString target = QDir::cleanPath(QDir::toNativeSeparators(bv->ScFilename + "/" + nam + "/" + d[dc]));
976
964
                                copyFile(source, target);
977
965
                        }
978
966
                }
979
967
                if (fiD.baseName() != nam)
980
 
                        adjustReferences(QDir::convertSeparators(bv->ScFilename + "/" + nam + "." + fi.completeSuffix().toLower()));
 
968
                        adjustReferences(QDir::toNativeSeparators(bv->ScFilename + "/" + nam + "." + fi.completeSuffix().toLower()));
981
969
        }
982
970
        if (pm.width() > 60)
983
971
                pm = pm.scaledToWidth(60, Qt::SmoothTransformation);
999
987
                        it = tempBView->objectMap.begin();
1000
988
                        QFile f(it.value().Data);
1001
989
                        f.remove();
1002
 
                        QFileInfo fi(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key() + ".png"));
 
990
                        QFileInfo fi(QDir::toNativeSeparators(tempBView->ScFilename + "/" + it.key() + ".png"));
1003
991
                        if (fi.exists())
1004
992
                        {
1005
 
                                QFile f2(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key() + ".png"));
 
993
                                QFile f2(QDir::toNativeSeparators(tempBView->ScFilename + "/" + it.key() + ".png"));
1006
994
                                f2.remove();
1007
995
                        }
1008
 
                        QFileInfo fiD(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key()));
 
996
                        QFileInfo fiD(QDir::toNativeSeparators(tempBView->ScFilename + "/" + it.key()));
1009
997
                        if ((fiD.exists()) && (fiD.isDir()))
1010
998
                        {
1011
 
                                QDir dd = QDir(QDir::convertSeparators(tempBView->ScFilename));
1012
 
                                QDir d(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key()), "*", QDir::Name, QDir::Files | QDir::Readable | QDir::NoSymLinks);
 
999
                                QDir dd = QDir(QDir::toNativeSeparators(tempBView->ScFilename));
 
1000
                                QDir d(QDir::toNativeSeparators(tempBView->ScFilename + "/" + it.key()), "*", QDir::Name, QDir::Files | QDir::Readable | QDir::NoSymLinks);
1013
1001
                                if ((d.exists()) && (d.count() != 0))
1014
1002
                                {
1015
1003
                                        for (uint dc = 0; dc < d.count(); ++dc)
1016
1004
                                        {
1017
 
                                                QFile::remove(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key() + "/" + d[dc]));
 
1005
                                                QFile::remove(QDir::toNativeSeparators(tempBView->ScFilename + "/" + it.key() + "/" + d[dc]));
1018
1006
                                        }
1019
1007
                                }
1020
 
                                dd.rmdir(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key()));
 
1008
                                dd.rmdir(QDir::toNativeSeparators(tempBView->ScFilename + "/" + it.key()));
1021
1009
                        }
1022
1010
                        QString name = it.key();
1023
1011
                        tempBView->objectMap.erase(it);
1049
1037
        QListWidgetItem *ite = actItem;
1050
1038
        QString name = ite->text();
1051
1039
        QFile::remove(activeBView->objectMap[name].Data);
1052
 
        QFileInfo fi(QDir::convertSeparators(activeBView->ScFilename + "/" + name + ".png"));
 
1040
        QFileInfo fi(QDir::toNativeSeparators(activeBView->ScFilename + "/" + name + ".png"));
1053
1041
        if (fi.exists())
1054
 
                QFile::remove(QDir::convertSeparators(activeBView->ScFilename + "/" + name + ".png"));
1055
 
        QFileInfo fiD(QDir::convertSeparators(activeBView->ScFilename + "/" + name));
 
1042
                QFile::remove(QDir::toNativeSeparators(activeBView->ScFilename + "/" + name + ".png"));
 
1043
        QFileInfo fiD(QDir::toNativeSeparators(activeBView->ScFilename + "/" + name));
1056
1044
        if ((fiD.exists()) && (fiD.isDir()))
1057
1045
        {
1058
 
                QDir dd = QDir(QDir::convertSeparators(activeBView->ScFilename));
1059
 
                QDir d(QDir::convertSeparators(activeBView->ScFilename + "/" + name), "*", QDir::Name, QDir::Files | QDir::Readable | QDir::NoSymLinks);
 
1046
                QDir dd = QDir(QDir::toNativeSeparators(activeBView->ScFilename));
 
1047
                QDir d(QDir::toNativeSeparators(activeBView->ScFilename + "/" + name), "*", QDir::Name, QDir::Files | QDir::Readable | QDir::NoSymLinks);
1060
1048
                if ((d.exists()) && (d.count() != 0))
1061
1049
                {
1062
1050
                        for (uint dc = 0; dc < d.count(); ++dc)
1063
1051
                        {
1064
 
                                QFile::remove(QDir::convertSeparators(activeBView->ScFilename + "/" + name + "/" + d[dc]));
 
1052
                                QFile::remove(QDir::toNativeSeparators(activeBView->ScFilename + "/" + name + "/" + d[dc]));
1065
1053
                        }
1066
1054
                }
1067
1055
                dd.rmdir(name);
1086
1074
        {
1087
1075
                QFile f(it.value().Data);
1088
1076
                f.remove();
1089
 
                QFileInfo fi(QDir::convertSeparators(activeBView->ScFilename + "/" + it.key() + ".png"));
 
1077
                QFileInfo fi(QDir::toNativeSeparators(activeBView->ScFilename + "/" + it.key() + ".png"));
1090
1078
                if (fi.exists())
1091
1079
                {
1092
 
                        QFile f2(QDir::convertSeparators(activeBView->ScFilename + "/" + it.key() + ".png"));
 
1080
                        QFile f2(QDir::toNativeSeparators(activeBView->ScFilename + "/" + it.key() + ".png"));
1093
1081
                        f2.remove();
1094
1082
                }
1095
 
                QFileInfo fiD(QDir::convertSeparators(activeBView->ScFilename + "/" + it.key()));
 
1083
                QFileInfo fiD(QDir::toNativeSeparators(activeBView->ScFilename + "/" + it.key()));
1096
1084
                if ((fiD.exists()) && (fiD.isDir()))
1097
1085
                {
1098
 
                        QDir dd = QDir(QDir::convertSeparators(activeBView->ScFilename));
1099
 
                        QDir d(QDir::convertSeparators(activeBView->ScFilename + "/" + it.key()), "*", QDir::Name, QDir::Files | QDir::Readable | QDir::NoSymLinks);
 
1086
                        QDir dd = QDir(QDir::toNativeSeparators(activeBView->ScFilename));
 
1087
                        QDir d(QDir::toNativeSeparators(activeBView->ScFilename + "/" + it.key()), "*", QDir::Name, QDir::Files | QDir::Readable | QDir::NoSymLinks);
1100
1088
                        if ((d.exists()) && (d.count() != 0))
1101
1089
                        {
1102
1090
                                for (uint dc = 0; dc < d.count(); ++dc)
1103
1091
                                {
1104
 
                                        QFile::remove(QDir::convertSeparators(activeBView->ScFilename + "/" + it.key() + "/" + d[dc]));
 
1092
                                        QFile::remove(QDir::toNativeSeparators(activeBView->ScFilename + "/" + it.key() + "/" + d[dc]));
1105
1093
                                }
1106
1094
                        }
1107
 
                        dd.rmdir(QDir::convertSeparators(activeBView->ScFilename + "/" + it.key()));
 
1095
                        dd.rmdir(QDir::toNativeSeparators(activeBView->ScFilename + "/" + it.key()));
1108
1096
                }
1109
1097
        }
1110
1098
        activeBView->clear();
1123
1111
        QPixmap ObjPreview;
1124
1112
        QListWidgetItem *ite = actItem;
1125
1113
        QString OldName = ite->text();
1126
 
        Query *dia = new Query(this, "tt", 1, 0, tr("&Name:"), tr("New Name"));
1127
 
        dia->setEditText(ite->text(), true);
1128
 
        if (dia->exec())
1129
 
        {
1130
 
                nam = dia->getEditText();
1131
 
                while (activeBView->objectMap.contains(nam))
1132
 
                {
1133
 
                        QMessageBox::warning(this, CommonStrings::trWarning, tr("Name \"%1\" is not unique.\nPlease choose another.").arg(nam), CommonStrings::tr_OK);
1134
 
                        if (!dia->exec())
1135
 
                        {
1136
 
                                delete dia;
1137
 
                                return;
1138
 
                        }
1139
 
                        nam = dia->getEditText();
1140
 
                }
1141
 
        }
 
1114
        Query dia(this, "tt", 1, 0, tr("&Name:"), tr("New Name"));
 
1115
        dia.setEditText(ite->text(), true);
 
1116
        dia.setTestList(activeBView->objectMap.keys());
 
1117
        if (dia.exec())
 
1118
                nam = dia.getEditText();
1142
1119
        else
1143
 
        {
1144
 
                delete dia;
1145
1120
                return;
1146
 
        }
1147
 
        delete dia;
1148
1121
        ite->setText(nam);
1149
1122
        ObjData = activeBView->objectMap[OldName].Data;
1150
1123
        ObjPreview = activeBView->objectMap[OldName].Preview;
1151
1124
        QDir d = QDir();
1152
 
        d.rename(ObjData, QDir::cleanPath(QDir::convertSeparators(activeBView->ScFilename + "/" + ite->text() + ".sce")));
1153
 
        QFileInfo fi(QDir::convertSeparators(activeBView->ScFilename + "/" + OldName + ".png"));
 
1125
        d.rename(ObjData, QDir::cleanPath(QDir::toNativeSeparators(activeBView->ScFilename + "/" + ite->text() + ".sce")));
 
1126
        QFileInfo fi(QDir::toNativeSeparators(activeBView->ScFilename + "/" + OldName + ".png"));
1154
1127
        if (fi.exists())
1155
 
                d.rename(QDir::convertSeparators(activeBView->ScFilename + "/" + OldName + ".png"), QDir::cleanPath(QDir::convertSeparators(activeBView->ScFilename + "/" + ite->text() + ".png")));
1156
 
        QFileInfo fiD(QDir::convertSeparators(activeBView->ScFilename + "/" + OldName));
 
1128
                d.rename(QDir::toNativeSeparators(activeBView->ScFilename + "/" + OldName + ".png"), QDir::cleanPath(QDir::toNativeSeparators(activeBView->ScFilename + "/" + ite->text() + ".png")));
 
1129
        QFileInfo fiD(QDir::toNativeSeparators(activeBView->ScFilename + "/" + OldName));
1157
1130
        if ((fiD.exists()) && (fiD.isDir()))
1158
1131
        {
1159
1132
                QDir d = QDir();
1160
 
                d.rename(QDir::convertSeparators(activeBView->ScFilename + "/" + OldName), QDir::cleanPath(QDir::convertSeparators(activeBView->ScFilename + "/" + ite->text())));
1161
 
                adjustReferences(QDir::cleanPath(QDir::convertSeparators(activeBView->ScFilename + "/" + ite->text() + ".sce")));
 
1133
                d.rename(QDir::toNativeSeparators(activeBView->ScFilename + "/" + OldName), QDir::cleanPath(QDir::toNativeSeparators(activeBView->ScFilename + "/" + ite->text())));
 
1134
                adjustReferences(QDir::cleanPath(QDir::toNativeSeparators(activeBView->ScFilename + "/" + ite->text() + ".sce")));
1162
1135
        }
1163
1136
        activeBView->objectMap.remove(OldName);
1164
 
        activeBView->AddObj(ite->text(), QDir::cleanPath(QDir::convertSeparators(activeBView->ScFilename + "/" + ite->text() + ".sce")), ObjPreview);
 
1137
        activeBView->AddObj(ite->text(), QDir::cleanPath(QDir::toNativeSeparators(activeBView->ScFilename + "/" + ite->text() + ".sce")), ObjPreview);
1165
1138
        activeBView->sortItems();
1166
1139
        if (activeBView == tempBView)
1167
1140
                emit updateRecentMenue();
1279
1252
                        nam += "("+ tmp.setNum(tempCount) + ")";
1280
1253
        }
1281
1254
        qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
1282
 
        Query *dia = new Query(this, "tt", 1, 0, tr("&Name:"), tr("New Entry"));
1283
 
        dia->setEditText(nam, true);
1284
 
        if (dia->exec())
1285
 
        {
1286
 
                nam = dia->getEditText();
1287
 
                while (activeBView->objectMap.contains(nam))
1288
 
                {
1289
 
                        if (!dia->exec())
1290
 
                        {
1291
 
                                delete dia;
1292
 
                                return;
1293
 
                        }
1294
 
                        nam = dia->getEditText();
1295
 
                }
1296
 
        }
 
1255
        Query dia(this, "tt", 1, 0, tr("&Name:"), tr("New Entry"));
 
1256
        dia.setEditText(nam, true);
 
1257
        dia.setTestList(activeBView->objectMap.keys());
 
1258
        if (dia.exec())
 
1259
                nam = dia.getEditText();
1297
1260
        else
1298
 
        {
1299
 
                delete dia;
1300
1261
                return;
1301
 
        }
1302
 
        delete dia;
1303
1262
        QString ff = text;
1304
 
        activeBView->checkAndChange(ff, QDir::cleanPath(QDir::convertSeparators(activeBView->ScFilename + "/" + nam + ".sce")), QDir::cleanPath(QDir::convertSeparators(activeBView->ScFilename)));
 
1263
        activeBView->checkAndChange(ff, QDir::cleanPath(QDir::toNativeSeparators(activeBView->ScFilename + "/" + nam + ".sce")), QDir::cleanPath(QDir::toNativeSeparators(activeBView->ScFilename)));
1305
1264
        ScPreview *pre = new ScPreview();
1306
1265
        QPixmap pm = pre->createPreview(ff);
1307
 
        activeBView->AddObj(nam, QDir::cleanPath(QDir::convertSeparators(activeBView->ScFilename + "/" + nam + ".sce")), pm);
1308
 
        pm.save(QDir::cleanPath(QDir::convertSeparators(activeBView->ScFilename + "/" + nam +".png")), "PNG");
 
1266
        activeBView->AddObj(nam, QDir::cleanPath(QDir::toNativeSeparators(activeBView->ScFilename + "/" + nam + ".sce")), pm);
 
1267
        pm.save(QDir::cleanPath(QDir::toNativeSeparators(activeBView->ScFilename + "/" + nam +".png")), "PNG");
1309
1268
        if (pm.width() > 60)
1310
1269
                pm = pm.scaledToWidth(60, Qt::SmoothTransformation);
1311
1270
        if (pm.height() > 60)
1326
1285
                        it = tempBView->objectMap.begin();
1327
1286
                        QFile f(it.value().Data);
1328
1287
                        f.remove();
1329
 
                        QFileInfo fi(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key() + ".png"));
 
1288
                        QFileInfo fi(QDir::toNativeSeparators(tempBView->ScFilename + "/" + it.key() + ".png"));
1330
1289
                        if (fi.exists())
1331
1290
                        {
1332
 
                                QFile f2(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key() + ".png"));
 
1291
                                QFile f2(QDir::toNativeSeparators(tempBView->ScFilename + "/" + it.key() + ".png"));
1333
1292
                                f2.remove();
1334
1293
                        }
1335
 
                        QFileInfo fiD(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key()));
 
1294
                        QFileInfo fiD(QDir::toNativeSeparators(tempBView->ScFilename + "/" + it.key()));
1336
1295
                        if ((fiD.exists()) && (fiD.isDir()))
1337
1296
                        {
1338
 
                                QDir dd = QDir(QDir::convertSeparators(tempBView->ScFilename));
1339
 
                                QDir d(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key()), "*", QDir::Name, QDir::Files | QDir::Readable | QDir::NoSymLinks);
 
1297
                                QDir dd = QDir(QDir::toNativeSeparators(tempBView->ScFilename));
 
1298
                                QDir d(QDir::toNativeSeparators(tempBView->ScFilename + "/" + it.key()), "*", QDir::Name, QDir::Files | QDir::Readable | QDir::NoSymLinks);
1340
1299
                                if ((d.exists()) && (d.count() != 0))
1341
1300
                                {
1342
1301
                                        for (uint dc = 0; dc < d.count(); ++dc)
1343
1302
                                        {
1344
 
                                                QFile::remove(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key() + "/" + d[dc]));
 
1303
                                                QFile::remove(QDir::toNativeSeparators(tempBView->ScFilename + "/" + it.key() + "/" + d[dc]));
1345
1304
                                        }
1346
1305
                                }
1347
 
                                dd.rmdir(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key()));
 
1306
                                dd.rmdir(QDir::toNativeSeparators(tempBView->ScFilename + "/" + it.key()));
1348
1307
                        }
1349
1308
                        QString name = it.key();
1350
1309
                        tempBView->objectMap.erase(it);
1371
1330
                nam += "("+ tmp.setNum(tempCount) + ")";
1372
1331
        tempCount++;
1373
1332
        QString ff = text;
1374
 
        tempBView->checkAndChange(ff, QDir::cleanPath(QDir::convertSeparators(tempBView->ScFilename + "/" + nam + ".sce")), QDir::cleanPath(QDir::convertSeparators(tempBView->ScFilename)));
 
1333
        tempBView->checkAndChange(ff, QDir::cleanPath(QDir::toNativeSeparators(tempBView->ScFilename + "/" + nam + ".sce")), QDir::cleanPath(QDir::toNativeSeparators(tempBView->ScFilename)));
1375
1334
        ScPreview *pre = new ScPreview();
1376
1335
        QPixmap pm = pre->createPreview(ff);
1377
 
        tempBView->AddObj(nam, QDir::cleanPath(QDir::convertSeparators(tempBView->ScFilename + "/" + nam + ".sce")), pm);
1378
 
        pm.save(QDir::cleanPath(QDir::convertSeparators(tempBView->ScFilename + "/" + nam +".png")), "PNG");
 
1336
        tempBView->AddObj(nam, QDir::cleanPath(QDir::toNativeSeparators(tempBView->ScFilename + "/" + nam + ".sce")), pm);
 
1337
        pm.save(QDir::cleanPath(QDir::toNativeSeparators(tempBView->ScFilename + "/" + nam +".png")), "PNG");
1379
1338
        if (pm.width() > 60)
1380
1339
                pm = pm.scaledToWidth(60, Qt::SmoothTransformation);
1381
1340
        if (pm.height() > 60)
1394
1353
                it = tempBView->objectMap.begin();
1395
1354
                QFile f(it.value().Data);
1396
1355
                f.remove();
1397
 
                QFileInfo fi(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key() + ".png"));
 
1356
                QFileInfo fi(QDir::toNativeSeparators(tempBView->ScFilename + "/" + it.key() + ".png"));
1398
1357
                if (fi.exists())
1399
1358
                {
1400
 
                        QFile f2(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key() + ".png"));
 
1359
                        QFile f2(QDir::toNativeSeparators(tempBView->ScFilename + "/" + it.key() + ".png"));
1401
1360
                        f2.remove();
1402
1361
                }
1403
 
                QFileInfo fiD(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key()));
 
1362
                QFileInfo fiD(QDir::toNativeSeparators(tempBView->ScFilename + "/" + it.key()));
1404
1363
                if ((fiD.exists()) && (fiD.isDir()))
1405
1364
                {
1406
 
                        QDir dd = QDir(QDir::convertSeparators(tempBView->ScFilename));
1407
 
                        QDir d(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key()), "*", QDir::Name, QDir::Files | QDir::Readable | QDir::NoSymLinks);
 
1365
                        QDir dd = QDir(QDir::toNativeSeparators(tempBView->ScFilename));
 
1366
                        QDir d(QDir::toNativeSeparators(tempBView->ScFilename + "/" + it.key()), "*", QDir::Name, QDir::Files | QDir::Readable | QDir::NoSymLinks);
1408
1367
                        if ((d.exists()) && (d.count() != 0))
1409
1368
                        {
1410
1369
                                for (uint dc = 0; dc < d.count(); ++dc)
1411
1370
                                {
1412
 
                                        QFile::remove(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key() + "/" + d[dc]));
 
1371
                                        QFile::remove(QDir::toNativeSeparators(tempBView->ScFilename + "/" + it.key() + "/" + d[dc]));
1413
1372
                                }
1414
1373
                        }
1415
 
                        dd.rmdir(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key()));
 
1374
                        dd.rmdir(QDir::toNativeSeparators(tempBView->ScFilename + "/" + it.key()));
1416
1375
                }
1417
1376
                QString name = it.key();
1418
1377
                tempBView->objectMap.erase(it);
1442
1401
        if (actBView->objectMap.contains(nam))
1443
1402
                nam += "("+ tmp.setNum(tempCount) + ")";
1444
1403
        qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
1445
 
        Query *dia = new Query(this, "tt", 1, 0, tr("&Name:"), tr("New Entry"));
1446
 
        dia->setEditText(nam, true);
1447
 
        if (dia->exec())
1448
 
        {
1449
 
                nam = dia->getEditText();
1450
 
                while (activeBView->objectMap.contains(nam))
1451
 
                {
1452
 
                        if (!dia->exec())
1453
 
                        {
1454
 
                                delete dia;
1455
 
                                return;
1456
 
                        }
1457
 
                        nam = dia->getEditText();
1458
 
                }
1459
 
        }
 
1404
        Query dia(this, "tt", 1, 0, tr("&Name:"), tr("New Entry"));
 
1405
        dia.setEditText(nam, true);
 
1406
        dia.setTestList(activeBView->objectMap.keys());
 
1407
        if (dia.exec())
 
1408
                nam = dia.getEditText();
1460
1409
        else
1461
 
        {
1462
 
                delete dia;
1463
 
                return;
1464
 
        }
1465
 
        delete dia;
 
1410
                return; 
1466
1411
        QString ff = text;
1467
 
        actBView->checkAndChange(ff, QDir::cleanPath(QDir::convertSeparators(actBView->ScFilename + "/" + nam + ".sce")), QDir::cleanPath(QDir::convertSeparators(actBView->ScFilename)));
 
1412
        actBView->checkAndChange(ff, QDir::cleanPath(QDir::toNativeSeparators(actBView->ScFilename + "/" + nam + ".sce")), QDir::cleanPath(QDir::toNativeSeparators(actBView->ScFilename)));
1468
1413
        ScPreview *pre = new ScPreview();
1469
1414
        QPixmap pm = pre->createPreview(ff);
1470
 
        actBView->AddObj(nam, QDir::cleanPath(QDir::convertSeparators(actBView->ScFilename + "/" + nam + ".sce")), pm);
1471
 
        pm.save(QDir::cleanPath(QDir::convertSeparators(actBView->ScFilename + "/" + nam +".png")), "PNG");
 
1415
        actBView->AddObj(nam, QDir::cleanPath(QDir::toNativeSeparators(actBView->ScFilename + "/" + nam + ".sce")), pm);
 
1416
        pm.save(QDir::cleanPath(QDir::toNativeSeparators(actBView->ScFilename + "/" + nam +".png")), "PNG");
1472
1417
        pm = pm.scaled(60, 60, Qt::KeepAspectRatio, Qt::SmoothTransformation);
1473
1418
        QPixmap pm2(60, 60);
1474
1419
        pm2.fill(palette().color(QPalette::Base));
1487
1432
        {
1488
1433
                QFile f(it.value().Data);
1489
1434
                f.remove();
1490
 
                QFileInfo fi(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key() + ".png"));
 
1435
                QFileInfo fi(QDir::toNativeSeparators(tempBView->ScFilename + "/" + it.key() + ".png"));
1491
1436
                if (fi.exists())
1492
1437
                {
1493
 
                        QFile f2(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key() + ".png"));
 
1438
                        QFile f2(QDir::toNativeSeparators(tempBView->ScFilename + "/" + it.key() + ".png"));
1494
1439
                        f2.remove();
1495
1440
                }
1496
 
                QFileInfo fiD(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key()));
 
1441
                QFileInfo fiD(QDir::toNativeSeparators(tempBView->ScFilename + "/" + it.key()));
1497
1442
                if ((fiD.exists()) && (fiD.isDir()))
1498
1443
                {
1499
 
                        QDir dd = QDir(QDir::convertSeparators(tempBView->ScFilename));
1500
 
                        QDir d(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key()), "*", QDir::Name, QDir::Files | QDir::Readable | QDir::NoSymLinks);
 
1444
                        QDir dd = QDir(QDir::toNativeSeparators(tempBView->ScFilename));
 
1445
                        QDir d(QDir::toNativeSeparators(tempBView->ScFilename + "/" + it.key()), "*", QDir::Name, QDir::Files | QDir::Readable | QDir::NoSymLinks);
1501
1446
                        if ((d.exists()) && (d.count() != 0))
1502
1447
                        {
1503
1448
                                for (uint dc = 0; dc < d.count(); ++dc)
1504
1449
                                {
1505
 
                                        QFile::remove(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key() + "/" + d[dc]));
 
1450
                                        QFile::remove(QDir::toNativeSeparators(tempBView->ScFilename + "/" + it.key() + "/" + d[dc]));
1506
1451
                                }
1507
1452
                        }
1508
 
                        dd.rmdir(QDir::convertSeparators(tempBView->ScFilename + "/" + it.key()));
 
1453
                        dd.rmdir(QDir::toNativeSeparators(tempBView->ScFilename + "/" + it.key()));
1509
1454
                }
1510
1455
        }
1511
1456
}