1.1 --- a/vymmodel.cpp	Tue Nov 04 12:09:10 2008 +0000
     1.2 +++ b/vymmodel.cpp	Mon Dec 08 16:57:33 2008 +0000
     1.3 @@ -338,6 +338,9 @@
     1.4  				   "Unknown FileType in VymModel::load()");
     1.5  		return aborted;	
     1.6  	}
     1.7 +
     1.8 +	bool zipped_org=zipped;
     1.9 +
    1.10  	if (lmode==NewMap)
    1.11  	{
    1.12  		selection.clear();
    1.13 @@ -480,6 +483,9 @@
    1.14  	// Delete tmpZipDir
    1.15  	removeDir (QDir(tmpZipDir));
    1.16  
    1.17 +	// Restore original zip state
    1.18 +	zipped=zipped_org;
    1.19 +
    1.20  	updateActions();
    1.21  	return err;
    1.22  }
    1.23 @@ -4442,8 +4448,8 @@
    1.24  {
    1.25  	if (selection.select(lmo))
    1.26  	{
    1.27 -		selection.update();
    1.28 -		sendSelection ();
    1.29 +		//selection.update();
    1.30 +		sendSelection ();	// FIXME VM use signal
    1.31  	}
    1.32  }
    1.33  
    1.34 @@ -4838,7 +4844,7 @@
    1.35  	return selection.getSelectString();
    1.36  }
    1.37  
    1.38 -QString VymModel::getSelectString (LinkableMapObj *lmo)
    1.39 +QString VymModel::getSelectString (LinkableMapObj *lmo)	// FIXME VM needs to use TreeModel
    1.40  {
    1.41  	QString s;
    1.42  	if (!lmo) return s;
    1.43 @@ -4852,8 +4858,11 @@
    1.44  				// Mainbranch, return 
    1.45  				s= "bo:" + QString("%1").arg(((BranchObj*)lmo)->getNum());
    1.46  			else	
    1.47 +			{
    1.48 +				//cout << "VM::getSelectString  lmo="<<lmo<<"  d="<<lmo->getDepth()<<"  s="<<s.toStdString()<<"  h="<<((BranchObj*)lmo)->getHeading().toStdString()<<endl;
    1.49  				// Branch, call myself recursively
    1.50  				s= getSelectString(par) + ",bo:" + QString("%1").arg(((BranchObj*)lmo)->getNum());
    1.51 +			}
    1.52  		} else
    1.53  		{
    1.54  			// MapCenter