Fixed broken xLink handling
authorinsilmaril
Tue, 04 Sep 2007 13:53:33 +0000
changeset 5950bd62e09d061
parent 594 88d558ce079d
child 596 97b9507f5e2b
Fixed broken xLink handling
mainwindow.cpp
mapeditor.cpp
version.h
     1.1 --- a/mainwindow.cpp	Tue Sep 04 13:53:33 2007 +0000
     1.2 +++ b/mainwindow.cpp	Tue Sep 04 13:53:33 2007 +0000
     1.3 @@ -3681,7 +3681,13 @@
     1.4  	QStringList filters;
     1.5  	filters <<"VYM example map (*.vym)";
     1.6  	QFileDialog *fd=new QFileDialog( this);
     1.7 -	fd->setDir (QDir(vymBaseDir.path()+"/demos"));
     1.8 +	#if defined(Q_OS_MACX)
     1.9 +		fd->setDir (QDir("./vym.app/Contents/Resources/demos"));
    1.10 +	#else
    1.11 +		// default path in SUSE LINUX
    1.12 +		fd->setDir (QDir(vymBaseDir.path()+"/demos"));
    1.13 +	#endif
    1.14 +
    1.15  	fd->setFileMode (QFileDialog::ExistingFiles);
    1.16  	fd->setFilters (filters);
    1.17  	fd->setCaption(vymName+ " - " +tr("Load vym example map"));
     2.1 --- a/mapeditor.cpp	Tue Sep 04 13:53:33 2007 +0000
     2.2 +++ b/mapeditor.cpp	Tue Sep 04 13:53:33 2007 +0000
     2.3 @@ -4153,6 +4153,12 @@
     2.4  	
     2.5  void MapEditor::testFunction2()
     2.6  {
     2.7 +	LinkableMapObj *lmo=xelection.getBranch();
     2.8 +	if (lmo) 
     2.9 +	{
    2.10 +		cout << "LMO::id="<<lmo->getID().ascii()<<endl;
    2.11 +		cout << " BO::id="<<((BranchObj*)lmo)->getID().ascii()<<endl;
    2.12 +	}	
    2.13  }
    2.14  
    2.15  void MapEditor::contextMenuEvent ( QContextMenuEvent * e )
     3.1 --- a/version.h	Tue Sep 04 13:53:33 2007 +0000
     3.2 +++ b/version.h	Tue Sep 04 13:53:33 2007 +0000
     3.3 @@ -7,7 +7,7 @@
     3.4  #define __VYM_VERSION "1.10.0"
     3.5  #define __VYM_CODENAME "Codename: 1.10.0-RC-3"
     3.6  //#define __VYM_CODENAME "Codename: development version"
     3.7 -#define __VYM_BUILD_DATE "August 26, 2007"
     3.8 +#define __VYM_BUILD_DATE "September 4, 2007"
     3.9  
    3.10  
    3.11  bool checkVersion(const QString &);