author | llornkcor <llornkcor> | 2002-10-09 19:06:44 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-10-09 19:06:44 (UTC) |
commit | 381ad47090a7dcf79d1d4fd11fff87ff565fb36b (patch) (side-by-side diff) | |
tree | a7f3b79d610dea39515936d8361fd1c03c9da4d8 /core | |
parent | c80818d8388c07c1606a70306aea0c9a1e17ea3c (diff) | |
download | opie-381ad47090a7dcf79d1d4fd11fff87ff565fb36b.zip opie-381ad47090a7dcf79d1d4fd11fff87ff565fb36b.tar.gz opie-381ad47090a7dcf79d1d4fd11fff87ff565fb36b.tar.bz2 |
split features up
-rw-r--r-- | core/apps/textedit/textedit.cpp | 64 | ||||
-rw-r--r-- | core/apps/textedit/textedit.h | 9 |
2 files changed, 50 insertions, 23 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index 6844023..f3937b1 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp @@ -263,4 +263,6 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) QPopupMenu *file = new QPopupMenu( this ); QPopupMenu *edit = new QPopupMenu( this ); + QPopupMenu *advancedMenu = new QPopupMenu(this); + font = new QPopupMenu( this ); @@ -325,25 +327,34 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) font->insertSeparator(); +// font->insertSeparator(); + font->insertItem(tr("Font"), this, SLOT(changeFont()) ); + + font->insertSeparator(); + font->insertItem(tr("Advanced Features"), advancedMenu); QAction *wa = new QAction( tr("Wrap lines"), QString::null, 0, this, 0 ); connect( wa, SIGNAL( toggled(bool) ), this, SLOT( setWordWrap(bool) ) ); wa->setToggleAction(TRUE); - wa->addTo( font ); - - font->insertSeparator(); - font->insertItem(tr("Font"), this, SLOT(changeFont()) ); - - font->insertSeparator(); + wa->addTo( advancedMenu); nStart = new QAction( tr("Start with new file"), QString::null, 0, this, 0 ); connect( nStart, SIGNAL( toggled(bool) ), this, SLOT( changeStartConfig(bool) ) ); nStart->setToggleAction(TRUE); - nStart->addTo( font ); + nStart->addTo( advancedMenu ); - nAdvanced = new QAction( tr("Advanced features"), QString::null, 0, this, 0 ); - connect( nAdvanced, SIGNAL( toggled(bool) ), this, SLOT( doAdvanced(bool) ) ); + nAdvanced = new QAction( tr("Prompt on Exit"), QString::null, 0, this, 0 ); + connect( nAdvanced, SIGNAL( toggled(bool) ), this, SLOT( doPrompt(bool) ) ); nAdvanced->setToggleAction(TRUE); - nAdvanced->addTo( font ); + nAdvanced->addTo( advancedMenu ); + + desktopAction = new QAction( tr("Always open linked file"), QString::null, 0, this, 0 ); + connect( desktopAction, SIGNAL( toggled(bool) ), this, SLOT( doDesktop(bool) ) ); + desktopAction->setToggleAction(TRUE); + desktopAction->addTo( advancedMenu); + filePermAction = new QAction( tr("File Permissions"), QString::null, 0, this, 0 ); + connect( filePermAction, SIGNAL( toggled(bool) ), this, SLOT( doFilePerms(bool) ) ); + filePermAction->setToggleAction(TRUE); + filePermAction->addTo( advancedMenu); font->insertSeparator(); @@ -387,5 +398,4 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) Config cfg("TextEdit"); - cfg. setGroup ( "Font" ); @@ -404,8 +414,11 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) cfg.setGroup ( "View" ); - useAdvancedFeatures = cfg. readBoolEntry ( "AdvancedFeatures", false ); + promptExit = cfg. readBoolEntry ( "PromptExit", false ); + openDesktop = cfg. readBoolEntry ( "OpenDesktop", true ); + filePerms = cfg. readBoolEntry ( "FilePermissions", false ); - if ( useAdvancedFeatures ) - nAdvanced-> setOn ( true ); + if(promptExit ) nAdvanced->setOn ( true ); + if(openDesktop) desktopAction->setOn ( true ); + if(filePerms) filePermAction->setOn ( true ); bool wrap = cfg. readBoolEntry ( "Wrap", true ); @@ -424,5 +437,5 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) TextEdit::~TextEdit() { - if( edited1 & !useAdvancedFeatures ) + if( edited1 & promptExit ) saveAs(); } @@ -442,5 +455,8 @@ void TextEdit::cleanUp() { cfg. writeEntry ( "Wrap", editor-> wordWrap ( ) == QMultiLineEdit::WidgetWidth ); cfg. writeEntry ( "FileView", viewSelection ); - cfg. writeEntry ( "AdvancedFeatures", useAdvancedFeatures ); + + cfg. writeEntry ( "PromptExit", promptExit ); + cfg. writeEntry ( "OpenDesktop", openDesktop ); + cfg. writeEntry ( "FilePermissions", filePerms ); } @@ -623,5 +639,5 @@ void TextEdit::openFile( const QString &f ) { QString filer; // bFromDocView = TRUE; - if(f.find(".desktop",0,TRUE) != -1 && useAdvancedFeatures) { + if(f.find(".desktop",0,TRUE) != -1 && !openDesktop) { switch ( QMessageBox::warning(this,tr("Text Editor"), tr("Text Editor has detected<BR>you selected a <B>.desktop</B> @@ -824,5 +840,5 @@ bool TextEdit::saveAs() { } - if( useAdvancedFeatures ) { + if( filePerms ) { filePermissions *filePerm; filePerm = new filePermissions(this, tr("Permissions"),true,0,(const QString &)fileNm); @@ -948,6 +964,14 @@ void TextEdit::doAbout() { } -void TextEdit::doAdvanced(bool b) { - useAdvancedFeatures=b; +void TextEdit::doPrompt(bool b) { + promptExit=b; +} + +void TextEdit::doDesktop(bool b) { + openDesktop=b; +} + +void TextEdit::doFilePerms(bool b) { + filePerms=b; } diff --git a/core/apps/textedit/textedit.h b/core/apps/textedit/textedit.h index a2badaa..4848051 100644 --- a/core/apps/textedit/textedit.h +++ b/core/apps/textedit/textedit.h @@ -58,5 +58,5 @@ public: QPopupMenu *font; - QAction *nStart, *nFileDlgOpt, *nAdvanced; + QAction *nStart, *nFileDlgOpt, *nAdvanced, *desktopAction, *filePermAction; bool edited, edited1; void openFile( const QString & ); @@ -66,10 +66,12 @@ public slots: void receive(const QCString&, const QByteArray&); protected: - bool fileIs, useAdvancedFeatures; + bool fileIs, useAdvancedFeatures, promptExit, openDesktop, filePerms; void closeEvent( QCloseEvent *e ); void doSearchBar(); private slots: void editPasteTimeDate(); - void doAdvanced(bool); + void doPrompt(bool); + void doDesktop(bool); + void doFilePerms(bool); void doAbout(); void setDocument(const QString&); @@ -117,4 +119,5 @@ private: QpeEditor* editor; QToolBar *menu, *editBar, *searchBar; + QPopupMenu *advancedMenu; QLineEdit *searchEdit; DocLnk *doc; |