moved xmp to resource, and added goto line number

4 files changed, 231 insertions, 191 deletions

diff --git a/core/apps/textedit/resource.h b/core/apps/textedit/resource.h
new file mode 100644
index 0000000..7a22f01
--- a/dev/null
+++ b/core/apps/textedit/resource.h
@@ -0,0 +1,104 @@
+#ifndef RESOURCE_H
+#define RESOURCE_H
+
+#include <qpixmap.h>
+
+/* XPM */
+static char * filesave_xpm[] = {
+   "16 16 78 1",
+   "   c None",
+   ".  c #343434",
+   "+  c #A0A0A0",
+   "@  c #565656",
+   "#  c #9E9E9E",
+   "$  c #525252",
+   "%  c #929292",
+   "&  c #676767",
+   "*  c #848484",
+   "=  c #666666",
+   "-  c #D8D8D8",
+   ";  c #FFFFFF",
+   ">  c #DBDBDB",
+   ",  c #636363",
+   "'  c #989898",
+   ")  c #2D2D2D",
+   "!  c #909090",
+   "~  c #AEAEAE",
+   "{  c #EAEAEA",
+   "]  c #575757",
+   "^  c #585858",
+   "/  c #8A8A8A",
+   "(  c #828282",
+   "_  c #6F6F6F",
+   ":  c #C9C9C9",
+   "<  c #050505",
+   "[  c #292929",
+   "}  c #777777",
+   "|  c #616161",
+   "1  c #3A3A3A",
+   "2  c #BEBEBE",
+   "3  c #2C2C2C",
+   "4  c #7C7C7C",
+   "5  c #F6F6F6",
+   "6  c #FCFCFC",
+   "7  c #6B6B6B",
+   "8  c #959595",
+   "9  c #4F4F4F",
+   "0  c #808080",
+   "a  c #767676",
+   "b  c #818181",
+   "c  c #B8B8B8",
+   "d  c #FBFBFB",
+   "e  c #F9F9F9",
+   "f  c #CCCCCC",
+   "g  c #030303",
+   "h  c #737373",
+   "i  c #7A7A7A",
+   "j  c #7E7E7E",
+   "k  c #6A6A6A",
+   "l  c #FAFAFA",
+   "m  c #505050",
+   "n  c #9D9D9D",
+   "o  c #333333",
+   "p  c #7B7B7B",
+   "q  c #787878",
+   "r  c #696969",
+   "s  c #494949",
+   "t  c #555555",
+   "u  c #949494",
+   "v  c #E6E6E6",
+   "w  c #424242",
+   "x  c #515151",
+   "y  c #535353",
+   "z  c #3E3E3E",
+   "A  c #D4D4D4",
+   "B  c #0C0C0C",
+   "C  c #353535",
+   "D  c #474747",
+   "E  c #ECECEC",
+   "F  c #919191",
+   "G  c #7D7D7D",
+   "H  c #000000",
+   "I  c #404040",
+   "J  c #858585",
+   "K  c #323232",
+   "L  c #D0D0D0",
+   "M  c #1C1C1C",
+   "    ...+        ",
+   "   @#$%&..+     ",
+   "   .*=-;;>,..+  ",
+   "  ')!~;;;;;;{]..",
+   "  ^/(-;;;;;;;_:<",
+   "  [}|;;;;;;;{12$",
+   " #34-55;;;;678$+",
+   " 90ab=c;dd;e1fg ",
+   " [ahij((kbl0mn$ ",
+   " op^q^^7r&]s/$+ ",
+   "@btu;vbwxy]zAB  ",
+   "CzDEvEv;;DssF$  ",
+   "G.H{E{E{IxsJ$+  ",
+   "  +...vEKxzLM   ",
+   "     +...z]n$   ",
+   "        +...    "};
+
+#endif
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index f571511..b81f3b4 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -52,111 +52,13 @@
 #include <qtimer.h>
 #include <qdir.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <stdlib.h> //getenv
 
