--- texmaker.cpp	2008-10-31 06:58:56.000000000 -0400
+++ texmaker.cpp.new	2008-11-20 14:09:28.208401766 -0500
@@ -2156,7 +2156,7 @@
 if (!kdeversion.isEmpty()) desktop_env=3;
 
 latex_command=config->value("Tools/Latex","latex -interaction=nonstopmode %.tex").toString();
-dvips_command=config->value("Tools/Dvips","dvips -o %.ps %.dvi").toString();
+dvips_command=config->value("Tools/Dvips","dvips -o -t %.ps %.dvi").toString();
 ps2pdf_command=config->value("Tools/Ps2pdf","ps2pdf %.ps").toString();
 makeindex_command=config->value("Tools/Makeindex","makeindex %.idx").toString();
 bibtex_command=config->value("Tools/Bibtex","bibtex %.aux").toString();
@@ -2165,29 +2165,9 @@
 metapost_command=config->value("Tools/Metapost","mpost --interaction nonstopmode ").toString();
 // xdvi %.dvi  -sourceposition @:%.tex
 // kdvi "file:%.dvi#src:@ %.tex"
-switch (desktop_env)
-	{
-	case 1:
-		{
-		viewdvi_command=config->value("Tools/Dvi","evince %.dvi").toString();
-		viewps_command=config->value("Tools/Ps","evince %.ps").toString();
-		viewpdf_command=config->value("Tools/Pdf","evince %.pdf").toString();
-		}break;
-	case 2:
-		{
-		viewdvi_command=config->value("Tools/Dvi","kdvi %.dvi").toString();
-		viewps_command=config->value("Tools/Ps","kghostview %.ps").toString();
-		viewpdf_command=config->value("Tools/Pdf","kpdf %.pdf").toString();
-		}break;
-	case 3:
-		{
-		viewdvi_command=config->value("Tools/Dvi","okular %.dvi").toString();
-		viewps_command=config->value("Tools/Ps","okular %.ps").toString();
-		viewpdf_command=config->value("Tools/Pdf","okular %.pdf").toString();
-		}break;
-	}
-
-
+viewdvi_command=config->value("Tools/Dvi","xdg-open %.dvi").toString();
+viewps_command=config->value("Tools/Ps","xdg-open %.ps").toString();
+viewpdf_command=config->value("Tools/Pdf","xdg-open %.pdf").toString();
 
 ghostscript_command=config->value("Tools/Ghostscript","gs").toString();
 
@@ -2318,7 +2298,7 @@
 author=config->value("Quick/Author","").toString();
 
 #if defined( Q_WS_X11 )
-QString dicDir=PREFIX"/share/texmaker/";
+QString dicDir=PREFIX"/share/myspell/";
 #endif
 #if defined( Q_WS_MACX )
 QString dicDir=QCoreApplication::applicationDirPath() + "/../Resources/";