# HG changeset patch
# User insilmaril
# Date 1145873109 0
# Node ID 4258723b534c4c62f4599549de5839ee93fe252c
# Parent  b72713d24694233a0cc749fee2c5f4340d32342a
Fixed missing Icon for flag-url in XHTML export

diff -r b72713d24694 -r 4258723b534c branchobj.cpp
--- a/branchobj.cpp	Tue Apr 11 14:36:20 2006 +0000
+++ b/branchobj.cpp	Mon Apr 24 10:05:09 2006 +0000
@@ -705,7 +705,10 @@
 		hidden=true;
 	}else
 	{
-		setVisibility (true);
+		if (hasScrolledParent(this))
+			setVisibility (false);
+		else
+			setVisibility (true);
 		hidden=false;
 	}	
 
diff -r b72713d24694 -r 4258723b534c exportxhtmldialog.ui.h
--- a/exportxhtmldialog.ui.h	Tue Apr 11 14:36:20 2006 +0000
+++ b/exportxhtmldialog.ui.h	Mon Apr 24 10:05:09 2006 +0000
@@ -273,12 +273,9 @@
 		settings.writeEntry ("/vym/export/xhtml/showOutput","no");	
 
 	QString ipath;	
-	if (options.isOn ("local"))
+	ipath=vymBaseDir.path()+"/flags/flag-url-16x16.png";
+	if (!options.isOn ("local"))
 	{
-		ipath=vymBaseDir.path()+"/icons/flag-url-16x16.png";
-	} else	
-	{
-		ipath=vymBaseDir.path()+"/images/flag-url-16x16.png";
 		settings.setLocalEntry 
 			(filepath,"/vym/export/xhtml/xsl",xsl);
 		settings.setLocalEntry 
@@ -291,9 +288,8 @@
 		QMessageBox::warning( 0, tr( "Warning" ),tr("Could not open %1").arg(ipath));
 		
 		
-	if(!pm.save (dir + "flags/url-16x16.png","PNG"))
+	if(!pm.save (dir + "flags/flag-url-16x16.png","PNG"))
 		QMessageBox::warning( 0, tr( "Warning" ),tr("Could not write %1").arg(ipath));
-
 	if (!saveSettingsInMap)
 		settings.clearLocal("/vym/export/xhtml");
 	else	
@@ -332,7 +328,6 @@
 	p.setOutputFile (dir+mapname+".html");
 	p.setInputFile (dir+mapname+".xml");
 	p.setXSLFile (xsl);
-	cout << "bdp="<<vymBaseDir.path()<<"   xsl="<<xsl<<endl;
 	p.process();
 
 	if (!postscript.isEmpty()) runScript (postscript,dir+mapname+".html");
diff -r b72713d24694 -r 4258723b534c mainwindow.cpp
--- a/mainwindow.cpp	Tue Apr 11 14:36:20 2006 +0000
+++ b/mainwindow.cpp	Mon Apr 24 10:05:09 2006 +0000
@@ -1231,7 +1231,8 @@
 
 	a = new QAction( tr( "Export as")+" "+tr("KDE Bookmarks" ), QPixmap(), tr("KDE Bookmarks"), 0, this, "importKDEBookmarks" );
 	connect( a, SIGNAL( activated() ), this, SLOT( fileExportKDEBookmarks() ) );
-	a->addTo (exportMenu);
+//FIXME later!
+//	a->addTo (exportMenu);
 
     a = new QAction( tr( "Export as")+" Taskjuggler"+" "+tr("(still experimental)" ), QPixmap(), "Taskjuggler...", 0, this, "exportTJ" );
     connect( a, SIGNAL( activated() ), this, SLOT( fileExportTaskjuggler() ) );
diff -r b72713d24694 -r 4258723b534c mapeditor.cpp
--- a/mapeditor.cpp	Tue Apr 11 14:36:20 2006 +0000
+++ b/mapeditor.cpp	Mon Apr 24 10:05:09 2006 +0000
@@ -126,6 +126,7 @@
 extern Settings settings;
 
 extern QString iconPath;
+extern QDir vymBaseDir;
 
 int MapEditor::mapNum=0;	// make instance
 
@@ -3046,7 +3047,21 @@
 void MapEditor::testFunction()
 {
 	cout << "MapEditor::testFunction() called\n";
-
+	return;
+
+		QString ub=vymBaseDir.path()+"/scripts/update-bookmarks";
+		QProcess *proc = new QProcess( this );
+		proc->addArgument(ub);
+
+		if ( !proc->start() ) 
+		{
+			QMessageBox::warning(0, 
+				tr("Warning"),
+				tr("Couldn't find script %1\nto notifiy Browsers of changed bookmarks.").arg(ub));
+		}	
+
+	
+/*
 	if (hidemode==HideNone)
 	{
 		setHideTmpMode (HideExport);
@@ -3070,6 +3085,7 @@
 		setHideTmpMode (HideNone);
 	}	
 	cout <<"  hidemode="<<hidemode<<endl;
+	*/
 }
 
 void MapEditor::ensureSelectionVisible()
diff -r b72713d24694 -r 4258723b534c version.h
--- a/version.h	Tue Apr 11 14:36:20 2006 +0000
+++ b/version.h	Mon Apr 24 10:05:09 2006 +0000
@@ -3,6 +3,6 @@
 
 #define __VYM "VYM"
 #define __VYM_VERSION "1.7.15"
-#define __BUILD_DATE "April 10, 2006"
+#define __BUILD_DATE "April 24, 2006"
 
 #endif