-
-/* XPM */
-static char * filesave_xpm[] = {
-"16 16 78 1",
-"   c None",
-".  c #343434",
-"+  c #A0A0A0",
-"@  c #565656",
-"#  c #9E9E9E",
-"$  c #525252",
-"%  c #929292",
-"&  c #676767",
-"*  c #848484",
-"=  c #666666",
-"-  c #D8D8D8",
-";  c #FFFFFF",
-">  c #DBDBDB",
-",  c #636363",
-"'  c #989898",
-")  c #2D2D2D",
-"!  c #909090",
-"~  c #AEAEAE",
-"{  c #EAEAEA",
-"]  c #575757",
-"^  c #585858",
-"/  c #8A8A8A",
-"(  c #828282",
-"_  c #6F6F6F",
-":  c #C9C9C9",
-"<  c #050505",
-"[  c #292929",
-"}  c #777777",
-"|  c #616161",
-"1  c #3A3A3A",
-"2  c #BEBEBE",
-"3  c #2C2C2C",
-"4  c #7C7C7C",
-"5  c #F6F6F6",
-"6  c #FCFCFC",
-"7  c #6B6B6B",
-"8  c #959595",
-"9  c #4F4F4F",
-"0  c #808080",
-"a  c #767676",
-"b  c #818181",
-"c  c #B8B8B8",
-"d  c #FBFBFB",
-"e  c #F9F9F9",
-"f  c #CCCCCC",
-"g  c #030303",
-"h  c #737373",
-"i  c #7A7A7A",
-"j  c #7E7E7E",
-"k  c #6A6A6A",
-"l  c #FAFAFA",
-"m  c #505050",
-"n  c #9D9D9D",
-"o  c #333333",
-"p  c #7B7B7B",
-"q  c #787878",
-"r  c #696969",
-"s  c #494949",
-"t  c #555555",
-"u  c #949494",
-"v  c #E6E6E6",
-"w  c #424242",
-"x  c #515151",
-"y  c #535353",
-"z  c #3E3E3E",
-"A  c #D4D4D4",
-"B  c #0C0C0C",
-"C  c #353535",
-"D  c #474747",
-"E  c #ECECEC",
-"F  c #919191",
-"G  c #7D7D7D",
-"H  c #000000",
-"I  c #404040",
-"J  c #858585",
-"K  c #323232",
-"L  c #D0D0D0",
-"M  c #1C1C1C",
-"    ...+        ",
-"   @#$%&..+     ",
-"   .*=-;;>,..+  ",
-"  ')!~;;;;;;{]..",
-"  ^/(-;;;;;;;_:<",
-"  [}|;;;;;;;{12$",
-" #34-55;;;;678$+",
-" 90ab=c;dd;e1fg ",
-" [ahij((kbl0mn$ ",
-" op^q^^7r&]s/$+ ",
-"@btu;vbwxy]zAB  ",
-"CzDEvEv;;DssF$  ",
-"G.H{E{E{IxsJ$+  ",
-"  +...vEKxzLM   ",
-"     +...z]n$   ",
-"        +...    "};
-
+#include "resource.h"
 
 #if QT_VERSION < 300
 
 class QpeEditor : public QMultiLineEdit
 {
 
@@ -350,12 +252,17 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
                      QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( editFind() ) );
     edit->insertSeparator();
     a->addTo( bar );
     a->addTo( edit );
 
+       a = new QAction( tr( "Goto Line..." ), Resource::loadPixmap( "find" ),
+                    QString::null, 0, this, 0 );
+   connect( a, SIGNAL( activated() ), this, SLOT( gotoLine() ) );
+   a->addTo( edit );
+
 
     zin = new QAction( tr("Zoom in"), QString::null, 0, this, 0 );
     connect( zin, SIGNAL( activated() ), this, SLOT( zoomIn() ) );
     zin->addTo( font );
 
     zout = new QAction( tr("Zoom out"), QString::null, 0, this, 0 );
@@ -1257,6 +1164,31 @@ if(featureAutoSave)
 //      qDebug("setting autosave");
       QTimer *timer = new QTimer(this );
       connect( timer, SIGNAL(timeout()), this, SLOT(timerCrank()) );
       timer->start( 300000, true); //5 minutes
     }
 }
