summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/tinykate/tinykate.cpp24
-rw-r--r--noncore/apps/tinykate/tinykate.h9
2 files changed, 25 insertions, 8 deletions
diff --git a/noncore/apps/tinykate/tinykate.cpp b/noncore/apps/tinykate/tinykate.cpp
index 03c6e50..f177e47 100644
--- a/noncore/apps/tinykate/tinykate.cpp
+++ b/noncore/apps/tinykate/tinykate.cpp
@@ -21,6 +21,7 @@
21#include <qpe/qpemenubar.h> 21#include <qpe/qpemenubar.h>
22#include <qpe/resource.h> 22#include <qpe/resource.h>
23#include <qpe/global.h> 23#include <qpe/global.h>
24#include <qpe/qpeapplication.h>
24 25
25#include <opie/ofiledialog.h> 26#include <opie/ofiledialog.h>
26 27
@@ -36,8 +37,10 @@
36 37
37TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) : 38TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
38 QMainWindow( parent, name, f ) 39 QMainWindow( parent, name, f )
39{ 40 {
41 nextUnnamed=0;
40 currentView=0; 42 currentView=0;
43 viewCount=0;
41 setCaption(tr("TinyKATE")); 44 setCaption(tr("TinyKATE"));
42 45
43 setToolBarsMovable(FALSE); 46 setToolBarsMovable(FALSE);
@@ -137,6 +140,9 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
137 utilSettings = new QAction( tr( "Settings" ), QString::null, 0, this, 0 ); 140 utilSettings = new QAction( tr( "Settings" ), QString::null, 0, this, 0 );
138 utilSettings->addTo( popup); 141 utilSettings->addTo( popup);
139 142
143 if( qApp->argc() > 1) open(qApp->argv()[1]);
144 else slotNew();
145
140} 146}
141 147
142 148
@@ -144,12 +150,18 @@ void TinyKate::slotOpen( )
144{ 150{
145 QString filename=OFileDialog::getOpenFileName(OFileSelector::EXTENDED_ALL); 151 QString filename=OFileDialog::getOpenFileName(OFileSelector::EXTENDED_ALL);
146 if (!filename.isEmpty()) { 152 if (!filename.isEmpty()) {
153 open(filename);
154 }
155}
156
157void TinyKate::open(const QString & filename)
158{
147 KateDocument *kd= new KateDocument(false, false, this,0,this); 159 KateDocument *kd= new KateDocument(false, false, this,0,this);
148 KTextEditor::View *kv; 160 KTextEditor::View *kv;
149 tabwidget->addTab(kv=kd->createView(tabwidget,"bLAH"),"BLAH","BLAH"); 161 tabwidget->addTab(kv=kd->createView(tabwidget,"bLAH"),"tinykate/tinykate","BLAH");
150 qDebug(filename); 162 qDebug(filename);
151 kd->open(filename); 163 kd->open(filename);
152 } 164 viewCount++;
153} 165}
154 166
155void TinyKate::slotCurrentChanged( QWidget * view) 167void TinyKate::slotCurrentChanged( QWidget * view)
@@ -184,8 +196,8 @@ void TinyKate::slotNew( )
184{ 196{
185 KateDocument *kd= new KateDocument(false, false, this,0,this); 197 KateDocument *kd= new KateDocument(false, false, this,0,this);
186 KTextEditor::View *kv; 198 KTextEditor::View *kv;
187 tabwidget->addTab(kv=kd->createView(tabwidget,"BLAH"),"BLAH",tr("Unnamed %1").arg(0)); 199 tabwidget->addTab(kv=kd->createView(tabwidget,"BLAH"),"tinykate/tinykate",tr("Unnamed %1").arg(nextUnnamed++));
188 200 viewCount++;
189} 201}
190 202
191void TinyKate::slotClose( ) 203void TinyKate::slotClose( )
@@ -195,5 +207,7 @@ void TinyKate::slotClose( )
195 currentView=0; 207 currentView=0;
196 tabwidget->removePage(dv); 208 tabwidget->removePage(dv);
197 delete dv->document(); 209 delete dv->document();
210 viewCount--;
211 if (!viewCount) slotNew();
198} 212}
199 213
diff --git a/noncore/apps/tinykate/tinykate.h b/noncore/apps/tinykate/tinykate.h
index 6dda05d..ef0dcba 100644
--- a/noncore/apps/tinykate/tinykate.h
+++ b/noncore/apps/tinykate/tinykate.h
@@ -33,13 +33,15 @@ public:
33 TinyKate( QWidget *parent=0, const char *name=0, WFlags f = 0); 33 TinyKate( QWidget *parent=0, const char *name=0, WFlags f = 0);
34 34
35public slots: 35public slots:
36 void slotOpen(); 36 void slotNew();
37 37
38protected slots: 38protected slots:
39 void slotNew(); 39 void slotOpen();
40 void slotClose(); 40 void slotClose();
41 void slotCurrentChanged(QWidget *); 41 void slotCurrentChanged(QWidget *);
42 42
43protected:
44 void open(const QString&);
43private: 45private:
44 OTabWidget *tabwidget; 46 OTabWidget *tabwidget;
45 KTextEditor::View *currentView; 47 KTextEditor::View *currentView;
@@ -55,7 +57,8 @@ private:
55 QAction *utilSettings; 57 QAction *utilSettings;
56 58
57 QPopupMenu *hlmenu; 59 QPopupMenu *hlmenu;
58 60 uint nextUnnamed;
61 uint viewCount;
59}; 62};
60 63
61 64