1.1 --- a/branchobj.cpp	Tue Apr 11 14:36:20 2006 +0000
     1.2 +++ b/branchobj.cpp	Mon Apr 24 10:05:09 2006 +0000
     1.3 @@ -705,7 +705,10 @@
     1.4  		hidden=true;
     1.5  	}else
     1.6  	{
     1.7 -		setVisibility (true);
     1.8 +		if (hasScrolledParent(this))
     1.9 +			setVisibility (false);
    1.10 +		else
    1.11 +			setVisibility (true);
    1.12  		hidden=false;
    1.13  	}	
    1.14  

     2.1 --- a/exportxhtmldialog.ui.h	Tue Apr 11 14:36:20 2006 +0000
     2.2 +++ b/exportxhtmldialog.ui.h	Mon Apr 24 10:05:09 2006 +0000
     2.3 @@ -273,12 +273,9 @@
     2.4  		settings.writeEntry ("/vym/export/xhtml/showOutput","no");	
     2.5  
     2.6  	QString ipath;	
     2.7 -	if (options.isOn ("local"))
     2.8 +	ipath=vymBaseDir.path()+"/flags/flag-url-16x16.png";
     2.9 +	if (!options.isOn ("local"))
    2.10  	{
    2.11 -		ipath=vymBaseDir.path()+"/icons/flag-url-16x16.png";
    2.12 -	} else	
    2.13 -	{
    2.14 -		ipath=vymBaseDir.path()+"/images/flag-url-16x16.png";
    2.15  		settings.setLocalEntry 
    2.16  			(filepath,"/vym/export/xhtml/xsl",xsl);
    2.17  		settings.setLocalEntry 
    2.18 @@ -291,9 +288,8 @@
    2.19  		QMessageBox::warning( 0, tr( "Warning" ),tr("Could not open %1").arg(ipath));
    2.20  		
    2.21  		
    2.22 -	if(!pm.save (dir + "flags/url-16x16.png","PNG"))
    2.23 +	if(!pm.save (dir + "flags/flag-url-16x16.png","PNG"))
    2.24  		QMessageBox::warning( 0, tr( "Warning" ),tr("Could not write %1").arg(ipath));
    2.25 -
    2.26  	if (!saveSettingsInMap)
    2.27  		settings.clearLocal("/vym/export/xhtml");
    2.28  	else	
    2.29 @@ -332,7 +328,6 @@
    2.30  	p.setOutputFile (dir+mapname+".html");
    2.31  	p.setInputFile (dir+mapname+".xml");
    2.32  	p.setXSLFile (xsl);
    2.33 -	cout << "bdp="<<vymBaseDir.path()<<"   xsl="<<xsl<<endl;
    2.34  	p.process();
    2.35  
    2.36  	if (!postscript.isEmpty()) runScript (postscript,dir+mapname+".html");

     3.1 --- a/mainwindow.cpp	Tue Apr 11 14:36:20 2006 +0000
     3.2 +++ b/mainwindow.cpp	Mon Apr 24 10:05:09 2006 +0000
     3.3 @@ -1231,7 +1231,8 @@
     3.4  
     3.5  	a = new QAction( tr( "Export as")+" "+tr("KDE Bookmarks" ), QPixmap(), tr("KDE Bookmarks"), 0, this, "importKDEBookmarks" );
     3.6  	connect( a, SIGNAL( activated() ), this, SLOT( fileExportKDEBookmarks() ) );
     3.7 -	a->addTo (exportMenu);
     3.8 +//FIXME later!
     3.9 +//	a->addTo (exportMenu);
    3.10  
    3.11      a = new QAction( tr( "Export as")+" Taskjuggler"+" "+tr("(still experimental)" ), QPixmap(), "Taskjuggler...", 0, this, "exportTJ" );
    3.12      connect( a, SIGNAL( activated() ), this, SLOT( fileExportTaskjuggler() ) );

     4.1 --- a/mapeditor.cpp	Tue Apr 11 14:36:20 2006 +0000
     4.2 +++ b/mapeditor.cpp	Mon Apr 24 10:05:09 2006 +0000
     4.3 @@ -126,6 +126,7 @@
     4.4  extern Settings settings;
     4.5  
     4.6  extern QString iconPath;
     4.7 +extern QDir vymBaseDir;
     4.8  
     4.9  int MapEditor::mapNum=0;	// make instance
    4.10  
    4.11 @@ -3046,7 +3047,21 @@
    4.12  void MapEditor::testFunction()
    4.13  {
    4.14  	cout << "MapEditor::testFunction() called\n";
    4.15 -
    4.16 +	return;
    4.17 +
    4.18 +		QString ub=vymBaseDir.path()+"/scripts/update-bookmarks";
    4.19 +		QProcess *proc = new QProcess( this );
    4.20 +		proc->addArgument(ub);
    4.21 +
    4.22 +		if ( !proc->start() ) 
    4.23 +		{
    4.24 +			QMessageBox::warning(0, 
    4.25 +				tr("Warning"),
    4.26 +				tr("Couldn't find script %1\nto notifiy Browsers of changed bookmarks.").arg(ub));
    4.27 +		}	
    4.28 +
    4.29 +	
    4.30 +/*
    4.31  	if (hidemode==HideNone)
    4.32  	{
    4.33  		setHideTmpMode (HideExport);
    4.34 @@ -3070,6 +3085,7 @@
    4.35  		setHideTmpMode (HideNone);
    4.36  	}	
    4.37  	cout <<"  hidemode="<<hidemode<<endl;
    4.38 +	*/
    4.39  }
    4.40  
    4.41  void MapEditor::ensureSelectionVisible()

     5.1 --- a/version.h	Tue Apr 11 14:36:20 2006 +0000
     5.2 +++ b/version.h	Mon Apr 24 10:05:09 2006 +0000
     5.3 @@ -3,6 +3,6 @@
     5.4  
     5.5  #define __VYM "VYM"
     5.6  #define __VYM_VERSION "1.7.15"
     5.7 -#define __BUILD_DATE "April 10, 2006"
     5.8 +#define __BUILD_DATE "April 24, 2006"
     5.9  
    5.10  #endif