-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 | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <qaction.h> | 30 | #include <qaction.h> |
31 | #include <qtoolbutton.h> | 31 | #include <qtoolbutton.h> |
32 | #include <qmenubar.h> | 32 | #include <qmenubar.h> |
33 | #include <qmessagebox.h> | ||
33 | 34 | ||
34 | 35 | ||
35 | using namespace Opie::Ui; | 36 | using namespace Opie::Ui; |
@@ -160,11 +161,13 @@ TinyKate::~TinyKate( ) | |||
160 | owarn << "TinyKate destructor\n" << oendl; | 161 | owarn << "TinyKate destructor\n" << oendl; |
161 | 162 | ||
162 | shutDown=true; | 163 | shutDown=true; |
163 | while (currentView!=0) { | 164 | while (currentView!=0) |
165 | { | ||
164 | slotClose(); | 166 | slotClose(); |
165 | } | 167 | } |
166 | 168 | ||
167 | if( KGlobal::config() != 0 ) { | 169 | if( KGlobal::config() != 0 ) |
170 | { | ||
168 | owarn << "deleting KateConfig object..\n" << oendl; | 171 | owarn << "deleting KateConfig object..\n" << oendl; |
169 | delete KGlobal::config(); | 172 | delete KGlobal::config(); |
170 | } | 173 | } |
@@ -174,7 +177,8 @@ void TinyKate::slotOpen( ) | |||
174 | { | 177 | { |
175 | QString filename = OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL, | 178 | QString filename = OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL, |
176 | QString::null); | 179 | QString::null); |
177 | if (!filename.isEmpty()) { | 180 | if (!filename.isEmpty()) |
181 | { | ||
178 | open(filename); | 182 | open(filename); |
179 | } | 183 | } |
180 | } | 184 | } |
@@ -183,13 +187,32 @@ void TinyKate::open(const QString & filename) | |||
183 | { | 187 | { |
184 | KateDocument *kd= new KateDocument(false, false, this,0,this); | 188 | KateDocument *kd= new KateDocument(false, false, this,0,this); |
185 | KTextEditor::View *kv; | 189 | KTextEditor::View *kv; |
186 | QFileInfo fi(filename); | 190 | QString realFileName; |
187 | QString filenamed = fi.fileName(); | 191 | //check if filename is a .desktop file |
192 | if ( filename.find( ".desktop", 0, true ) ) | ||
193 | { | ||
194 | switch ( QMessageBox::warning( this, tr( "TinyKATE" ), | ||
195 | tr("TinyKATE has detected<BR>you selected a <B>.desktop</B> file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?" ), | ||
196 | tr(".desktop File"), | ||
197 | tr("Linked Document"), 0, 1, 1 ) ) | ||
198 | { | ||
199 | case 0: //desktop | ||
200 | realFileName = filename; | ||
201 | break; | ||
202 | case 1: //linked | ||
203 | DocLnk docLnk( filename ); | ||
204 | realFileName = docLnk.file(); | ||
205 | break; | ||
206 | }; | ||
207 | } | ||
208 | |||
209 | QFileInfo fileInfo( realFileName ); | ||
210 | QString filenamed = fileInfo.fileName(); | ||
188 | tabwidget->addTab(kv=kd->createView(tabwidget,"bLAH"),"tinykate/tinykate", filenamed ); | 211 | tabwidget->addTab(kv=kd->createView(tabwidget,"bLAH"),"tinykate/tinykate", filenamed ); |
189 | odebug << filename << oendl; | 212 | odebug << realFileName << oendl; |
190 | 213 | ||
191 | kd->setDocName( filenamed); | 214 | kd->setDocName( filenamed); |
192 | kd->open( filename ); | 215 | kd->open( realFileName ); |
193 | viewCount++; | 216 | viewCount++; |
194 | } | 217 | } |
195 | 218 | ||
@@ -200,7 +223,8 @@ void TinyKate::setDocument(const QString& fileref) | |||
200 | 223 | ||
201 | void TinyKate::slotCurrentChanged( QWidget * view) | 224 | void TinyKate::slotCurrentChanged( QWidget * view) |
202 | { | 225 | { |
203 | if (currentView) { | 226 | if (currentView) |
227 | { | ||
204 | 228 | ||
205 | disconnect(editCopy,SIGNAL(activated()),currentView,SLOT(copy())); | 229 | disconnect(editCopy,SIGNAL(activated()),currentView,SLOT(copy())); |
206 | disconnect(editCut,SIGNAL(activated()),currentView,SLOT(cut())); | 230 | disconnect(editCut,SIGNAL(activated()),currentView,SLOT(cut())); |
@@ -248,7 +272,8 @@ void TinyKate::slotClose( ) | |||
248 | if ((!viewCount) && (!shutDown)) slotNew(); | 272 | if ((!viewCount) && (!shutDown)) slotNew(); |
249 | } | 273 | } |
250 | 274 | ||
251 | void TinyKate::slotSave() { | 275 | void TinyKate::slotSave() |
276 | { | ||
252 | // feel free to make this how you want | 277 | // feel free to make this how you want |
253 | if (currentView==0) return; | 278 | if (currentView==0) return; |
254 | 279 | ||
@@ -263,13 +288,15 @@ void TinyKate::slotSave() { | |||
263 | // kd->saveFile(); | 288 | // kd->saveFile(); |
264 | } | 289 | } |
265 | 290 | ||
266 | void TinyKate::slotSaveAs() { | 291 | void TinyKate::slotSaveAs() |
292 | { | ||
267 | if (currentView==0) return; | 293 | if (currentView==0) return; |
268 | KateDocument *kd = (KateDocument*) currentView->document(); | 294 | KateDocument *kd = (KateDocument*) currentView->document(); |
269 | 295 | ||
270 | QString filename= OFileDialog::getSaveFileName(OFileSelector::EXTENDED_ALL, | 296 | QString filename= OFileDialog::getSaveFileName(OFileSelector::EXTENDED_ALL, |
271 | QString::null); | 297 | QString::null); |
272 | if (!filename.isEmpty()) { | 298 | if (!filename.isEmpty()) |
299 | { | ||
273 | odebug << "saving file "+filename << oendl; | 300 | odebug << "saving file "+filename << oendl; |
274 | QFileInfo fi(filename); | 301 | QFileInfo fi(filename); |
275 | QString filenamed = fi.fileName(); | 302 | QString filenamed = fi.fileName(); |
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 | |||