# HG changeset patch
# User insilmaril
# Date 1145878275 0
# Node ID 2827ca924b18d542d421124b0558f12479ed469c
# Parent  a9b683f72d146423201556e737ca917c40df6ff6
corrected wrong vymBaseDir

diff -r a9b683f72d14 -r 2827ca924b18 exportxhtmldialog.ui.h
--- a/exportxhtmldialog.ui.h	Mon Apr 24 10:08:21 2006 +0000
+++ b/exportxhtmldialog.ui.h	Mon Apr 24 11:31:15 2006 +0000
@@ -22,7 +22,7 @@
 void ExportXHTMLDialog::readSettings()
 {
 
-	dir=settings.readLocalEntry (filepath,"/vym/export/xhtml/exportDir",vymBaseDir.current().path() );
+	dir=settings.readLocalEntry (filepath,"/vym/export/xhtml/exportDir",vymBaseDir.currentDirPath() );
 	lineEditDir->setText(dir);
 	
     if ( settings.readLocalEntry (filepath,"/vym/export/xhtml/useImage","yes")=="yes")
@@ -194,7 +194,7 @@
 {
    	QFileDialog fd( this, tr("VYM - Path to XSL file"));
 	fd.setModal (true);
-	fd.addFilter ("Extensible Styleshee Language (*.xsl)");
+	fd.addFilter ("Extensible Stylesheet Language (*.xsl)");
 	fd.show();
 
 	if ( fd.exec() == QDialog::Accepted )
diff -r a9b683f72d14 -r 2827ca924b18 main.cpp
--- a/main.cpp	Mon Apr 24 10:08:21 2006 +0000
+++ b/main.cpp	Mon Apr 24 11:31:15 2006 +0000
@@ -158,8 +158,6 @@
 	}		
 	
 	// Use /usr/share/vym or /usr/local/share/vym or . ?
-	QDir vymBaseDir;
-
 	// First try options
 	if (options.isOn ("local"))
 	{
@@ -174,9 +172,11 @@
 	{
 		vymBaseDir.setPath ("/usr/share/vym");
 		if (!vymBaseDir.exists())
+		{
 			vymBaseDir.setPath ("/usr/local/share/vym");
-		if (!vymBaseDir.exists())
-			vymBaseDir.setPath(vymBaseDir.currentDirPath() );
+			if (!vymBaseDir.exists())
+				vymBaseDir.setPath(vymBaseDir.currentDirPath() );
+		}		
 	}
 
 	iconPath=vymBaseDir.path()+"/icons/";