summaryrefslogtreecommitdiff
path: root/noncore/apps/tinykate
Unidiff
Diffstat (limited to 'noncore/apps/tinykate') (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp2
-rw-r--r--noncore/apps/tinykate/mainwindow/tinykate.cpp6
2 files changed, 2 insertions, 6 deletions
diff --git a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
index 9fa4452..d8f5aa7 100644
--- a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
+++ b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
@@ -48,27 +48,25 @@ void SyntaxDocument::setIdentifier(const QString& identifier)
48} 48}
49 49
50SyntaxDocument::~SyntaxDocument() 50SyntaxDocument::~SyntaxDocument()
51{ 51{
52} 52}
53 53
54void SyntaxDocument::setupModeList(bool force) 54void SyntaxDocument::setupModeList(bool force)
55{ 55{
56 56
57 if (myModeList.count() > 0) return; 57 if (myModeList.count() > 0) return;
58 58
59 KateConfig *config=KGlobal::config(); 59 KateConfig *config=KGlobal::config();
60 KStandardDirs *dirs = KGlobal::dirs();
61 60
62// QStringList list=dirs->findAllResources("data","kate/syntax/*.xml",false,true);
63 QString path=QPEApplication::qpeDir() +"share/tinykate/syntax/"; 61 QString path=QPEApplication::qpeDir() +"share/tinykate/syntax/";
64 62
65 QDir dir(path); 63 QDir dir(path);
66 QStringList list=dir.entryList("*.xml"); 64 QStringList list=dir.entryList("*.xml");
67 65
68 for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) 66 for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
69 { 67 {
70 QString Group="Highlighting_Cache"+path+*it; 68 QString Group="Highlighting_Cache"+path+*it;
71 if ((config->hasGroup(Group)) && (!force)) 69 if ((config->hasGroup(Group)) && (!force))
72 { 70 {
73 config->setGroup(Group); 71 config->setGroup(Group);
74 syntaxModeListItem *mli=new syntaxModeListItem; 72 syntaxModeListItem *mli=new syntaxModeListItem;
diff --git a/noncore/apps/tinykate/mainwindow/tinykate.cpp b/noncore/apps/tinykate/mainwindow/tinykate.cpp
index e87464e..e920d5b 100644
--- a/noncore/apps/tinykate/mainwindow/tinykate.cpp
+++ b/noncore/apps/tinykate/mainwindow/tinykate.cpp
@@ -194,48 +194,47 @@ void TinyKate::slotOpen( )
194{ 194{
195 QString filename = OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL, 195 QString filename = OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL,
196 QString::null); 196 QString::null);
197 if (!filename.isEmpty()) 197 if (!filename.isEmpty())
198 { 198 {
199 open(filename); 199 open(filename);
200 } 200 }
201} 201}
202 202
203void TinyKate::open(const QString & filename) 203void TinyKate::open(const QString & filename)
204{ 204{
205 KateDocument *kd= new KateDocument(false, false, this,0,this); 205 KateDocument *kd= new KateDocument(false, false, this,0,this);
206 KTextEditor::View *kv;
207 QString realFileName; 206 QString realFileName;
208 //check if filename is a .desktop file 207 //check if filename is a .desktop file
209 if ( filename.find( ".desktop", 0, true ) != -1 ) { 208 if ( filename.find( ".desktop", 0, true ) != -1 ) {
210 switch ( QMessageBox::warning( this, tr( "TinyKATE" ), 209 switch ( QMessageBox::warning( this, tr( "TinyKATE" ),
211 tr("TinyKATE has detected<BR>you selected a <B>.desktop</B> file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?" ), 210 tr("TinyKATE has detected<BR>you selected a <B>.desktop</B> file.<BR>Open <B>.desktop</B> file or <B>linked</B> file?" ),
212 tr(".desktop File"), 211 tr(".desktop File"),
213 tr("Linked Document"), 0, 1, 1 ) ) 212 tr("Linked Document"), 0, 1, 1 ) )
214 { 213 {
215 case 0: //desktop 214 case 0: //desktop
216 realFileName = filename; 215 realFileName = filename;
217 break; 216 break;
218 case 1: //linked 217 case 1: //linked
219 DocLnk docLnk( filename ); 218 DocLnk docLnk( filename );
220 realFileName = docLnk.file(); 219 realFileName = docLnk.file();
221 break; 220 break;
222 }; 221 };
223 } else { 222 } else {
224 realFileName = filename; 223 realFileName = filename;
225 } 224 }
226 225
227 QFileInfo fileInfo( realFileName ); 226 QFileInfo fileInfo( realFileName );
228 QString filenamed = fileInfo.fileName(); 227 QString filenamed = fileInfo.fileName();
229 tabwidget->addTab(kv=kd->createView(tabwidget,"bLAH"),"tinykate/tinykate", filenamed ); 228 tabwidget->addTab(kd->createView(tabwidget,"Unnamed kateview"),"tinykate/tinykate", filenamed );
230 odebug << realFileName << oendl; 229 odebug << realFileName << oendl;
231 230
232 kd->setDocName( filenamed); 231 kd->setDocName( filenamed);
233 kd->open( realFileName ); 232 kd->open( realFileName );
234 viewCount++; 233 viewCount++;
235} 234}
236 235
237void TinyKate::setDocument(const QString& fileref) 236void TinyKate::setDocument(const QString& fileref)
238{ 237{
239 open( fileref ); 238 open( fileref );
240} 239}
241 240
@@ -269,29 +268,28 @@ void TinyKate::slotCurrentChanged( QWidget * view)
269 connect(editReplace,SIGNAL(activated()),currentView,SLOT(replace())); 268 connect(editReplace,SIGNAL(activated()),currentView,SLOT(replace()));
270 connect(editGotoLine,SIGNAL(activated()),currentView,SLOT(gotoLine())); 269 connect(editGotoLine,SIGNAL(activated()),currentView,SLOT(gotoLine()));
271 connect(viewIncFontSizes,SIGNAL(activated()), currentView,SLOT(slotIncFontSizes())); 270 connect(viewIncFontSizes,SIGNAL(activated()), currentView,SLOT(slotIncFontSizes()));
272 connect(viewDecFontSizes,SIGNAL(activated()), currentView,SLOT(slotDecFontSizes())); 271 connect(viewDecFontSizes,SIGNAL(activated()), currentView,SLOT(slotDecFontSizes()));
273 connect(hlmenu,SIGNAL(activated(int)), currentView,SLOT(setHl(int))); 272 connect(hlmenu,SIGNAL(activated(int)), currentView,SLOT(setHl(int)));
274 connect(utilSettings,SIGNAL(activated()), currentView,SLOT(configDialog())); 273 connect(utilSettings,SIGNAL(activated()), currentView,SLOT(configDialog()));
275 274
276} 275}
277 276
278void TinyKate::slotNew( ) 277void TinyKate::slotNew( )
279{ 278{
280 KateDocument *kd= new KateDocument(false, false, this,0,this); 279 KateDocument *kd= new KateDocument(false, false, this,0,this);
281 KTextEditor::View *kv;
282 280
283 kd->setDocName(tr("Unnamed %1").arg(nextUnnamed++)); 281 kd->setDocName(tr("Unnamed %1").arg(nextUnnamed++));
284 kd->setNewDoc(true); 282 kd->setNewDoc(true);
285 tabwidget->addTab(kv=kd->createView(tabwidget,"BLAH"), 283 tabwidget->addTab(kd->createView(tabwidget,"Unnamed"),
286 "tinykate/tinykate", 284 "tinykate/tinykate",
287 kd->docName()); 285 kd->docName());
288 viewCount++; 286 viewCount++;
289} 287}
290 288
291bool TinyKate::checkSave() { 289bool TinyKate::checkSave() {
292 if (currentView==0) return true; 290 if (currentView==0) return true;
293 291
294 KateView *kv = (KateView*) currentView; 292 KateView *kv = (KateView*) currentView;
295 if(kv->isModified()) { 293 if(kv->isModified()) {
296 KateDocument *kd = (KateDocument*) kv->document(); 294 KateDocument *kd = (KateDocument*) kv->document();
297 switch( QMessageBox::information( 0, (tr("TinyKATE")), 295 switch( QMessageBox::information( 0, (tr("TinyKATE")),