+
+void TextEdit::gotoLine() {
+
+   QWidget *d = QApplication::desktop();
+   gotoEdit = new QLineEdit( 0, "Goto line");
+   
+   gotoEdit->move( (d->width()/2) - ( gotoEdit->width()/2) , (d->height()/2) - (gotoEdit->height()/2));
+   gotoEdit->setFrame(true);
+   gotoEdit->show();
+   connect (gotoEdit,SIGNAL(returnPressed()), this, SLOT(doGoto()));
+}
+
+void TextEdit::doGoto() {
+   QString number = gotoEdit->text();
+   gotoEdit->hide();
+   if(gotoEdit) delete gotoEdit;
+   bool ok;
+   int lineNumber = number.toInt(&ok, 10);
+   if(editor->numLines() < lineNumber)
+      QMessageBox::message(tr("Text Edit"),tr("Not enough lines"));
+   else
+   {
+      editor->setCursorPosition(lineNumber, 0, false);
+   }
+}
diff --git a/core/apps/textedit/textedit.h b/core/apps/textedit/textedit.h
index 643ea68..e0cbea2 100644
--- a/core/apps/textedit/textedit.h
+++ b/core/apps/textedit/textedit.h
@@ -1,25 +1,25 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
+ ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+ **
+ ** This file is part of Qtopia Environment.
+ **
+ ** This file may be distributed and/or modified under the terms of the
+ ** GNU General Public License version 2 as published by the Free Software
+ ** Foundation and appearing in the file LICENSE.GPL included in the
+ ** packaging of this file.
+ **
+ ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ **
+ ** See http://www.trolltech.com/gpl/ for GPL licensing information.
+ **
+ ** Contact info@trolltech.com if any conditions of this licensing are
+ ** not clear to you.
+ **
+ **********************************************************************/
 // additions made by L.J. Potter Sun 02-17-2002 22:27:46
 
 #ifndef TEXTEDIT_H
 #define TEXTEDIT_H
 
 #define QTEXTEDIT_OPEN_API
