1.1 --- a/exportxhtmldialog.ui.h Wed Mar 08 12:59:08 2006 +0000
1.2 +++ b/exportxhtmldialog.ui.h Tue Mar 14 14:27:04 2006 +0000
1.3 @@ -9,6 +9,8 @@
1.4
1.5
1.6 extern Settings settings;
1.7 +extern QDir vymBaseDir;
1.8 +extern Options options;
1.9
1.10 void ExportXHTMLDialog::init()
1.11 {
1.12 @@ -23,7 +25,6 @@
1.13 dir=settings.readLocalEntry (filepath,"/vym/export/xhtml/exportDir","./" );
1.14 lineEditDir->setText(dir);
1.15
1.16 -
1.17 if ( settings.readLocalEntry (filepath,"/vym/export/xhtml/useImage","yes")=="yes")
1.18 useImage=true;
1.19 else
1.20 @@ -62,12 +63,19 @@
1.21 showOutput=false;
1.22 outputButton->setChecked(showOutput);
1.23
1.24 - xsl=settings.readLocalEntry
1.25 - (filepath,"/vym/export/xhtml/xsl","/usr/share/vym/styles/vym2xhtml.xsl");
1.26 + // For testing better use local styles
1.27 + if (options.isOn ("local"))
1.28 + {
1.29 + xsl=vymBaseDir.path()+"/styles/vym2xhtml.xsl";
1.30 + css=vymBaseDir.path()+"/styles/vym.css";
1.31 + } else
1.32 + {
1.33 + xsl=settings.readLocalEntry
1.34 + (filepath,"/vym/export/xhtml/xsl","/usr/share/vym/styles/vym2xhtml.xsl");
1.35 + css=settings.readLocalEntry
1.36 + (filepath,"/vym/export/xhtml/css","/usr/share/vym/styles/vym.css");
1.37 + }
1.38 lineEditXSL->setText(xsl);
1.39 -
1.40 - css=settings.readLocalEntry
1.41 - (filepath,"/vym/export/xhtml/css","/usr/share/vym/styles/vym.css");
1.42 lineEditCSS->setText(css);
1.43
1.44 prescript=settings.readLocalEntry
1.45 @@ -241,7 +249,6 @@
1.46 // (but don't save at destructor, which
1.47 // is called for "cancel", too)
1.48 settings.setLocalEntry (filepath,"/vym/export/xhtml/exportDir",dir);
1.49 -
1.50 settings.setLocalEntry (filepath,"/vym/export/xhtml/prescript",prescript);
1.51 settings.setLocalEntry (filepath,"/vym/export/xhtml/postscript",postscript);
1.52
1.53 @@ -264,15 +271,22 @@
1.54 settings.writeEntry ("/vym/export/xhtml/showOutput","yes");
1.55 else
1.56 settings.writeEntry ("/vym/export/xhtml/showOutput","no");
1.57 -
1.58 - settings.setLocalEntry
1.59 - (filepath,"/vym/export/xhtml/xsl",xsl);
1.60 - settings.setLocalEntry
1.61 - (filepath,"/vym/export/xhtml/css",css);
1.62 +
1.63 + QString ipath;
1.64 + if (options.isOn ("local"))
1.65 + {
1.66 + ipath=vymBaseDir.path()+"/icons/flag-url-16x16.png";
1.67 + } else
1.68 + {
1.69 + ipath=vymBaseDir.path()+"/images/flag-url-16x16.png";
1.70 + settings.setLocalEntry
1.71 + (filepath,"/vym/export/xhtml/xsl",xsl);
1.72 + settings.setLocalEntry
1.73 + (filepath,"/vym/export/xhtml/css",css);
1.74 + }
1.75
1.76 // Provide a smaller URL-icon to improve Layout
1.77 QPixmap pm;
1.78 - QString ipath="/usr/share/vym/images/flag-url-16x16.png";
1.79 if (!pm.load(ipath,"PNG") )
1.80 QMessageBox::warning( 0, tr( "Warning" ),tr("Could not open %1").arg(ipath));
1.81