diff -r c15affaf86a8 -r bdeb503d2b7f exportxhtmldialog.ui.h --- a/exportxhtmldialog.ui.h Wed Mar 08 12:59:08 2006 +0000 +++ b/exportxhtmldialog.ui.h Tue Mar 14 14:27:04 2006 +0000 @@ -9,6 +9,8 @@ extern Settings settings; +extern QDir vymBaseDir; +extern Options options; void ExportXHTMLDialog::init() { @@ -23,7 +25,6 @@ dir=settings.readLocalEntry (filepath,"/vym/export/xhtml/exportDir","./" ); lineEditDir->setText(dir); - if ( settings.readLocalEntry (filepath,"/vym/export/xhtml/useImage","yes")=="yes") useImage=true; else @@ -62,12 +63,19 @@ showOutput=false; outputButton->setChecked(showOutput); - xsl=settings.readLocalEntry - (filepath,"/vym/export/xhtml/xsl","/usr/share/vym/styles/vym2xhtml.xsl"); + // For testing better use local styles + if (options.isOn ("local")) + { + xsl=vymBaseDir.path()+"/styles/vym2xhtml.xsl"; + css=vymBaseDir.path()+"/styles/vym.css"; + } else + { + xsl=settings.readLocalEntry + (filepath,"/vym/export/xhtml/xsl","/usr/share/vym/styles/vym2xhtml.xsl"); + css=settings.readLocalEntry + (filepath,"/vym/export/xhtml/css","/usr/share/vym/styles/vym.css"); + } lineEditXSL->setText(xsl); - - css=settings.readLocalEntry - (filepath,"/vym/export/xhtml/css","/usr/share/vym/styles/vym.css"); lineEditCSS->setText(css); prescript=settings.readLocalEntry @@ -241,7 +249,6 @@ // (but don't save at destructor, which // is called for "cancel", too) settings.setLocalEntry (filepath,"/vym/export/xhtml/exportDir",dir); - settings.setLocalEntry (filepath,"/vym/export/xhtml/prescript",prescript); settings.setLocalEntry (filepath,"/vym/export/xhtml/postscript",postscript); @@ -264,15 +271,22 @@ settings.writeEntry ("/vym/export/xhtml/showOutput","yes"); else settings.writeEntry ("/vym/export/xhtml/showOutput","no"); - - settings.setLocalEntry - (filepath,"/vym/export/xhtml/xsl",xsl); - settings.setLocalEntry - (filepath,"/vym/export/xhtml/css",css); + + QString ipath; + 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 + (filepath,"/vym/export/xhtml/css",css); + } // Provide a smaller URL-icon to improve Layout QPixmap pm; - QString ipath="/usr/share/vym/images/flag-url-16x16.png"; if (!pm.load(ipath,"PNG") ) QMessageBox::warning( 0, tr( "Warning" ),tr("Could not open %1").arg(ipath));