# HG changeset patch # User insilmaril # Date 1188914013 0 # Node ID 0bd62e09d06133eaf6ba6c97f2f1526912985597 # Parent 88d558ce079d6ebc3af1faa2558a0536a086a5e6 Fixed broken xLink handling diff -r 88d558ce079d -r 0bd62e09d061 mainwindow.cpp --- a/mainwindow.cpp Tue Sep 04 13:53:33 2007 +0000 +++ b/mainwindow.cpp Tue Sep 04 13:53:33 2007 +0000 @@ -3681,7 +3681,13 @@ QStringList filters; filters <<"VYM example map (*.vym)"; QFileDialog *fd=new QFileDialog( this); - fd->setDir (QDir(vymBaseDir.path()+"/demos")); + #if defined(Q_OS_MACX) + fd->setDir (QDir("./vym.app/Contents/Resources/demos")); + #else + // default path in SUSE LINUX + fd->setDir (QDir(vymBaseDir.path()+"/demos")); + #endif + fd->setFileMode (QFileDialog::ExistingFiles); fd->setFilters (filters); fd->setCaption(vymName+ " - " +tr("Load vym example map")); diff -r 88d558ce079d -r 0bd62e09d061 mapeditor.cpp --- a/mapeditor.cpp Tue Sep 04 13:53:33 2007 +0000 +++ b/mapeditor.cpp Tue Sep 04 13:53:33 2007 +0000 @@ -4153,6 +4153,12 @@ void MapEditor::testFunction2() { + LinkableMapObj *lmo=xelection.getBranch(); + if (lmo) + { + cout << "LMO::id="<<lmo->getID().ascii()<<endl; + cout << " BO::id="<<((BranchObj*)lmo)->getID().ascii()<<endl; + } } void MapEditor::contextMenuEvent ( QContextMenuEvent * e ) diff -r 88d558ce079d -r 0bd62e09d061 version.h --- a/version.h Tue Sep 04 13:53:33 2007 +0000 +++ b/version.h Tue Sep 04 13:53:33 2007 +0000 @@ -7,7 +7,7 @@ #define __VYM_VERSION "1.10.0" #define __VYM_CODENAME "Codename: 1.10.0-RC-3" //#define __VYM_CODENAME "Codename: development version" -#define __VYM_BUILD_DATE "August 26, 2007" +#define __VYM_BUILD_DATE "September 4, 2007" bool checkVersion(const QString &);