diff -r aff86e2f2a4a -r 9c86935835a4 texteditor.cpp --- a/texteditor.cpp Wed May 02 15:31:18 2007 +0000 +++ b/texteditor.cpp Wed May 02 15:31:20 2007 +0000 @@ -56,23 +56,23 @@ setInactive(); // Load Settings - resize (settings.value ( "/noteeditor/geometry/size", QSize(450,600)).toSize()); - move (settings.value ( "/noteeditor/geometry/pos", QPoint (250,50)).toPoint()); + resize (settings.value ( "/satellite/noteeditor/geometry/size", QSize(450,600)).toSize()); + move (settings.value ( "/satellite/noteeditor/geometry/pos", QPoint (250,50)).toPoint()); - if (settings.value ( "/noteeditor/showWithMain",true).toBool()) - setShowWithMain(true); + if (settings.value ( "/satellite/noteeditor/showWithMain",true).toBool()) + show(); else - setShowWithMain(false); + hide(); varFont.fromString( settings.value - ("/noteeditor/fonts/varFont", + ("/satellite/noteeditor/fonts/varFont", "Nimbus Sans l,14,-1,5,48,0,0,0,0,0").toString() ); fixedFont.fromString (settings.value( - "/noteeditor/fonts/fixedFont", + "/satellite/noteeditor/fonts/fixedFont", "Courier,14,-1,5,48,0,0,0,1,0").toString() ); - QString s=settings.value ("/noteeditor/fonts/fonthintDefault","variable").toString(); + QString s=settings.value ("/satellite/noteeditor/fonts/fonthintDefault","variable").toString(); if (s == "fixed") { actionSettingsFonthintDefault->setOn (true); @@ -85,7 +85,7 @@ filenameHint=""; // Restore position of toolbars - restoreState (settings.value("/noteeditor/state",0).toByteArray()); + restoreState (settings.value("/satellite/noteeditor/state",0).toByteArray()); // Save settings in vymrc settings.setValue("/mainwindow/printerName",printer->printerName()); @@ -96,20 +96,20 @@ { if (printer) delete printer; // Save Settings - settings.setValue( "/noteeditor/geometry/size", size() ); - settings.setValue( "/noteeditor/geometry/pos", pos() ); - settings.setValue ("/noteeditor/state",saveState(0)); + settings.setValue( "/satellite/noteeditor/geometry/size", size() ); + settings.setValue( "/satellite/noteeditor/geometry/pos", pos() ); + settings.setValue ("/satellite/noteeditor/state",saveState(0)); - settings.setValue( "/noteeditor/showWithMain",showWithMain()); + settings.setValue( "/satellite/noteeditor/showWithMain",isVisible()); QString s; if (actionSettingsFonthintDefault->isOn() ) s="fixed"; else s="variable"; - settings.setValue( "/noteeditor/fonts/fonthintDefault",s ); - settings.setValue("/noteeditor/fonts/varFont", varFont.toString() ); - settings.setValue("/noteeditor/fonts/fixedFont", fixedFont.toString() ); + settings.setValue( "/satellite/noteeditor/fonts/fonthintDefault",s ); + settings.setValue("/satellite/noteeditor/fonts/varFont", varFont.toString() ); + settings.setValue("/satellite/noteeditor/fonts/fixedFont", fixedFont.toString() ); } @@ -122,16 +122,6 @@ return true; } -void TextEditor::setShowWithMain(bool v) -{ - showwithmain=v; -} - -bool TextEditor::showWithMain() -{ - return showwithmain; -} - void TextEditor::setFontHint (const QString &fh) { if (fh=="fixed") @@ -499,7 +489,7 @@ void TextEditor::closeEvent( QCloseEvent* ce ) { ce->accept(); // TextEditor can be reopened with show() - showwithmain=false; + hide(); emit (windowClosed() ); return; }