adapted to new icons

6 files changed, 11 insertions, 269 deletions

diff --git a/noncore/apps/tinykate/pics/edit-redo.xpm b/noncore/apps/tinykate/pics/edit-redo.xpm
deleted file mode 100644
index 7557ac5..0000000
--- a/noncore/apps/tinykate/pics/edit-redo.xpm
+++ b/dev/null
@@ -1,90 +0,0 @@
-/* XPM */
-static char * edit_redo_xpm[] = {
-"18 17 70 1",
-        " c None",
-        ".c #1E472E",
-        "+c #234E33",
-        "@c #1B4029",
-        "#c #1B422A",
-        "$c #AFBEBA",
-        "%c #DBEADF",
-        "&c #C1CECC",
-        "*c #214A30",
-        "=c #224B31",
-        "-c #163321",
-        ";c #BFD0C8",
-        ">c #90BD9F",
-        ",c #227D37",
-        "'c #C0D1C9",
-        ")c #245135",
-        "!c #153220",
-        "~c #BDCEC7",
-        "{c #2F9645",
-        "]c #3BB057",
-        "^c #43BA5C",
-        "/c #224B30",
-        "(c #173A23",
-        "_c #143120",
-        ":c #38774E",
-        "<c #1E4335",
-        "[c #0B281E",
-        "}c #143D29",
-        "|c #3FAF57",
-        "1c #42B75B",
-        "2c #7BA08A",
-        "3c #0F2417",
-        "4c #081914",
-        "5c #050E0D",
-        "6c #123926",
-        "7c #36A34D",
-        "8c #9DC6AA",
-        "9c #88AB9C",
-        "0c #C2DBCA",
-        "ac #040B06",
-        "bc #0A1F18",
-        "cc #0D3525",
-        "dc #2A8F3D",
-        "ec #CFE0D4",
-        "fc #0A1910",
-        "gc #0D2419",
-        "hc #030C0B",
-        "ic #041714",
-        "jc #259039",
-        "kc #3E9951",
-        "lc #B2D1BC",
-        "mc #03090A",
-        "nc #071112",
-        "oc #55AE72",
-        "pc #5AB975",
-        "qc #5AA77B",
-        "rc #468166",
-        "sc #000001",
-        "tc #10211F",
-        "uc #03080A",
-        "vc #010003",
-        "wc #020005",
-        "xc #000000",
-        "yc #14311F",
-        "zc #050B0C",
-        "Ac #162D26",
-        "Bc #050D0E",
-        "Cc #142724",
-        "Dc #090F10",
-        "Ec #050A0C",
-"                  ",
-"                  ",
-"     ..+          ",
-"   @#$%&*=        ",
-"  -;>,,,%'*    )  ",
-" !~,,{]^,,%/  )(  ",
-" _,:<[[}|1,%*)2(  ",
-"3,)4    567,890(  ",
-"a,b       c7,de(  ",
-"fgh       i,jkl(  ",
-" mn      4,opqr(  ",
-" stu    vvvwvvxy  ",
-"  zA5             ",
-"   BCD            ",
-"     sEs          ",
-"                  ",
-"                  "};
diff --git a/noncore/apps/tinykate/pics/edit-undo.xpm b/noncore/apps/tinykate/pics/edit-undo.xpm
deleted file mode 100644
index 17a1f30..0000000
--- a/noncore/apps/tinykate/pics/edit-undo.xpm
+++ b/dev/null
@@ -1,90 +0,0 @@
-/* XPM */
-static char * edit_undo_xpm[] = {
-"18 17 70 1",
-        " c None",
-        ".c #234E33",
-        "+c #1E472E",
-        "@c #224B31",
-        "#c #214A30",
-        "$c #C1CECC",
-        "%c #DBEADF",
-        "&c #AFBEBA",
-        "*c #1B422A",
-        "=c #1B4029",
-        "-c #245135",
-        ";c #C0D1C9",
-        ">c #227D37",
-        ",c #90BD9F",
-        "'c #BFD0C8",
-        ")c #163321",
-        "!c #173A23",
-        "~c #224B30",
-        "{c #43BA5C",
-        "]c #3BB057",
-        "^c #2F9645",
-        "/c #BDCEC7",
-        "(c #153220",
-        "_c #7BA08A",
-        ":c #42B75B",
-        "<c #3FAF57",
-        "[c #143D29",
-        "}c #0B281E",
-        "|c #1E4335",
-        "1c #38774E",
-        "2c #143120",
-        "3c #C2DBCA",
-        "4c #88AB9C",
-        "5c #9DC6AA",
-        "6c #36A34D",
-        "7c #123926",
-        "8c #050E0D",
-        "9c #081914",
-        "0c #0F2417",
-        "ac #CFE0D4",
-        "bc #2A8F3D",
-        "cc #0D3525",
-        "dc #0A1F18",
-        "ec #040B06",
-        "fc #B2D1BC",
-        "gc #3E9951",
-        "hc #259039",
-        "ic #041714",
-        "jc #030C0B",
-        "kc #0D2419",
-        "lc #0A1910",
-        "mc #468166",
-        "nc #5AA77B",
-        "oc #5AB975",
-        "pc #55AE72",
-        "qc #071112",
-        "rc #03090A",
-        "sc #14311F",
-        "tc #000000",
-        "uc #010003",
-        "vc #020005",
-        "wc #03080A",
-        "xc #10211F",
-        "yc #000001",
-        "zc #162D26",
-        "Ac #050B0C",
-        "Bc #090F10",
-        "Cc #142724",
-        "Dc #050D0E",
-        "Ec #050A0C",
-"                  ",
-"                  ",
-"        .++       ",
-"      @#$%&*=     ",
-"-    #;%>>>,')    ",
-"!-  ~%>>{]^>>/(   ",
-"!_-#%>:<[}}|1>2   ",
-"!345>678    9->0  ",
-"!ab>6c       d>e  ",
-"!fgh>i       jkl  ",
-"!mnop>9      qr   ",
-"stuuvuuu    wxy   ",
-"           8zA    ",
-"          BCD     ",
-"        yEy       ",
-"                  ",
-"                  "};
diff --git a/noncore/apps/tinykate/pics/file-new.xpm b/noncore/apps/tinykate/pics/file-new.xpm
deleted file mode 100644
index ec8dd63..0000000
--- a/noncore/apps/tinykate/pics/file-new.xpm
+++ b/dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static const char * file_new_xpm[] = {
-"16 16 5 1",
-        " c None",
-        ".c #808080",
-        "+c #FFFFFF",
-        "@c #C0C0C0",
-        "#c #000000",
-" ..........     ",
-" .++++++++@.    ",
-" .++++++++@+.   ",
-" .++++++++####  ",
-" .++++++++++@#  ",
-" .++++++++++@#  ",
-" .++++++++++@#  ",
-" .++++++++++@#  ",
-" .++++++++++@#  ",
-" .++++++++++@#  ",
-" .++++++++++@#  ",
-" .++++++++++@#  ",
-" .++++++++++@#  ",
-" .++++++++++@#  ",
-" .@@@@@@@@@@@#  ",
-" #############  "};
diff --git a/noncore/apps/tinykate/pics/file-open.xpm b/noncore/apps/tinykate/pics/file-open.xpm
deleted file mode 100644
index 8449d5b..0000000
--- a/noncore/apps/tinykate/pics/file-open.xpm
+++ b/dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static const char * file_open_xpm[] = {
-"16 16 6 1",
-        " c None",
-        ".c #808080",
-        "+c #FFFFFF",
-        "@c #C0C0C0",
-        "#c #FFFF00",
-        "$c #000000",
-"                ",
-"   .....        ",
-"  .+++++.       ",
-" .+@#@#@+...... ",
-" .+#@#@#@+++++.$",
-" .+@#@#@#@#@#@.$",
-".............#.$",
-".++++++++++.$@.$",
-".+@#@#@#@#@#$..$",
-" .+@#@#@#@#@.$.$",
-" .+#@#@#@#@#@$.$",
-"  .+#@#@#@#@#.$$",
-"  ............$$",
-"   $$$$$$$$$$$$$",
-"                ",
-"                "};
diff --git a/noncore/apps/tinykate/pics/file-save.xpm b/noncore/apps/tinykate/pics/file-save.xpm
deleted file mode 100644
index 039a174..0000000
--- a/noncore/apps/tinykate/pics/file-save.xpm
+++ b/dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static const char * file_save_xpm[] = {
-"16 16 5 1",
-        " c None",
-        ".c #808080",
-        "+c #FFFFFF",
-        "@c #000000",
-        "#c #0000FF",
-"                ",
-" ........       ",
-" .++++++.@      ",
-" .+....+.+@    #",
-" .++++++.@@@  ##",
-" .+....++++@ ##@",
-" .+++++++++@##@ ",
-" .+.......+##@  ",
-" .++++++++##@   ",
-" .+......@#@    ",
-" .++++++@@@@    ",
-" .+....@@@+@    ",
-" .++++@++++@    ",
-" .+++++++++@    ",
-" @@@@@@@@@@@    ",
-"                "};
diff --git a/noncore/apps/tinykate/tinykate.cpp b/noncore/apps/tinykate/tinykate.cpp
index aecc1bd..a25f81f 100644
--- a/noncore/apps/tinykate/tinykate.cpp
+++ b/noncore/apps/tinykate/tinykate.cpp
@@ -1,268 +1,263 @@
 /***************************************************************************
                              tinykate.cpp
                         Tiny KATE mainwindow
                              -------------------
     begin                : November 2002
     copyright            : (C) 2002 by Joseph Wenninger <jowenn@kde.org>
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation.                                         *
  *   ONLY VERSION 2 OF THE LICENSE IS APPLICABLE                           *
  *                                                                         *
  ***************************************************************************/
 #include <qwidget.h>
 #include <qaction.h>
 #include <qlayout.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/resource.h>
 #include <qpe/global.h>
 #include <qpe/qpeapplication.h>
 
 #include <opie/ofiledialog.h>
 
 #include "tinykate.h"
