1.1 --- a/texteditor.cpp	Fri Jul 08 07:24:43 2005 +0000
     1.2 +++ b/texteditor.cpp	Fri Jul 08 07:24:43 2005 +0000
     1.3 @@ -61,6 +61,7 @@
     1.4  TextEditor::TextEditor()
     1.5  {
     1.6      printer = new QPrinter( QPrinter::HighResolution );
     1.7 +	printer->setPrinterName (settings.readEntry("/vym/mainwindow/printerName",printer->printerName()));
     1.8  
     1.9  	// Editor
    1.10      e = new QTextEdit( this, "editor" );
    1.11 @@ -114,7 +115,14 @@
    1.12  		actionSettingsFonthintDefault->setOn (false);
    1.13  		e->setCurrentFont (varFont);
    1.14  	}	
    1.15 +<<<<<<< texteditor.cpp
    1.16  	filenameHint="";
    1.17 +
    1.18 +	// Save settings in vymrc
    1.19 +	settings.writeEntry("/vym/mainwindow/printerName",printer->printerName());
    1.20 +=======
    1.21 +	filenameHint="";
    1.22 +>>>>>>> 1.4
    1.23  }
    1.24  
    1.25