Add Edit menu with find, replace & go to line functions. Uses dialogs/code already provided by libkate.

Fixes bug #1231.

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
@@ -88,8 +88,9 @@ 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
     editCut = new QToolButton( 0 );
@@ -108,13 +109,20 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
     editPaste->setUsesBigPixmap( useBigIcon );
     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 );
     editUndo->setUsesBigPixmap( useBigIcon );
@@ -126,8 +134,10 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
     editRedo->setUsesBigPixmap( useBigIcon );
     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 );
 
     viewIncFontSizes = new QAction( tr( "Font +" ), QString::null, 0, this, 0 );
@@ -144,9 +154,8 @@ 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 );
 
 
@@ -245,8 +254,11 @@ void TinyKate::slotCurrentChanged( QWidget * view)
         disconnect(editCut,SIGNAL(clicked()),currentView,SLOT(cut()));
         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)));
         disconnect(utilSettings,SIGNAL(activated()), currentView,SLOT(configDialog()));
@@ -258,8 +270,11 @@ void TinyKate::slotCurrentChanged( QWidget * view)
     connect(editCut,SIGNAL(clicked()),currentView,SLOT(cut()));
     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)));
     connect(utilSettings,SIGNAL(activated()), currentView,SLOT(configDialog()));
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
@@ -53,10 +53,10 @@ private:
     Opie::Ui::OTabWidget *tabwidget;
     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;
     uint viewCount;