-#include "pics/file-new.xpm"
-#include "pics/file-open.xpm"
-#include "pics/file-save.xpm"
-#include "pics/edit-undo.xpm"
-#include "pics/edit-redo.xpm"
 
 #include <katedocument.h>
 #include <katehighlight.h>
 #include <kateview.h>
 #include <kglobal.h>
 
 TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
     QMainWindow( parent, name, f )
-{ 
+{
   nextUnnamed=0;
   currentView=0;
   viewCount=0;
   setCaption(tr("TinyKATE"));
   KGlobal::setAppName("TinyKATE");
 
   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 *)));
 
 //FILE ACTIONS
         QPopupMenu *popup = new QPopupMenu( this );
 
   // Action for creating a new document
-        QAction *a = new QAction( tr( "New" ), QPixmap((const char**)file_new_xpm ), QString::null, 0, this, 0 );
+        QAction *a = new QAction( tr( "New" ),  Resource::loadPixmap( "new" ), QString::null, 0, this, 0 );
         a->addTo( popup );
         connect(a, SIGNAL(activated()), this, SLOT(slotNew()));
 
   // Action for opening an exisiting document
-        a = new QAction( tr( "Open" ), QPixmap((const char**)file_open_xpm), QString::null, 0, this, 0 );
+        a = new QAction( tr( "Open" ),Resource::loadPixmap( "fileopen" ) , QString::null, 0, this, 0 );
   a->addTo(popup);
         connect(a, SIGNAL(activated()), this, SLOT(slotOpen()));
 
 
   // Action for saving  document
