summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libqtaux/qsplitter.cpp2
-rw-r--r--noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp2
-rw-r--r--noncore/apps/tinykate/mainwindow/tinykate.cpp6
-rw-r--r--noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp11
4 files changed, 7 insertions, 14 deletions
diff --git a/libqtaux/qsplitter.cpp b/libqtaux/qsplitter.cpp
index 39321f8..959d5e1 100644
--- a/libqtaux/qsplitter.cpp
+++ b/libqtaux/qsplitter.cpp
@@ -722,17 +722,17 @@ void QSplitter::recalc( bool update )
722 /* 722 /*
723 The splitter before a hidden widget is always hidden. 723 The splitter before a hidden widget is always hidden.
724 The splitter before the first visible widget is hidden. 724 The splitter before the first visible widget is hidden.
725 The splitter before any other visible widget is visible. 725 The splitter before any other visible widget is visible.
726 */ 726 */
727 for ( int i = 0; i< n; i++ ) { 727 for ( int i = 0; i< n; i++ ) {
728 QSplitterLayoutStruct *s = data->list.at(i); 728 QSplitterLayoutStruct *s = data->list.at(i);
729 if ( !s->isSplitter ) { 729 if ( !s->isSplitter ) {
730 QSplitterLayoutStruct *p = (i > 0) ? p = data->list.at( i-1 ) : 0; 730 QSplitterLayoutStruct *p = (i > 0) ? data->list.at( i-1 ) : 0;
731 if ( p && p->isSplitter ) 731 if ( p && p->isSplitter )
732 if ( first || s->wid->isHidden() ) 732 if ( first || s->wid->isHidden() )
733 p->wid->hide(); //may trigger new recalc 733 p->wid->hide(); //may trigger new recalc
734 else 734 else
735 p->wid->show(); //may trigger new recalc 735 p->wid->show(); //may trigger new recalc
736 if ( !s->wid->isHidden() ) 736 if ( !s->wid->isHidden() )
737 first = FALSE; 737 first = FALSE;
738 } 738 }
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
@@ -52,19 +52,17 @@ SyntaxDocument::~SyntaxDocument()
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;
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
@@ -198,17 +198,16 @@ void TinyKate::slotOpen( )
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 {
@@ -221,17 +220,17 @@ void TinyKate::open(const QString & filename)
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)
@@ -273,21 +272,20 @@ void TinyKate::slotCurrentChanged( QWidget * view)
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
diff --git a/noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp b/noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp
index 147eb9c..d4f9943 100644
--- a/noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp
+++ b/noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp
@@ -113,24 +113,21 @@ QString DCIM_DirLister::dirUp( const QString& p )const {
113 113
114QStringList DCIM_DirLister::findCameras()const { 114QStringList DCIM_DirLister::findCameras()const {
115 QStringList lst; 115 QStringList lst;
116 StorageInfo inf; 116 StorageInfo inf;
117 117
118 m_map.clear(); 118 m_map.clear();
119 119
120 const QList<FileSystem> &list = inf.fileSystems(); 120 const QList<FileSystem> &list = inf.fileSystems();
121 QListIterator<FileSystem> it( list );
122 121
123 122 for ( QListIterator<FileSystem> it( list ); it.current()!=0 ; ++it )
124 FileSystem *sys; 123 if ( QFileInfo( it.current()->path() + "/dcim/" ).exists() ) {
125 for ( sys = it.current(); (sys=it.current())!=0 ; ++it ) 124 lst << it.current()->name();
126 if ( QFileInfo( sys->path() + "/dcim/" ).exists() ) { 125 m_map.insert( it.current()->name(), it.current()->path() );
127 lst << sys->name();
128 m_map.insert( sys->name(), sys->path() );
129 } 126 }
130 127
131 if ( lst.isEmpty() ) { 128 if ( lst.isEmpty() ) {
132 m_mode = ListingUnknown; 129 m_mode = ListingUnknown;
133 lst << QObject::tr("Error no Camera Dir found"); 130 lst << QObject::tr("Error no Camera Dir found");
134 }else 131 }else
135 m_mode = ListingStart; 132 m_mode = ListingStart;
136 133