-rw-r--r-- | noncore/apps/tinykate/tinykate.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/noncore/apps/tinykate/tinykate.cpp b/noncore/apps/tinykate/tinykate.cpp index c8c3b31..51afd31 100644 --- a/noncore/apps/tinykate/tinykate.cpp +++ b/noncore/apps/tinykate/tinykate.cpp | |||
@@ -117,98 +117,101 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) : | |||
117 | //VIEW ACITONS | 117 | //VIEW ACITONS |
118 | popup = new QPopupMenu( this ); | 118 | popup = new QPopupMenu( this ); |
119 | 119 | ||
120 | viewIncFontSizes = new QAction( tr( "Font +" ), QString::null, 0, this, 0 ); | 120 | viewIncFontSizes = new QAction( tr( "Font +" ), QString::null, 0, this, 0 ); |
121 | viewIncFontSizes->addTo( popup ); | 121 | viewIncFontSizes->addTo( popup ); |
122 | 122 | ||
123 | viewDecFontSizes = new QAction( tr( "Font -" ), QString::null, 0, this, 0 ); | 123 | viewDecFontSizes = new QAction( tr( "Font -" ), QString::null, 0, this, 0 ); |
124 | viewDecFontSizes->addTo( popup ); | 124 | viewDecFontSizes->addTo( popup ); |
125 | 125 | ||
126 | mb->insertItem(tr("View"),popup); | 126 | mb->insertItem(tr("View"),popup); |
127 | 127 | ||
128 | 128 | ||
129 | 129 | ||
130 | popup = new QPopupMenu( this ); | 130 | popup = new QPopupMenu( this ); |
131 | mb->insertItem(tr("Utils"),popup); | 131 | mb->insertItem(tr("Utils"),popup); |
132 | 132 | ||
133 | //Highlight management | 133 | //Highlight management |
134 | hlmenu=new QPopupMenu(this); | 134 | hlmenu=new QPopupMenu(this); |
135 | HlManager *hlm=HlManager::self(); | 135 | HlManager *hlm=HlManager::self(); |
136 | for (int i=0;i<hlm->highlights();i++) | 136 | for (int i=0;i<hlm->highlights();i++) |
137 | { | 137 | { |
138 | hlmenu->insertItem(hlm->hlName(i),i); | 138 | hlmenu->insertItem(hlm->hlName(i),i); |
139 | } | 139 | } |
140 | popup->insertItem(tr("Highlighting"),hlmenu); | 140 | popup->insertItem(tr("Highlighting"),hlmenu); |
141 | 141 | ||
142 | 142 | ||
143 | utilSettings = new QAction( tr( "Settings" ), QString::null, 0, this, 0 ); | 143 | utilSettings = new QAction( tr( "Settings" ), QString::null, 0, this, 0 ); |
144 | utilSettings->addTo( popup); | 144 | utilSettings->addTo( popup); |
145 | 145 | ||
146 | if( qApp->argc() > 1) open(qApp->argv()[1]); | 146 | if( qApp->argc() > 1) open(qApp->argv()[1]); |
147 | else slotNew(); | 147 | else slotNew(); |
148 | 148 | ||
149 | } | 149 | } |
150 | 150 | ||
151 | 151 | ||
152 | void TinyKate::slotOpen( ) | 152 | void TinyKate::slotOpen( ) |
153 | { | 153 | { |
154 | QString filename=OFileDialog::getOpenFileName(OFileSelector::EXTENDED_ALL); | 154 | QString filename=OFileDialog::getOpenFileName(OFileSelector::EXTENDED_ALL); |
155 | if (!filename.isEmpty()) { | 155 | if (!filename.isEmpty()) { |
156 | open(filename); | 156 | open(filename); |
157 | } | 157 | } |
158 | } | 158 | } |
159 | 159 | ||
160 | void TinyKate::open(const QString & filename) | 160 | void TinyKate::open(const QString & filename) |
161 | { | 161 | { |
162 | KateDocument *kd= new KateDocument(false, false, this,0,this); | 162 | KateDocument *kd= new KateDocument(false, false, this,0,this); |
163 | KTextEditor::View *kv; | 163 | KTextEditor::View *kv; |
164 | QFileInfo fi(filename); | 164 | QFileInfo fi(filename); |
165 | tabwidget->addTab(kv=kd->createView(tabwidget,"bLAH"),"tinykate/tinykate",fi.fileName()); | 165 | QString filenamed = fi.fileName(); |
166 | tabwidget->addTab(kv=kd->createView(tabwidget,"bLAH"),"tinykate/tinykate", filenamed ); | ||
166 | qDebug(filename); | 167 | qDebug(filename); |
168 | |||
169 | kd->setDocName( filenamed); | ||
167 | kd->open(filename); | 170 | kd->open(filename); |
168 | viewCount++; | 171 | viewCount++; |
169 | } | 172 | } |
170 | 173 | ||
171 | void TinyKate::slotCurrentChanged( QWidget * view) | 174 | void TinyKate::slotCurrentChanged( QWidget * view) |
172 | { | 175 | { |
173 | if (currentView) { | 176 | if (currentView) { |
174 | 177 | ||
175 | disconnect(editCopy,SIGNAL(activated()),currentView,SLOT(copy())); | 178 | disconnect(editCopy,SIGNAL(activated()),currentView,SLOT(copy())); |
176 | disconnect(editCut,SIGNAL(activated()),currentView,SLOT(cut())); | 179 | disconnect(editCut,SIGNAL(activated()),currentView,SLOT(cut())); |
177 | disconnect(editPaste,SIGNAL(activated()),currentView,SLOT(paste())); | 180 | disconnect(editPaste,SIGNAL(activated()),currentView,SLOT(paste())); |
178 | disconnect(editUndo,SIGNAL(activated()),currentView,SLOT(undo())); | 181 | disconnect(editUndo,SIGNAL(activated()),currentView,SLOT(undo())); |
179 | disconnect(editRedo,SIGNAL(activated()),currentView,SLOT(redo())); | 182 | disconnect(editRedo,SIGNAL(activated()),currentView,SLOT(redo())); |
180 | disconnect(viewIncFontSizes,SIGNAL(activated()), currentView,SLOT(slotIncFontSizes())); | 183 | disconnect(viewIncFontSizes,SIGNAL(activated()), currentView,SLOT(slotIncFontSizes())); |
181 | disconnect(viewDecFontSizes,SIGNAL(activated()), currentView,SLOT(slotDecFontSizes())); | 184 | disconnect(viewDecFontSizes,SIGNAL(activated()), currentView,SLOT(slotDecFontSizes())); |
182 | disconnect(hlmenu,SIGNAL(activated(int)), currentView,SLOT(setHl(int))); | 185 | disconnect(hlmenu,SIGNAL(activated(int)), currentView,SLOT(setHl(int))); |
183 | disconnect(utilSettings,SIGNAL(activated()), currentView,SLOT(configDialog())); | 186 | disconnect(utilSettings,SIGNAL(activated()), currentView,SLOT(configDialog())); |
184 | } | 187 | } |
185 | 188 | ||
186 | currentView=(KTextEditor::View*)view; | 189 | currentView=(KTextEditor::View*)view; |
187 | 190 | ||
188 | connect(editCopy,SIGNAL(activated()),currentView,SLOT(copy())); | 191 | connect(editCopy,SIGNAL(activated()),currentView,SLOT(copy())); |
189 | connect(editCut,SIGNAL(activated()),currentView,SLOT(cut())); | 192 | connect(editCut,SIGNAL(activated()),currentView,SLOT(cut())); |
190 | connect(editPaste,SIGNAL(activated()),currentView,SLOT(paste())); | 193 | connect(editPaste,SIGNAL(activated()),currentView,SLOT(paste())); |
191 | connect(editUndo,SIGNAL(activated()),currentView,SLOT(undo())); | 194 | connect(editUndo,SIGNAL(activated()),currentView,SLOT(undo())); |
192 | connect(editRedo,SIGNAL(activated()),currentView,SLOT(redo())); | 195 | connect(editRedo,SIGNAL(activated()),currentView,SLOT(redo())); |
193 | connect(viewIncFontSizes,SIGNAL(activated()), currentView,SLOT(slotIncFontSizes())); | 196 | connect(viewIncFontSizes,SIGNAL(activated()), currentView,SLOT(slotIncFontSizes())); |
194 | connect(viewDecFontSizes,SIGNAL(activated()), currentView,SLOT(slotDecFontSizes())); | 197 | connect(viewDecFontSizes,SIGNAL(activated()), currentView,SLOT(slotDecFontSizes())); |
195 | connect(hlmenu,SIGNAL(activated(int)), currentView,SLOT(setHl(int))); | 198 | connect(hlmenu,SIGNAL(activated(int)), currentView,SLOT(setHl(int))); |
196 | connect(utilSettings,SIGNAL(activated()), currentView,SLOT(configDialog())); | 199 | connect(utilSettings,SIGNAL(activated()), currentView,SLOT(configDialog())); |
197 | 200 | ||
198 | } | 201 | } |
199 | 202 | ||
200 | void TinyKate::slotNew( ) | 203 | void TinyKate::slotNew( ) |
201 | { | 204 | { |
202 | KateDocument *kd= new KateDocument(false, false, this,0,this); | 205 | KateDocument *kd= new KateDocument(false, false, this,0,this); |
203 | KTextEditor::View *kv; | 206 | KTextEditor::View *kv; |
204 | tabwidget->addTab(kv=kd->createView(tabwidget,"BLAH"), | 207 | tabwidget->addTab(kv=kd->createView(tabwidget,"BLAH"), |
205 | "tinykate/tinykate", | 208 | "tinykate/tinykate", |
206 | tr("Unnamed %1").arg(nextUnnamed++)); | 209 | tr("Unnamed %1").arg(nextUnnamed++)); |
207 | viewCount++; | 210 | viewCount++; |
208 | } | 211 | } |
209 | 212 | ||
210 | void TinyKate::slotClose( ) | 213 | void TinyKate::slotClose( ) |
211 | { | 214 | { |
212 | if (currentView==0) return; | 215 | if (currentView==0) return; |
213 | KTextEditor::View *dv=currentView; | 216 | KTextEditor::View *dv=currentView; |
214 | currentView=0; | 217 | currentView=0; |