-        a = new QAction( tr( "Save" ), QPixmap((const char**)file_save_xpm), QString::null, 0, this, 0 );
+        a = new QAction( tr( "Save" ), Resource::loadPixmap( "save" ) , QString::null, 0, this, 0 );
   a->addTo(popup);
         connect(a, SIGNAL(activated()), this, SLOT(slotSave()));
 
   // 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 = new QAction( tr( "Save As" ),Resource::loadPixmap( "save" ) , QString::null, 0, this, 0 );
   a->addTo(popup);
         connect(a, SIGNAL(activated()), this, SLOT(slotSaveAs()));
 
   // Action for closing the currently active document
-        a = new QAction( tr( "Close" ), QPixmap(), QString::null, 0, this, 0 );
+        a = new QAction( tr( "Close" ), Resource::loadPixmap( "quit_icon" ) , QString::null, 0, this, 0 );
   a->addTo(popup);
         connect(a, SIGNAL(activated()), this, SLOT(slotClose()));
-  
+
 
   mb->insertItem(tr("File"),popup);
 
 //EDIT ACTIONS
 
   // Action for cutting text
         editCut = new QAction( tr( "Cut" ), Resource::loadPixmap( "cut" ), QString::null, 0, this, 0 );
         editCut->addTo( bar );
 
   // Action for Copying text
         editCopy = new QAction( tr( "Copy" ), Resource::loadPixmap( "copy" ), QString::null, 0, this, 0 );
         editCopy->addTo( bar );
 
   // 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
         editFindReplace = new QAction( tr( "Find/Replace" ), Resource::loadPixmap("find"), QString::null, 0, this, 0 );
         editFindReplace->addTo( bar );
 
   // Action for undo
