1.1 Binary file demos/vym-projectplan.vym has changed
2.1 --- a/floatimageobj.cpp Mon Mar 03 09:25:40 2008 +0000
2.2 +++ b/floatimageobj.cpp Tue Mar 25 11:16:39 2008 +0000
2.3 @@ -185,10 +185,10 @@
2.4 QString zAttr=attribut ("zPlane",QString().setNum(zPlane));
2.5 QString url;
2.6
2.7 - url="images/"+prefix+"image-" + QString().number(saveCounter,10) + "." +filetype;
2.8 + url="images/"+prefix+"image-" + QString().number(saveCounter,10) + ".png" ;
2.9
2.10 // And really save the image
2.11 - icon->save (tmpdir + "/" + url, "PNG");
2.12 + icon->save (tmpdir +"/"+ url, "PNG");
2.13
2.14 QString nameAttr=attribut ("orgName",originalFilename);
2.15
3.1 --- a/mainwindow.cpp Mon Mar 03 09:25:40 2008 +0000
3.2 +++ b/mainwindow.cpp Tue Mar 25 11:16:39 2008 +0000
3.3 @@ -2468,7 +2468,7 @@
3.4 urls.at(i);
3.5 #endif
3.6 p->start ("dcop",args);
3.7 - cout << qPrintable (args.join(" "))<<endl;
3.8 + //cout << qPrintable (args.join(" "))<<endl;
3.9 if ( !p->waitForStarted() ) success=false;
3.10 }
3.11 if (!success)
4.1 --- a/mapeditor.cpp Mon Mar 03 09:25:40 2008 +0000
4.2 +++ b/mapeditor.cpp Tue Mar 25 11:16:39 2008 +0000
4.3 @@ -1661,7 +1661,11 @@
4.4
4.5
4.6 // We need to set the tmpDir in order to load files with rel. path
4.7 - QString tmpdir= fname.left(fname.findRev("/",-1));
4.8 + QString tmpdir;
4.9 + if (zipped)
4.10 + tmpdir=tmpZipDir;
4.11 + else
4.12 + tmpdir=fname.left(fname.findRev("/",-1));
4.13 handler->setTmpDir (tmpdir);
4.14 handler->setInputFile (file.name());
4.15 handler->setLoadMode (lmode);
4.16 @@ -1693,18 +1697,16 @@
4.17 }
4.18 }
4.19
4.20 - // Delete tmpDir
4.21 + // Delete tmpZipDir
4.22 removeDir (QDir(tmpZipDir));
4.23
4.24 updateActions();
4.25 +
4.26 return err;
4.27 }
4.28
4.29 ErrorCode MapEditor::save (const SaveMode &savemode)
4.30 {
4.31 - cout <<"ME::save "<<qPrintable (mapName)<<" zipped="<<zipped<<endl; // FIXME debug
4.32 - // Create mapName and fileDir
4.33 - makeSubDirs (fileDir);
4.34 QString tmpZipDir;
4.35 QString mapFileName;
4.36 QString safeFilePath;
4.37 @@ -1757,7 +1759,6 @@
4.38 {
4.39 if ( settings.value ("/mapeditor/writeBackupFile").toBool())
4.40 {
4.41 - cout << "ME::doing backup...\n";//FIXME
4.42 QString backupFileName(destPath + "~");
4.43 QFile backupFile(backupFileName);
4.44 if (backupFile.exists() && !backupFile.remove())
4.45 @@ -1789,6 +1790,9 @@
4.46 setFilePath (tmpZipDir+"/"+ mapName+ ".xml", safeFilePath);
4.47 } // zipped
4.48
4.49 + // Create mapName and fileDir
4.50 + makeSubDirs (fileDir);
4.51 +
4.52 QString saveFile;
4.53 if (savemode==CompleteMap || xelection.isEmpty())
4.54 {
4.55 @@ -1831,17 +1835,6 @@
4.56 return err;
4.57 }
4.58
4.59 -/* FIXME not needed any longer
4.60 -void MapEditor::setZipped (bool z)
4.61 -{
4.62 - zipped=z;
4.63 -}
4.64 -
4.65 -bool MapEditor::saveZipped ()
4.66 -{
4.67 - return zipped;
4.68 -}
4.69 -*/
4.70
4.71 void MapEditor::print()
4.72 {
4.73 @@ -2433,6 +2426,7 @@
4.74 {
4.75 bool old=blockSaveState;
4.76 blockSaveState=true;
4.77 + bool zippedOrg=zipped;
4.78 if (redosAvail > 0 || n!=0)
4.79 {
4.80 // Use the "historical" buffer
4.81 @@ -2442,6 +2436,7 @@
4.82 } else
4.83 // Use the global buffer
4.84 load (clipboardDir+"/"+clipboardFile,ImportAdd, VymMap);
4.85 + zipped=zippedOrg;
4.86 blockSaveState=old;
4.87 }
4.88
4.89 @@ -3191,6 +3186,7 @@
4.90 if (bo1)
4.91 {
4.92 par=(BranchObj*)(bo1->getParObj());
4.93 + if (!par) return;
4.94 bo2=par->getFirstBranch();
4.95 if (bo2) {
4.96 xelection.select(bo2);
4.97 @@ -3209,6 +3205,7 @@
4.98 if (bo1)
4.99 {
4.100 par=(BranchObj*)(bo1->getParObj());
4.101 + if (!par) return;
4.102 bo2=par->getLastBranch();
4.103 if (bo2)
4.104 {
4.105 @@ -5217,6 +5214,7 @@
4.106 cout << "fsaved: "<<qPrintable (fileChangedTime.toString())<<endl;
4.107 cout << " fnow: "<<qPrintable (QFileInfo(filePath).lastModified().toString())<<endl;
4.108 cout << " time: "<<qPrintable (now.toString())<<endl;
4.109 + cout << " zipped="<<zipped<<endl;
4.110 */
4.111 // Disable autosave, while we have gone back in history
4.112 int redosAvail=undoSet.readNumEntry (QString("/history/redosAvail"));
5.1 --- a/tex/vym.changelog Mon Mar 03 09:25:40 2008 +0000
5.2 +++ b/tex/vym.changelog Tue Mar 25 11:16:39 2008 +0000
5.3 @@ -1,3 +1,18 @@
5.4 +-------------------------------------------------------------------
5.5 +Thu Mar 13 02:06:59 CET 2008 - uwedr@suse.de
5.6 +
5.7 +- Bugfix: vym no longer forgets that a map is zipped
5.8 +
5.9 +-------------------------------------------------------------------
5.10 +Sun Mar 9 13:36:20 CET 2008 - uwedr@suse.de
5.11 +
5.12 +- Bugfix: Segfault when pressing Home or End on MapCenter
5.13 +
5.14 +-------------------------------------------------------------------
5.15 +Wed Mar 5 17:54:12 CET 2008 - uwedr@suse.de
5.16 +
5.17 +- Bugfix: Broken paths to floatimages
5.18 +
5.19 -------------------------------------------------------------------
5.20 Wed Feb 27 17:07:57 CET 2008 - uwedr@suse.de
5.21
5.22 @@ -11,7 +26,7 @@
5.23 asks for reload if necessary
5.24
5.25 -------------------------------------------------------------------
5.26 -Mon Jan 21 22:52:18 CET 2008 - uwe
5.27 +Mon Jan 21 22:52:18 CET 2008 - uwedr@suse.de
5.28
5.29 - Bugfix: No more warning dialog for overwriting note, when note is
5.30 empty
6.1 --- a/version.h Mon Mar 03 09:25:40 2008 +0000
6.2 +++ b/version.h Tue Mar 25 11:16:39 2008 +0000
6.3 @@ -7,7 +7,7 @@
6.4 #define __VYM_VERSION "1.11.6"
6.5 //#define __VYM_CODENAME "Codename: 1.10.0-RC-3"
6.6 #define __VYM_CODENAME "Codename: development version"
6.7 -#define __VYM_BUILD_DATE "2008-02-29"
6.8 +#define __VYM_BUILD_DATE "2008-03-13"
6.9
6.10
6.11 bool checkVersion(const QString &);