From a907eb4d3c6ca142dcab7889d8932ccb452bf07c Mon Sep 17 00:00:00 2001 From: llornkcor Date: Sun, 22 Dec 2002 17:30:50 +0000 Subject: add fileName to tab instead of BLAH --- diff --git a/noncore/apps/tinykate/tinykate.cpp b/noncore/apps/tinykate/tinykate.cpp index f177e47..a823530 100644 --- a/noncore/apps/tinykate/tinykate.cpp +++ b/noncore/apps/tinykate/tinykate.cpp @@ -37,104 +37,104 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) : QMainWindow( parent, name, f ) -{ - nextUnnamed=0; - currentView=0; - viewCount=0; - setCaption(tr("TinyKATE")); +{ + nextUnnamed=0; + currentView=0; + viewCount=0; + setCaption(tr("TinyKATE")); - setToolBarsMovable(FALSE); + setToolBarsMovable(FALSE); QPEToolBar *bar = new QPEToolBar( this ); bar->setHorizontalStretchable( TRUE ); QPEMenuBar *mb = new QPEMenuBar( bar ); mb->setMargin( 0 ); - tabwidget=new OTabWidget(this); - setCentralWidget(tabwidget); - connect(tabwidget,SIGNAL(currentChanged( QWidget *)),this,SLOT(slotCurrentChanged(QWidget *))); + tabwidget=new OTabWidget(this); + setCentralWidget(tabwidget); + connect(tabwidget,SIGNAL(currentChanged( QWidget *)),this,SLOT(slotCurrentChanged(QWidget *))); //FILE ACTIONS QPopupMenu *popup = new QPopupMenu( this ); - // Action for creating a new document + // Action for creating a new document QAction *a = new QAction( tr( "New" ), QPixmap((const char**)file_new_xpm ), QString::null, 0, this, 0 ); a->addTo( popup ); connect(a, SIGNAL(activated()), this, SLOT(slotNew())); - // Action for opening an exisiting document + // Action for opening an exisiting document a = new QAction( tr( "Open" ), QPixmap((const char**)file_open_xpm), QString::null, 0, this, 0 ); - a->addTo(popup); + a->addTo(popup); connect(a, SIGNAL(activated()), this, SLOT(slotOpen())); - // Action for saving document + // Action for saving document a = new QAction( tr( "Save" ), QPixmap((const char**)file_save_xpm), QString::null, 0, this, 0 ); - a->addTo(popup); + a->addTo(popup); - // Action for saving document to a new name + // Action for saving document to a new name a = new QAction( tr( "Save As" ), QPixmap((const char**)file_save_xpm), QString::null, 0, this, 0 ); - a->addTo(popup); + a->addTo(popup); - // Action for closing the currently active document + // Action for closing the currently active document a = new QAction( tr( "Close" ), QPixmap(), QString::null, 0, this, 0 ); - a->addTo(popup); + a->addTo(popup); connect(a, SIGNAL(activated()), this, SLOT(slotClose())); - + - mb->insertItem(tr("File"),popup); + mb->insertItem(tr("File"),popup); //EDIT ACTIONS - // Action for cutting text + // Action for cutting text editCut = new QAction( tr( "Cut" ), Resource::loadPixmap( "cut" ), QString::null, 0, this, 0 ); editCut->addTo( bar ); - // Action for Copying text + // Action for Copying text editCopy = new QAction( tr( "Copy" ), Resource::loadPixmap( "copy" ), QString::null, 0, this, 0 ); editCopy->addTo( bar ); - // Action for pasting text + // Action for pasting text editPaste = new QAction( tr( "Paste" ), Resource::loadPixmap( "paste" ), QString::null, 0, this, 0 ); editPaste->addTo( bar ); - // Action for finding / replacing text + // Action for finding / replacing text editFindReplace = new QAction( tr( "Find/Replace" ), Resource::loadPixmap("find"), QString::null, 0, this, 0 ); editFindReplace->addTo( bar ); - // Action for undo + // Action for undo editUndo = new QAction( tr( "Undo" ), QPixmap((const char**)edit_undo_xpm), QString::null, 0, this, 0 ); editUndo->addTo( bar ); - // Action for redo + // Action for redo editRedo = new QAction( tr( "Redo" ), QPixmap((const char**)edit_redo_xpm), QString::null, 0, this, 0 ); editRedo->addTo( bar ); //VIEW ACITONS popup = new QPopupMenu( this ); - + viewIncFontSizes = new QAction( tr( "Font +" ), QString::null, 0, this, 0 ); viewIncFontSizes->addTo( popup ); viewDecFontSizes = new QAction( tr( "Font -" ), QString::null, 0, this, 0 ); viewDecFontSizes->addTo( popup ); - mb->insertItem(tr("View"),popup); + mb->insertItem(tr("View"),popup); popup = new QPopupMenu( this ); - mb->insertItem(tr("Utils"),popup); + mb->insertItem(tr("Utils"),popup); //Highlight management - hlmenu=new QPopupMenu(this); - HlManager *hlm=HlManager::self(); - for (int i=0;ihighlights();i++) - { - hlmenu->insertItem(hlm->hlName(i),i); - } - popup->insertItem(tr("Highlighting"),hlmenu); + hlmenu=new QPopupMenu(this); + HlManager *hlm=HlManager::self(); + for (int i=0;ihighlights();i++) + { + hlmenu->insertItem(hlm->hlName(i),i); + } + popup->insertItem(tr("Highlighting"),hlmenu); utilSettings = new QAction( tr( "Settings" ), QString::null, 0, this, 0 ); @@ -148,66 +148,67 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) : void TinyKate::slotOpen( ) { - QString filename=OFileDialog::getOpenFileName(OFileSelector::EXTENDED_ALL); - if (!filename.isEmpty()) { - open(filename); - } + QString filename=OFileDialog::getOpenFileName(OFileSelector::EXTENDED_ALL); + if (!filename.isEmpty()) { + open(filename); + } } void TinyKate::open(const QString & filename) { - KateDocument *kd= new KateDocument(false, false, this,0,this); - KTextEditor::View *kv; - tabwidget->addTab(kv=kd->createView(tabwidget,"bLAH"),"tinykate/tinykate","BLAH"); - qDebug(filename); - kd->open(filename); - viewCount++; + KateDocument *kd= new KateDocument(false, false, this,0,this); + KTextEditor::View *kv; + QFileInfo fi(filename); + tabwidget->addTab(kv=kd->createView(tabwidget,"bLAH"),"tinykate/tinykate",fi.fileName()); + qDebug(filename); + kd->open(filename); + viewCount++; } void TinyKate::slotCurrentChanged( QWidget * view) { - if (currentView) { - disconnect(editCopy,SIGNAL(activated()),currentView,SLOT(copy())); - disconnect(editCut,SIGNAL(activated()),currentView,SLOT(cut())); - disconnect(editPaste,SIGNAL(activated()),currentView,SLOT(paste())); - disconnect(editUndo,SIGNAL(activated()),currentView,SLOT(undo())); - disconnect(editRedo,SIGNAL(activated()),currentView,SLOT(redo())); - disconnect(viewIncFontSizes,SIGNAL(activated()), currentView,SLOT(slotIncFontSizes())); - disconnect(viewDecFontSizes,SIGNAL(activated()), currentView,SLOT(slotDecFontSizes())); - disconnect(hlmenu,SIGNAL(activated(int)), currentView,SLOT(setHl(int))); - disconnect(utilSettings,SIGNAL(activated()), currentView,SLOT(configDialog())); - } - - currentView=(KTextEditor::View*)view; - - connect(editCopy,SIGNAL(activated()),currentView,SLOT(copy())); - connect(editCut,SIGNAL(activated()),currentView,SLOT(cut())); - connect(editPaste,SIGNAL(activated()),currentView,SLOT(paste())); - connect(editUndo,SIGNAL(activated()),currentView,SLOT(undo())); - connect(editRedo,SIGNAL(activated()),currentView,SLOT(redo())); - connect(viewIncFontSizes,SIGNAL(activated()), currentView,SLOT(slotIncFontSizes())); - connect(viewDecFontSizes,SIGNAL(activated()), currentView,SLOT(slotDecFontSizes())); - connect(hlmenu,SIGNAL(activated(int)), currentView,SLOT(setHl(int))); - connect(utilSettings,SIGNAL(activated()), currentView,SLOT(configDialog())); + if (currentView) { + disconnect(editCopy,SIGNAL(activated()),currentView,SLOT(copy())); + disconnect(editCut,SIGNAL(activated()),currentView,SLOT(cut())); + disconnect(editPaste,SIGNAL(activated()),currentView,SLOT(paste())); + disconnect(editUndo,SIGNAL(activated()),currentView,SLOT(undo())); + disconnect(editRedo,SIGNAL(activated()),currentView,SLOT(redo())); + disconnect(viewIncFontSizes,SIGNAL(activated()), currentView,SLOT(slotIncFontSizes())); + disconnect(viewDecFontSizes,SIGNAL(activated()), currentView,SLOT(slotDecFontSizes())); + disconnect(hlmenu,SIGNAL(activated(int)), currentView,SLOT(setHl(int))); + disconnect(utilSettings,SIGNAL(activated()), currentView,SLOT(configDialog())); + } + + currentView=(KTextEditor::View*)view; + + connect(editCopy,SIGNAL(activated()),currentView,SLOT(copy())); + connect(editCut,SIGNAL(activated()),currentView,SLOT(cut())); + connect(editPaste,SIGNAL(activated()),currentView,SLOT(paste())); + connect(editUndo,SIGNAL(activated()),currentView,SLOT(undo())); + connect(editRedo,SIGNAL(activated()),currentView,SLOT(redo())); + connect(viewIncFontSizes,SIGNAL(activated()), currentView,SLOT(slotIncFontSizes())); + connect(viewDecFontSizes,SIGNAL(activated()), currentView,SLOT(slotDecFontSizes())); + connect(hlmenu,SIGNAL(activated(int)), currentView,SLOT(setHl(int))); + connect(utilSettings,SIGNAL(activated()), currentView,SLOT(configDialog())); } void TinyKate::slotNew( ) { - KateDocument *kd= new KateDocument(false, false, this,0,this); - KTextEditor::View *kv; - tabwidget->addTab(kv=kd->createView(tabwidget,"BLAH"),"tinykate/tinykate",tr("Unnamed %1").arg(nextUnnamed++)); - viewCount++; + KateDocument *kd= new KateDocument(false, false, this,0,this); + KTextEditor::View *kv; + tabwidget->addTab(kv=kd->createView(tabwidget,"BLAH"),"tinykate/tinykate",tr("Unnamed %1").arg(nextUnnamed++)); + viewCount++; } void TinyKate::slotClose( ) { - if (currentView==0) return; - KTextEditor::View *dv=currentView; - currentView=0; - tabwidget->removePage(dv); - delete dv->document(); - viewCount--; - if (!viewCount) slotNew(); + if (currentView==0) return; + KTextEditor::View *dv=currentView; + currentView=0; + tabwidget->removePage(dv); + delete dv->document(); + viewCount--; + if (!viewCount) slotNew(); } -- cgit v0.9.0.2