1.1 --- a/texteditor.cpp	Mon Oct 30 12:39:37 2006 +0000
     1.2 +++ b/texteditor.cpp	Thu Nov 23 13:53:08 2006 +0000
     1.3 @@ -5,14 +5,16 @@
     1.4  #include <typeinfo>
     1.5  
     1.6  #include "noteobj.h"
     1.7 +#include "settings.h"
     1.8  #include "version.h"
     1.9  
    1.10  extern int statusbarTime;
    1.11 -extern QSettings settings;
    1.12 +extern Settings settings;
    1.13  
    1.14  extern QAction *actionViewToggleNoteEditor;
    1.15  
    1.16  extern QString iconPath;
    1.17 +extern QString vymName;
    1.18  
    1.19  using namespace std;
    1.20  
    1.21 @@ -35,7 +37,7 @@
    1.22  	connect (e, SIGNAL( textChanged() ), this, SLOT( editorChanged() ) );
    1.23      setCentralWidget( e );
    1.24      statusBar()->message( tr("Ready","Statusbar message"), statusbarTime);
    1.25 -	setCaption(__VYM " - " +tr ("Note Editor","Window caption"));
    1.26 +	setCaption(vymName +" - " +tr ("Note Editor","Window caption"));
    1.27  
    1.28  
    1.29  	connect(e, SIGNAL(currentCharFormatChanged(const QTextCharFormat &)),
    1.30 @@ -454,7 +456,7 @@
    1.31  	{
    1.32  		if (e->text().length()) 
    1.33  		{
    1.34 -			QMessageBox mb( __VYM " - " +tr("Note Editor"),
    1.35 +			QMessageBox mb( vymName + " - " +tr("Note Editor"),
    1.36  				"Loading will overwrite the existing note",
    1.37  				QMessageBox::Warning,
    1.38  				QMessageBox::Yes | QMessageBox::Default,
    1.39 @@ -558,7 +560,7 @@
    1.40  		QFile file (fn);
    1.41  		if (file.exists())
    1.42  		{
    1.43 -			QMessageBox mb( __VYM,
    1.44 +			QMessageBox mb( vymName,
    1.45  				tr("The file %1\nexists already.\nDo you want to overwrite it?","dialog 'save note as'").arg(fn),
    1.46  			QMessageBox::Warning,
    1.47  			QMessageBox::Yes | QMessageBox::Default,
    1.48 @@ -633,7 +635,7 @@
    1.49  		QFile file (fn);
    1.50  		if (file.exists())
    1.51  		{
    1.52 -			QMessageBox mb( __VYM,
    1.53 +			QMessageBox mb( vymName,
    1.54  				tr("The file %1\nexists already.\nDo you want to overwrite it?","dialog 'save note as'").arg(fn),
    1.55  			QMessageBox::Warning,
    1.56  			QMessageBox::Yes | QMessageBox::Default,