author | ar <ar> | 2004-06-20 21:17:00 (UTC) |
---|---|---|
committer | ar <ar> | 2004-06-20 21:17:00 (UTC) |
commit | 526031c34fff4e789b05fddbd7effe83ef057361 (patch) (side-by-side diff) | |
tree | 23146566d3d27ba9648d5a8e0500d6b41c6ac9f9 /noncore/apps | |
parent | f12be4d4ffaf6b5542b270c7d18fbb7141711309 (diff) | |
download | opie-526031c34fff4e789b05fddbd7effe83ef057361.zip opie-526031c34fff4e789b05fddbd7effe83ef057361.tar.gz opie-526031c34fff4e789b05fddbd7effe83ef057361.tar.bz2 |
- BUGFIX: 0001291 - opie tinykate does not open .desktop files
-rw-r--r-- | noncore/apps/tinykate/mainwindow/tinykate.cpp | 49 | ||||
-rw-r--r-- | noncore/apps/tinykate/mainwindow/tinykate.h | 0 |
2 files changed, 38 insertions, 11 deletions
diff --git a/noncore/apps/tinykate/mainwindow/tinykate.cpp b/noncore/apps/tinykate/mainwindow/tinykate.cpp index 9865c35..30c07fc 100644 --- a/noncore/apps/tinykate/mainwindow/tinykate.cpp +++ b/noncore/apps/tinykate/mainwindow/tinykate.cpp @@ -27,12 +27,13 @@ #include <qpe/qpeapplication.h> /* QT */ #include <qaction.h> #include <qtoolbutton.h> #include <qmenubar.h> +#include <qmessagebox.h> using namespace Opie::Ui; TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) : QMainWindow( parent, name, f ) { @@ -157,53 +158,76 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) : TinyKate::~TinyKate( ) { owarn << "TinyKate destructor\n" << oendl; shutDown=true; - while (currentView!=0) { + while (currentView!=0) + { slotClose(); } - if( KGlobal::config() != 0 ) { + if( KGlobal::config() != 0 ) + { owarn << "deleting KateConfig object..\n" << oendl; delete KGlobal::config(); } } void TinyKate::slotOpen( ) { QString filename = OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL, QString::null); - if (!filename.isEmpty()) { + if (!filename.isEmpty()) + { open(filename); } } void TinyKate::open(const QString & filename) { KateDocument *kd= new KateDocument(false, false, this,0,this); KTextEditor::View *kv; - QFileInfo fi(filename); - QString filenamed = fi.fileName(); + QString realFileName; + //check if filename is a .desktop file + if ( filename.find( ".desktop", 0, true ) ) + { + switch ( QMessageBox::warning( this, tr( "TinyKATE" ), + tr("TinyKATE has detected<BR>you selected a <B>.desktop</B> file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?" ), + tr(".desktop File"), + tr("Linked Document"), 0, 1, 1 ) ) + { + case 0: //desktop + realFileName = filename; + break; + case 1: //linked + DocLnk docLnk( filename ); + realFileName = docLnk.file(); + break; + }; + } + + QFileInfo fileInfo( realFileName ); + QString filenamed = fileInfo.fileName(); tabwidget->addTab(kv=kd->createView(tabwidget,"bLAH"),"tinykate/tinykate", filenamed ); - odebug << filename << oendl; + odebug << realFileName << oendl; kd->setDocName( filenamed); - kd->open( filename ); + kd->open( realFileName ); viewCount++; } void TinyKate::setDocument(const QString& fileref) { open( fileref ); } void TinyKate::slotCurrentChanged( QWidget * view) { - if (currentView) { + if (currentView) + { disconnect(editCopy,SIGNAL(activated()),currentView,SLOT(copy())); disconnect(editCut,SIGNAL(activated()),currentView,SLOT(cut())); disconnect(editPaste,SIGNAL(activated()),currentView,SLOT(paste())); disconnect(editUndo,SIGNAL(activated()),currentView,SLOT(undo())); disconnect(editRedo,SIGNAL(activated()),currentView,SLOT(redo())); @@ -245,13 +269,14 @@ void TinyKate::slotClose( ) tabwidget->removePage(dv); delete dv->document(); viewCount--; if ((!viewCount) && (!shutDown)) slotNew(); } -void TinyKate::slotSave() { +void TinyKate::slotSave() +{ // feel free to make this how you want if (currentView==0) return; // KateView *kv = (KateView*) currentView; KateDocument *kd = (KateDocument*) currentView->document(); // odebug << "saving file "+kd->docName() << oendl; @@ -260,19 +285,21 @@ void TinyKate::slotSave() { else kd->saveFile(); // kv->save(); // kd->saveFile(); } -void TinyKate::slotSaveAs() { +void TinyKate::slotSaveAs() +{ if (currentView==0) return; KateDocument *kd = (KateDocument*) currentView->document(); QString filename= OFileDialog::getSaveFileName(OFileSelector::EXTENDED_ALL, QString::null); - if (!filename.isEmpty()) { + if (!filename.isEmpty()) + { odebug << "saving file "+filename << oendl; QFileInfo fi(filename); QString filenamed = fi.fileName(); kd->setDocFile( filename); kd->setDocName( filenamed); kd->saveFile(); diff --git a/noncore/apps/tinykate/mainwindow/tinykate.h b/noncore/apps/tinykate/mainwindow/tinykate.h index f435c03..f630f62 100644 --- a/noncore/apps/tinykate/mainwindow/tinykate.h +++ b/noncore/apps/tinykate/mainwindow/tinykate.h |