-        editUndo = new QAction( tr( "Undo" ), QPixmap((const char**)edit_undo_xpm), QString::null, 0, this, 0 );
+        editUndo = new QAction( tr( "Undo" ),Resource::loadPixmap( "undo" ) , QString::null, 0, this, 0 );
         editUndo->addTo( bar );
 
   // Action for redo
-        editRedo = new QAction( tr( "Redo" ), QPixmap((const char**)edit_redo_xpm), QString::null, 0, this, 0 );
+        editRedo = new QAction( tr( "Redo" ),Resource::loadPixmap( "redo" ) , 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);
 
 
 
         popup = new QPopupMenu( this );
   mb->insertItem(tr("Utils"),popup);
 
 //Highlight management
   hlmenu=new QPopupMenu(this);
   HlManager *hlm=HlManager::self();
   for (int i=0;i<hlm->highlights();i++)
   {
     hlmenu->insertItem(hlm->hlName(i),i);
   }
   popup->insertItem(tr("Highlighting"),hlmenu);
 
 
         utilSettings = new QAction( tr( "Settings" ), QString::null, 0, this, 0 );
         utilSettings->addTo( popup);
 
   if( qApp->argc() > 1) open(qApp->argv()[1]);
   else slotNew();
 
 }
 
 TinyKate::~TinyKate( )
 {
   qWarning("TinyKate destructor\n");
   if( KGlobal::config() != 0 ) {
     qWarning("deleting KateConfig object..\n");
     delete KGlobal::config();
   }
 }
 
 void TinyKate::slotOpen( )
 {
     QString filename = OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL,
                                                 QPEApplication::documentDir());
   if (!filename.isEmpty()) {
     open(filename);
   }
 }
 
 void TinyKate::open(const QString & filename)
 {
     KateDocument *kd= new KateDocument(false, false, this,0,this);
     KTextEditor::View *kv;
     QFileInfo fi(filename);
     QString filenamed = fi.fileName();
     tabwidget->addTab(kv=kd->createView(tabwidget,"bLAH"),"tinykate/tinykate", filenamed );
     qDebug(filename);
 
     kd->setDocName( filenamed);
     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()));
 
 }
 
 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++;
 }
 
 void TinyKate::slotClose( )
 {
   if (currentView==0) return;
   KTextEditor::View *dv=currentView;
   currentView=0;
   tabwidget->removePage(dv);
   delete dv->document();
   viewCount--;
   if (!viewCount) slotNew();
 }
 
 void TinyKate::slotSave() {
   // feel free to make this how you want
   if (currentView==0) return;
 
   //  KateView *kv = (KateView*) currentView;
   KateDocument *kd = (KateDocument*) currentView->document();
   //  qDebug("saving file "+kd->docName());
   if( kd->docName().isEmpty())
     slotSaveAs();
   else
      kd->saveFile();
   //    kv->save();
   //    kd->saveFile();
 }
 
 void TinyKate::slotSaveAs() {
   if (currentView==0) return;
   KateDocument *kd = (KateDocument*) currentView->document();
 
   QString filename=OFileDialog::getSaveFileName(OFileSelector::EXTENDED_ALL,
                                                 QPEApplication::documentDir());
   if (!filename.isEmpty()) {
     qDebug("saving file "+filename);
     QFileInfo fi(filename);
     QString filenamed = fi.fileName();
     kd->setDocFile( filename);
     kd->setDocName( filenamed);
     kd->saveFile();
 //   KTextEditor::View *dv = currentView;
 //     tabwidget->changeTab( dv, filenamed);
     // need to change tab label here
   }
 
 }