@@ -48,91 +48,95 @@ class FileSelector;
 class QpeEditor;
 class QPopupMenu;
 class QTimer;
 
 class TextEdit : public QMainWindow
 {
-    Q_OBJECT
+   Q_OBJECT
 
 public:
-    TextEdit( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
-    ~TextEdit();
+   TextEdit( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
+   ~TextEdit();
 
 protected:
-    QPopupMenu *font;
-    QAction *nStart, *nFileDlgOpt, *nAdvanced, *desktopAction, *filePermAction, *searchBarAction, *nAutoSave;
-    bool edited, edited1;
-    void openFile( const QString & );
-    QCopChannel * channel;
-
-    bool featureAutoSave;
-    void closeEvent( QCloseEvent *e );
-    void doSearchBar();
-    int savePrompt();
-    void setTimer();
+   QPopupMenu *font;
+   QAction *nStart, *nFileDlgOpt, *nAdvanced, *desktopAction, *filePermAction, *searchBarAction, *nAutoSave;
+   bool edited, edited1;
+   void openFile( const QString & );
+   QCopChannel * channel;
+
+   bool featureAutoSave;
+   void closeEvent( QCloseEvent *e );
+   void doSearchBar();
+   int savePrompt();
+   void setTimer();
 private slots:
-    void editorChanged();
-     void receive(const QCString&, const QByteArray&);
-    void timerCrank();
-    void doTimer(bool); 
-    void editPasteTimeDate();
-    void doPrompt(bool);
-    void doDesktop(bool);
-    void doFilePerms(bool);
-    void doAbout();
-    void setDocument(const QString&);
-    void changeFont();
-    void fileNew();
-    void fileRevert();
-    void fileOpen();
-    void changeStartConfig(bool);
-    bool save();
-    bool saveAs();
-    void cleanUp();
-
-
-    void editCut();
-    void editCopy();
-    void editPaste();
-    void editFind();
-    void editDelete();
-
-    void findNext();
-    void findClose();
-
-    void search();
-    void accept();
-
-    void newFile( const DocLnk & );
-    void openFile( const DocLnk & );
-    void showEditTools();
-
-    void zoomIn();
-    void zoomOut();
-    void setBold(bool y);
-    void setItalic(bool y);
-    void setWordWrap(bool y);
-    void setSearchBar(bool);
+   void editorChanged();
+   void receive(const QCString&, const QByteArray&);
+   void timerCrank();
+   void doTimer(bool); 
+   void editPasteTimeDate();
+   void doPrompt(bool);
+   void doDesktop(bool);
+   void doFilePerms(bool);
+   void doAbout();
+   void setDocument(const QString&);
+   void changeFont();
+   void fileNew();
+   void fileRevert();
+   void fileOpen();
+   void changeStartConfig(bool);
+   bool save();
+   bool saveAs();
+   void cleanUp();
+
+   void gotoLine();
+   void doGoto();
+
+
+   void editCut();
+   void editCopy();
+   void editPaste();
+   void editFind();
+   void editDelete();
+
+   void findNext();
+   void findClose();
+
+   void search();
+   void accept();
+
+   void newFile( const DocLnk & );
+   void openFile( const DocLnk & );
+   void showEditTools();
+
+   void zoomIn();
+   void zoomOut();
+   void setBold(bool y);
+   void setItalic(bool y);
+   void setWordWrap(bool y);
+   void setSearchBar(bool);
 
 private:
-    void openDotFile(const QString &);
-    void colorChanged( const QColor &c );
-    void clear();
-    void updateCaption( const QString &name=QString::null );
-    void setFontSize(int sz, bool round_down_not_up);
+   void openDotFile(const QString &);
+   void colorChanged( const QColor &c );
+   void clear();
+   void updateCaption( const QString &name=QString::null );
+   void setFontSize(int sz, bool round_down_not_up);
 private:
 //    fileSaver *fileSaveDlg;
 //    fileBrowser *browseForFiles;
-    bool fromSetDocument;
-    QpeEditor* editor;
-    QToolBar *menu, *editBar, *searchBar;
-    QPopupMenu *advancedMenu;
-    QLineEdit *searchEdit;
-    DocLnk *doc;
-    bool fileIs, useAdvancedFeatures, promptExit, openDesktop, filePerms, useSearchBar, startWithNew;
-    bool bFromDocView;
+   bool fromSetDocument;
+   QpeEditor* editor;
+   QToolBar *menu, *editBar, *searchBar;
+   QPopupMenu *advancedMenu;
+   QLineEdit *gotoEdit;
+   QLineEdit *searchEdit;
+   DocLnk *doc;
+   bool fileIs, useAdvancedFeatures, promptExit, openDesktop, filePerms, useSearchBar, startWithNew;
+   bool bFromDocView;
    int  viewSelection;
-    QAction *zin, *zout;
-    QString currentFileName;
+   QAction *zin, *zout;
+   QString currentFileName;
 };
 
 #endif
diff --git a/core/apps/textedit/textedit.pro b/core/apps/textedit/textedit.pro
index f5e16a0..233dd67 100644
--- a/core/apps/textedit/textedit.pro
+++ b/core/apps/textedit/textedit.pro
@@ -1,19 +1,19 @@
 TEMPLATE  = app
 CONFIG    += qt warn_on release
 DESTDIR   = $(OPIEDIR)/bin
-HEADERS = textedit.h filePermissions.h 
+HEADERS = textedit.h filePermissions.h resource.h
 SOURCES = main.cpp textedit.cpp filePermissions.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
 TARGET    = textedit
 
 TRANSLATIONS = ../../../i18n/de/textedit.ts \
-         ../../../i18n/da/textedit.ts \
-         ../../../i18n/xx/textedit.ts \
+   ../../../i18n/da/textedit.ts \
+   ../../../i18n/xx/textedit.ts \
          ../../../i18n/en/textedit.ts \
          ../../../i18n/es/textedit.ts \
          ../../../i18n/fr/textedit.ts \
          ../../../i18n/hu/textedit.ts \
          ../../../i18n/ja/textedit.ts \
          ../../../i18n/ko/textedit.ts \