diff -r 699f28529079 -r 41c3d7f9f532 exportxhtmldialog.ui.h --- a/exportxhtmldialog.ui.h Tue Aug 15 12:01:14 2006 +0000 +++ b/exportxhtmldialog.ui.h Tue Aug 29 08:31:42 2006 +0000 @@ -25,42 +25,42 @@ void ExportXHTMLDialog::readSettings() { - dir=settings.readLocalEntry (filepath,"/vym/export/xhtml/exportDir",vymBaseDir.currentDirPath() ); + dir=settings.readLocalEntry (filepath,"/export/xhtml/exportDir",vymBaseDir.currentDirPath() ); lineEditDir->setText(dir); - if ( settings.readLocalEntry (filepath,"/vym/export/xhtml/useImage","yes")=="yes") + if ( settings.readLocalEntry (filepath,"/export/xhtml/useImage","yes")=="yes") useImage=true; else useImage=false; imageButton->setChecked(useImage); - if ( settings.readLocalEntry (filepath,"/vym/export/xhtml/useTextColor","no")=="yes") + if ( settings.readLocalEntry (filepath,"/export/xhtml/useTextColor","no")=="yes") useTextColor=true; else useTextColor=false; textColorButton->setChecked(useTextColor); /* FIXME this was used in old html export, is not yet in new stylesheet - if ( settings.readEntry ("/vym/export/html/useHeading","no")=="yes") + if ( settings.readEntry ("/export/html/useHeading","no")=="yes") useHeading=true; else useHeading=false; checkBox4_2->setChecked(useHeading); */ - if ( settings.readLocalEntry (filepath,"/vym/export/xhtml/saveSettingsInMap","no")=="yes") + if ( settings.readLocalEntry (filepath,"/export/xhtml/saveSettingsInMap","no")=="yes") saveSettingsInMap=true; else saveSettingsInMap=false; saveSettingsInMapButton->setChecked(saveSettingsInMap); - if ( settings.readEntry ("/vym/export/xhtml/showWarnings","yes")=="yes") + if ( settings.readEntry ("/export/xhtml/showWarnings","yes")=="yes") showWarnings=true; else showWarnings=false; warningsButton->setChecked(showWarnings); - if ( settings.readEntry ("/vym/export/xhtml/showOutput","no")=="yes") + if ( settings.readEntry ("/export/xhtml/showOutput","no")=="yes") showOutput=true; else showOutput=false; @@ -74,19 +74,19 @@ } else { xsl=settings.readLocalEntry - (filepath,"/vym/export/xhtml/xsl","/usr/share/vym/styles/vym2xhtml.xsl"); + (filepath,"/export/xhtml/xsl","/usr/share/vym/styles/vym2xhtml.xsl"); css=settings.readLocalEntry - (filepath,"/vym/export/xhtml/css","/usr/share/vym/styles/vym.css"); + (filepath,"/export/xhtml/css","/usr/share/vym/styles/vym.css"); } lineEditXSL->setText(xsl); lineEditCSS->setText(css); prescript=settings.readLocalEntry - (filepath,"/vym/export/xhtml/prescript",""); + (filepath,"/export/xhtml/prescript",""); lineEditPreScript->setText (prescript); postscript=settings.readLocalEntry - (filepath,"/vym/export/xhtml/postscript",""); + (filepath,"/export/xhtml/postscript",""); lineEditPostScript->setText (postscript); if (!prescript.isEmpty() || !postscript.isEmpty()) @@ -251,38 +251,38 @@ // Save options to settings file // (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); + settings.setLocalEntry (filepath,"/export/xhtml/exportDir",dir); + settings.setLocalEntry (filepath,"/export/xhtml/prescript",prescript); + settings.setLocalEntry (filepath,"/export/xhtml/postscript",postscript); if (useImage) - settings.setLocalEntry (filepath,"/vym/export/xhtml/useImage","yes"); + settings.setLocalEntry (filepath,"/export/xhtml/useImage","yes"); else - settings.setLocalEntry (filepath,"/vym/export/xhtml/useImage","no"); + settings.setLocalEntry (filepath,"/export/xhtml/useImage","no"); if (useTextColor) - settings.setLocalEntry (filepath,"/vym/export/xhtml/useTextColor","yes"); + settings.setLocalEntry (filepath,"/export/xhtml/useTextColor","yes"); else - settings.setLocalEntry (filepath,"/vym/export/xhtml/useTextColor","no"); + settings.setLocalEntry (filepath,"/export/xhtml/useTextColor","no"); if (showWarnings) - settings.writeEntry ("/vym/export/xhtml/showWarnings","yes"); + settings.writeEntry ("/export/xhtml/showWarnings","yes"); else - settings.writeEntry ("/vym/export/xhtml/showWarnings","no"); + settings.writeEntry ("/export/xhtml/showWarnings","no"); if (showOutput) - settings.writeEntry ("/vym/export/xhtml/showOutput","yes"); + settings.writeEntry ("/export/xhtml/showOutput","yes"); else - settings.writeEntry ("/vym/export/xhtml/showOutput","no"); + settings.writeEntry ("/export/xhtml/showOutput","no"); QString ipath; ipath=vymBaseDir.path()+"/flags/flag-url-16x16.png"; if (!options.isOn ("local")) { settings.setLocalEntry - (filepath,"/vym/export/xhtml/xsl",xsl); + (filepath,"/export/xhtml/xsl",xsl); settings.setLocalEntry - (filepath,"/vym/export/xhtml/css",css); + (filepath,"/export/xhtml/css",css); } // Provide a smaller URL-icon to improve Layout @@ -294,10 +294,10 @@ 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"); + settings.clearLocal("/export/xhtml"); else settings.setLocalEntry - (filepath,"/vym/export/xhtml/saveSettingsInMap","yes"); + (filepath,"/export/xhtml/saveSettingsInMap","yes"); // Copy CSS file QFile css_src (css);