--- texmaker.cpp 2010-07-29 04:19:28.000000000 -0400
+++ texmaker.cpp.new 2010-08-06 10:43:28.815922629 -0400
@@ -2449,28 +2449,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();
@@ -2621,7 +2602,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/";
@@ -3640,7 +3621,7 @@
tag+="}\n";
InsertTag(tag,9,0);
OutputTextEdit->insertLine("Bib fields - Article in Journal");
-OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
}
void Texmaker::InsertBib2()
{
@@ -3665,7 +3646,7 @@
tag+="}\n";
InsertTag(tag,15,0);
OutputTextEdit->insertLine("Bib fields - Article in Conference Proceedings");
-OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
}
void Texmaker::InsertBib3()
{
@@ -3692,7 +3673,7 @@
tag+="}\n";
InsertTag(tag,14,0);
OutputTextEdit->insertLine("Bib fields - Article in a Collection");
-OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
}
void Texmaker::InsertBib4()
{
@@ -3718,7 +3699,7 @@
InsertTag(tag,8,0);
OutputTextEdit->insertLine("Bib fields - Chapter or Pages in a Book");
OutputTextEdit->insertLine( "ALT.... : you have the choice between these two fields");
-OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
}
void Texmaker::InsertBib5()
{
@@ -3739,7 +3720,7 @@
tag+="}\n";
InsertTag(tag,13,0);
OutputTextEdit->insertLine("Bib fields - Conference Proceedings");
-OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
}
void Texmaker::InsertBib6()
{
@@ -3762,7 +3743,7 @@
InsertTag(tag,6,0);
OutputTextEdit->insertLine("Bib fields - Book");
OutputTextEdit->insertLine( "ALT.... : you have the choice between these two fields");
-OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
}
void Texmaker::InsertBib7()
{
@@ -3779,7 +3760,7 @@
tag+="}\n";
InsertTag(tag,9,0);
OutputTextEdit->insertLine("Bib fields - Booklet");
-OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
}
void Texmaker::InsertBib8()
{
@@ -3797,7 +3778,7 @@
tag+="}\n";
InsertTag(tag,11,0);
OutputTextEdit->insertLine("Bib fields - PhD. Thesis");
-OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
}
void Texmaker::InsertBib9()
{
@@ -3815,7 +3796,7 @@
tag+="}\n";
InsertTag(tag,15,0);
OutputTextEdit->insertLine("Bib fields - Master's Thesis");
-OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
}
void Texmaker::InsertBib10()
{
@@ -3834,7 +3815,7 @@
tag+="}\n";
InsertTag(tag,12,0);
OutputTextEdit->insertLine("Bib fields - Technical Report");
-OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
}
void Texmaker::InsertBib11()
{
@@ -3852,7 +3833,7 @@
tag+="}\n";
InsertTag(tag,8,0);
OutputTextEdit->insertLine("Bib fields - Technical Manual");
-OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
}
void Texmaker::InsertBib12()
{
@@ -3867,7 +3848,7 @@
tag+="}\n";
InsertTag(tag,13,0);
OutputTextEdit->insertLine("Bib fields - Unpublished");
-OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
}
void Texmaker::InsertBib13()
{
@@ -3883,7 +3864,7 @@
tag+="}\n";
InsertTag(tag,6,0);
OutputTextEdit->insertLine("Bib fields - Miscellaneous");
-OutputTextEdit->insertLine( "OPT.... : optionnal fields (use the 'Clean' command to remove them)");
+OutputTextEdit->insertLine( "OPT.... : optional fields (use the 'Clean' command to remove them)");
}
void Texmaker::CleanBib()
--- texmaker.pro 2010-07-29 11:40:36.000000000 -0400
+++ texmaker.pro.new 2010-08-06 10:47:32.559306900 -0400
@@ -4,7 +4,8 @@
QT += network \
xml \
webkit
-CONFIG += qt warn_off release
+CONFIG += qt warn_off release link_pkgconfig
+PKGCONFIG = hunspell
TEXMAKERVERSION=2.0
DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
###############################
@@ -48,25 +49,6 @@
pdfdocumentwidget.h \
pdfscrollarea.h \
userquickdialog.h \
- hunspell/affentry.hxx \
- hunspell/affixmgr.hxx \
- hunspell/atypes.hxx \
- hunspell/baseaffix.hxx \
- hunspell/csutil.hxx \
- hunspell/dictmgr.hxx \
- hunspell/hashmgr.hxx \
- hunspell/htypes.hxx \
- hunspell/hunspell.hxx \
- hunspell/hunspell.h \
- hunspell/langnum.hxx \
- hunspell/license.hunspell \
- hunspell/phonet.hxx \
- hunspell/suggestmgr.hxx \
- hunspell/license.myspell \
- hunspell/filemgr.hxx \
- hunspell/hunzip.hxx \
- hunspell/replist.hxx \
- hunspell/w_char.hxx \
singleapp/qtlocalpeer.h \
singleapp/qtlockedfile.h \
singleapp/qtsingleapplication.h \
@@ -111,18 +93,6 @@
pdfdocumentwidget.cpp \
pdfscrollarea.cpp \
userquickdialog.cpp \
- hunspell/affentry.cxx \
- hunspell/affixmgr.cxx \
- hunspell/csutil.cxx \
- hunspell/dictmgr.cxx \
- hunspell/hashmgr.cxx \
- hunspell/hunspell.cxx \
- hunspell/phonet.cxx \
- hunspell/suggestmgr.cxx \
- hunspell/utf_info.cxx \
- hunspell/filemgr.cxx \
- hunspell/replist.cxx \
- hunspell/hunzip.cxx \
singleapp/qtlocalpeer.cpp \
singleapp/qtlockedfile.cpp \
singleapp/qtsingleapplication.cpp \
--- spellerdialog.h 2009-05-08 06:32:29.000000000 -0400
+++ spellerdialog.h.new 2010-08-06 10:44:29.452951054 -0400
@@ -13,7 +13,7 @@
#include "ui_spellerdialog.h"
#include "latexeditor.h"
-#include "hunspell/hunspell.hxx"
+#include <hunspell.hxx>
#include <QTextCursor>
