1.1 --- a/mainwindow.cpp	Fri Nov 13 08:32:03 2009 +0000
     1.2 +++ b/mainwindow.cpp	Mon Nov 16 09:47:10 2009 +0000
     1.3 @@ -3669,10 +3669,9 @@
     1.4  
     1.5  void Main::testFunction1()
     1.6  {
     1.7 +	if (!currentMapEditor()) return;
     1.8 +	currentMapEditor()->testFunction1();
     1.9  /*
    1.10 -	if (!currentMapEditor()) return;
    1.11 -	//currentMapEditor()->testFunction1();
    1.12 -*/
    1.13  
    1.14  	VymModel *m=currentModel();
    1.15  	if (!m) return;
    1.16 @@ -3684,6 +3683,7 @@
    1.17  	if ( ok) 
    1.18  		// user entered something and pressed OK
    1.19  		m->setSortFilter (text);
    1.20 +*/
    1.21  }
    1.22  
    1.23  void Main::testFunction2()

     2.1 --- a/mapeditor.cpp	Fri Nov 13 08:32:03 2009 +0000
     2.2 +++ b/mapeditor.cpp	Mon Nov 16 09:47:10 2009 +0000
     2.3 @@ -475,12 +475,8 @@
     2.4  {
     2.5  	cout << "ME::test1  selected TI="<<model->getSelectedItem()<<endl;
     2.6  
     2.7 -	BranchObj *bo=model->getSelectedBranchObj();
     2.8 -	if (bo)
     2.9 -	{
    2.10 -		bo->moveBy (100,100);
    2.11 -		model->reposition();
    2.12 -	}
    2.13 +	for (int i=0; i<200;i++)
    2.14 +		model->addNewBranch();
    2.15  
    2.16  	/*
    2.17  	// Code copied from Qt sources

     3.1 --- a/texteditor.cpp	Fri Nov 13 08:32:03 2009 +0000
     3.2 +++ b/texteditor.cpp	Mon Nov 16 09:47:10 2009 +0000
     3.3 @@ -68,7 +68,7 @@
     3.4  	);
     3.5  	fixedFont.fromString (settings.value(
     3.6  		"/satellite/noteeditor/fonts/fixedFont",
     3.7 -		"Courier,14,-1,5,48,0,0,0,1,0").toString() 
     3.8 +		"Courier,12,-1,5,48,0,0,0,1,0").toString() 
     3.9  	);
    3.10  	QString s=settings.value ("/satellite/noteeditor/fonts/fonthintDefault","variable").toString();
    3.11  	if (s == "fixed")

     4.1 --- a/xml-vym.cpp	Fri Nov 13 08:32:03 2009 +0000
     4.2 +++ b/xml-vym.cpp	Mon Nov 16 09:47:10 2009 +0000
     4.3 @@ -356,7 +356,7 @@
     4.4  
     4.5  bool parseVYMHandler::readBranchAttr (const QXmlAttributes& a)	
     4.6  {
     4.7 -	mainWindow->setProgressValue (branchesCurrent++);
     4.8 +	//mainWindow->setProgressValue (branchesCurrent++);	// FIXME-2 Makes load incredibily slow
     4.9  
    4.10  	lastMI=lastBranch;
    4.11