summaryrefslogtreecommitdiff
authorpaule <paule>2007-01-13 07:12:11 (UTC)
committer paule <paule>2007-01-13 07:12:11 (UTC)
commitbccf96bb5b516d05df54dbcee8b8402ded815ed4 (patch) (side-by-side diff)
tree9de5251a1a34321c9fcd41bc2b5b408244ff6135
parentc0eb83f37ec3c49d0c6b322840605f2a95ea0b52 (diff)
downloadopie-bccf96bb5b516d05df54dbcee8b8402ded815ed4.zip
opie-bccf96bb5b516d05df54dbcee8b8402ded815ed4.tar.gz
opie-bccf96bb5b516d05df54dbcee8b8402ded815ed4.tar.bz2
Add Edit menu with find, replace & go to line functions. Uses dialogs/code already provided by libkate.
Fixes bug #1231.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/tinykate/mainwindow/tinykate.cpp27
-rw-r--r--noncore/apps/tinykate/mainwindow/tinykate.h4
2 files changed, 23 insertions, 8 deletions
diff --git a/noncore/apps/tinykate/mainwindow/tinykate.cpp b/noncore/apps/tinykate/mainwindow/tinykate.cpp
index e808a2e..b1b88e9 100644
--- a/noncore/apps/tinykate/mainwindow/tinykate.cpp
+++ b/noncore/apps/tinykate/mainwindow/tinykate.cpp
@@ -89,6 +89,7 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
mb->insertItem(tr("File"),popup);
//EDIT ACTIONS
+ popup = new QPopupMenu( this );
bool useBigIcon = qApp->desktop()->size().width() > 330;
// Action for cutting text
@@ -109,11 +110,18 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
editPaste->setAutoRaise( true );
editPaste->setIconSet( Opie::Core::OResource::loadPixmap( "paste", Opie::Core::OResource::SmallIcon ) );
- // Action for finding / replacing text
- editFindReplace = new QToolButton( 0 );
- editFindReplace->setUsesBigPixmap( useBigIcon );
- editFindReplace->setAutoRaise( true );
- editFindReplace->setIconSet( Opie::Core::OResource::loadPixmap( "find", Opie::Core::OResource::SmallIcon ) );
+ // Action for finding text
+ editFind = new QAction( tr( "Find..." ), Opie::Core::OResource::loadPixmap( "find", Opie::Core::OResource::SmallIcon ),
+ QString::null, 0, this, 0 );
+ editFind->addTo(popup);
+
+ // Action for replacing text
+ editReplace = new QAction( tr( "Replace..." ), QString::null, 0, this, 0 );
+ editReplace->addTo(popup);
+
+ // Action for going to a specific line
+ editGotoLine = new QAction( tr( "Goto Line..." ), QString::null, 0, this, 0 );
+ editGotoLine->addTo(popup);
// Action for undo
editUndo = new QToolButton( 0 );
@@ -127,6 +135,8 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
editRedo->setAutoRaise( true );
editRedo->setIconSet( Opie::Core::OResource::loadPixmap( "redo", Opie::Core::OResource::SmallIcon ) );
+ mb->insertItem(tr("Edit"),popup);
+
//VIEW ACITONS
popup = new QPopupMenu( this );
@@ -145,7 +155,6 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
mb->insertItem( editCut );
mb->insertItem( editCopy );
mb->insertItem( editPaste );
- mb->insertItem( editFindReplace );
mb->insertItem( editUndo );
mb->insertItem( editRedo );
@@ -246,6 +255,9 @@ void TinyKate::slotCurrentChanged( QWidget * view)
disconnect(editPaste,SIGNAL(clicked()),currentView,SLOT(paste()));
disconnect(editUndo,SIGNAL(clicked()),currentView,SLOT(undo()));
disconnect(editRedo,SIGNAL(clicked()),currentView,SLOT(redo()));
+ disconnect(editFind,SIGNAL(activated()),currentView,SLOT(find()));
+ disconnect(editReplace,SIGNAL(activated()),currentView,SLOT(replace()));
+ disconnect(editGotoLine,SIGNAL(activated()),currentView,SLOT(gotoLine()));
disconnect(viewIncFontSizes,SIGNAL(activated()), currentView,SLOT(slotIncFontSizes()));
disconnect(viewDecFontSizes,SIGNAL(activated()), currentView,SLOT(slotDecFontSizes()));
disconnect(hlmenu,SIGNAL(activated(int)), currentView,SLOT(setHl(int)));
@@ -259,6 +271,9 @@ void TinyKate::slotCurrentChanged( QWidget * view)
connect(editPaste,SIGNAL(clicked()),currentView,SLOT(paste()));
connect(editUndo,SIGNAL(clicked()),currentView,SLOT(undo()));
connect(editRedo,SIGNAL(clicked()),currentView,SLOT(redo()));
+ connect(editFind,SIGNAL(activated()),currentView,SLOT(find()));
+ connect(editReplace,SIGNAL(activated()),currentView,SLOT(replace()));
+ connect(editGotoLine,SIGNAL(activated()),currentView,SLOT(gotoLine()));
connect(viewIncFontSizes,SIGNAL(activated()), currentView,SLOT(slotIncFontSizes()));
connect(viewDecFontSizes,SIGNAL(activated()), currentView,SLOT(slotDecFontSizes()));
connect(hlmenu,SIGNAL(activated(int)), currentView,SLOT(setHl(int)));
diff --git a/noncore/apps/tinykate/mainwindow/tinykate.h b/noncore/apps/tinykate/mainwindow/tinykate.h
index 8eb344d..6e95d87 100644
--- a/noncore/apps/tinykate/mainwindow/tinykate.h
+++ b/noncore/apps/tinykate/mainwindow/tinykate.h
@@ -54,8 +54,8 @@ private:
KTextEditor::View *currentView;
bool shutDown;
- QToolButton *editCopy, *editCut, *editPaste, *editUndo, *editRedo, *editFindReplace;
- QAction *viewIncFontSizes, *viewDecFontSizes, *utilSettings;
+ QToolButton *editCopy, *editCut, *editPaste, *editUndo, *editRedo;
+ QAction *viewIncFontSizes, *viewDecFontSizes, *utilSettings, *editFind, *editReplace, *editGotoLine;
QPopupMenu *hlmenu;
uint nextUnnamed;