1.1 --- a/exportxhtmldialog.ui.h	Mon Apr 24 10:08:21 2006 +0000
     1.2 +++ b/exportxhtmldialog.ui.h	Mon Apr 24 11:31:15 2006 +0000
     1.3 @@ -22,7 +22,7 @@
     1.4  void ExportXHTMLDialog::readSettings()
     1.5  {
     1.6  
     1.7 -	dir=settings.readLocalEntry (filepath,"/vym/export/xhtml/exportDir",vymBaseDir.current().path() );
     1.8 +	dir=settings.readLocalEntry (filepath,"/vym/export/xhtml/exportDir",vymBaseDir.currentDirPath() );
     1.9  	lineEditDir->setText(dir);
    1.10  	
    1.11      if ( settings.readLocalEntry (filepath,"/vym/export/xhtml/useImage","yes")=="yes")
    1.12 @@ -194,7 +194,7 @@
    1.13  {
    1.14     	QFileDialog fd( this, tr("VYM - Path to XSL file"));
    1.15  	fd.setModal (true);
    1.16 -	fd.addFilter ("Extensible Styleshee Language (*.xsl)");
    1.17 +	fd.addFilter ("Extensible Stylesheet Language (*.xsl)");
    1.18  	fd.show();
    1.19  
    1.20  	if ( fd.exec() == QDialog::Accepted )

     2.1 --- a/main.cpp	Mon Apr 24 10:08:21 2006 +0000
     2.2 +++ b/main.cpp	Mon Apr 24 11:31:15 2006 +0000
     2.3 @@ -158,8 +158,6 @@
     2.4  	}		
     2.5  	
     2.6  	// Use /usr/share/vym or /usr/local/share/vym or . ?
     2.7 -	QDir vymBaseDir;
     2.8 -
     2.9  	// First try options
    2.10  	if (options.isOn ("local"))
    2.11  	{
    2.12 @@ -174,9 +172,11 @@
    2.13  	{
    2.14  		vymBaseDir.setPath ("/usr/share/vym");
    2.15  		if (!vymBaseDir.exists())
    2.16 +		{
    2.17  			vymBaseDir.setPath ("/usr/local/share/vym");
    2.18 -		if (!vymBaseDir.exists())
    2.19 -			vymBaseDir.setPath(vymBaseDir.currentDirPath() );
    2.20 +			if (!vymBaseDir.exists())
    2.21 +				vymBaseDir.setPath(vymBaseDir.currentDirPath() );
    2.22 +		}		
    2.23  	}
    2.24  
    2.25  	iconPath=vymBaseDir.path()+"/icons/";