Resource -> OResource

1 files changed, 27 insertions, 22 deletions

diff --git a/noncore/apps/opie-write/mainwindow.cpp b/noncore/apps/opie-write/mainwindow.cpp
index aa03060..296a1b0 100644
--- a/noncore/apps/opie-write/mainwindow.cpp
+++ b/noncore/apps/opie-write/mainwindow.cpp
@@ -1,362 +1,367 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** Licensees holding valid Qtopia Developer license may use this
 ** file in accordance with the Qtopia Developer License Agreement
 ** provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING
 ** THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 ** PURPOSE.
 **
 ** email sales@trolltech.com for information about Qtopia License
 ** Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "mainwindow.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
+#include <opie2/oresource.h>
 #include <qpe/fileselector.h>
 #include <qpe/applnk.h>
-#include <qpe/resource.h>
 #include <qpe/fontdatabase.h>
 using namespace Opie::Core;
 
 /* QT */
 #include "qtextedit.h"
 #include <qaction.h>
 #include <qtoolbar.h>
 #include <qtoolbutton.h>
 #include <qtabwidget.h>
 #include <qapplication.h>
 #include <qfontdatabase.h>
 #include <qcombobox.h>
 #include <qlineedit.h>
 #include <qfileinfo.h>
 #include <qfile.h>
 #include <qfiledialog.h>
 #include <qprinter.h>
 #include <qpaintdevicemetrics.h>
 #include <qmenubar.h>
 #include <qpopupmenu.h>
 #include <qcolordialog.h>
 #include <qpainter.h>
 #include <qstyle.h>
 
 class ButtonMenu : public QToolButton
 {
     Q_OBJECT
 public:
     ButtonMenu( QWidget *parent, const char *name=0 )
   : QToolButton( parent, name ), current(0)
     {
   setPopup( new QPopupMenu( this ) );
   setPopupDelay( 1 );
   connect( popup(), SIGNAL(activated(int)), this, SLOT(selected(int)) );
     }
 
     int insertItem(const QIconSet &icon, const QString &text, int id ) {
   if ( !popup()->count() ) {
       setIconSet( icon );
       current = id;
   }
   return popup()->insertItem( icon, text, id );
     }
 
     void setCurrentItem( int id ) {
   if ( id != current ) {
       current = id;
       setIconSet( *popup()->iconSet( id ) );
   }
     }
 
     virtual QSize sizeHint() const {
   return QToolButton::sizeHint() + QSize( 4, 0 );
     }
 
 signals:
     void activated( int id );
 
 protected slots:
     void selected( int id ) {
   current = id;
   setIconSet( *popup()->iconSet( id ) );
   emit activated( id );
     }
 
 protected:
     virtual void drawButtonLabel( QPainter *p ) {
   p->translate( -4, 0 );
   QToolButton::drawButtonLabel( p );
   p->translate( 4, 0 );
     }
 
 private:
     int current;
 };
 
 //===========================================================================
 
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags fl  )
     : QMainWindow( parent, name, fl ),
       doc( 0 )
 {
     setRightJustification(TRUE);
 
     editorStack = new QWidgetStack( this );
 
     fileSelector = new FileSelector( "text/html",
              editorStack, "fileselector" );
 
 
     fileSelector->setCloseVisible( FALSE );
     editorStack->addWidget( fileSelector, 0 );
 
     editor = new Qt3::QTextEdit( editorStack );
     editor->setTextFormat( Qt::RichText );
     editorStack->addWidget( editor, 1 );
 
     setupActions();
 
     QObject::connect( fileSelector, SIGNAL(closeMe()),
           this, SLOT(showEditTools()) );
     QObject::connect( fileSelector, SIGNAL(fileSelected(const DocLnk&)),
           this, SLOT(openFile(const DocLnk&)) );
     QObject::connect( fileSelector, SIGNAL(newSelected(const DocLnk&)),
           this, SLOT(newFile(const DocLnk&)) );
 
     if ( fileSelector->fileCount() < 1 )
   fileNew();
     else {
   fileOpen();
     }
     doConnections( editor );
 
     setCentralWidget( editorStack );
 }
 
 MainWindow::~MainWindow()
 {
     save();
 }
 
 void MainWindow::setupActions()
 {
     setToolBarsMovable(false);
 
     tbMenu = new QToolBar( this );
     tbMenu->setHorizontalStretchable( TRUE );
 
     QMenuBar *menu = new QMenuBar( tbMenu );
 
     tbEdit = new QToolBar( this );
 
     QPopupMenu *file = new QPopupMenu( this );
     menu->insertItem( tr("File"), file );
 
     QPopupMenu *edit = new QPopupMenu( this );
     menu->insertItem( tr("Edit"), edit );
 
     // ### perhaps these shortcut keys should have some
     //     IPaq keys defined???
     QAction *a;
 
-    a = new QAction( tr( "New" ), Resource::loadPixmap("new"), QString::null, 0, this, 0 );
+    a = new QAction( tr( "New" ), Opie::Core::OResource::loadPixmap("new", Opie::Core::OResource::SmallIcon),
+                     QString::null, 0, this, 0 );
     connect( a, SIGNAL(activated()), this, SLOT(fileNew()) );
     a->addTo( file );
 
-    a = new QAction( tr( "Open" ), Resource::loadPixmap( "fileopen" ), QString::null, 0, this, 0 );
+    a = new QAction( tr( "Open" ), Opie::Core::OResource::loadPixmap( "fileopen", Opie::Core::OResource::SmallIcon ),
+                     QString::null, 0, this, 0 );
     connect( a, SIGNAL(activated()), this, SLOT(fileOpen()) );
     a->addTo( file );
 
-    a = new QAction( tr( "Undo" ), Resource::loadIconSet("undo"),
-         QString::null, 0, this, "editUndo" );
+    a = new QAction( tr( "Undo" ), Opie::Core::OResource::loadPixmap("undo", Opie::Core::OResource::SmallIcon),
+                     QString::null, 0, this, "editUndo" );
     connect( a, SIGNAL( activated() ), this, SLOT( editUndo() ) );
     connect( editor, SIGNAL(undoAvailable(bool)), a, SLOT(setEnabled(bool)) );
     a->addTo( tbEdit );
     a->addTo( edit );
-    a = new QAction( tr( "Redo" ), Resource::loadIconSet("redo"),
+    a = new QAction( tr( "Redo" ), Opie::Core::OResource::loadPixmap("redo", Opie::Core::OResource::SmallIcon),
          QString::null, 0, this, "editRedo" );
     connect( a, SIGNAL( activated() ), this, SLOT( editRedo() ) );
     connect( editor, SIGNAL(redoAvailable(bool)), a, SLOT(setEnabled(bool)) );
     a->addTo( tbEdit );
     a->addTo( edit );
 
     edit->insertSeparator();
 
-    a = new QAction( tr( "Copy" ), Resource::loadIconSet("copy"),
+    a = new QAction( tr( "Copy" ), Opie::Core::OResource::loadPixmap("copy", Opie::Core::OResource::SmallIcon ),
          QString::null, 0, this, "editCopy" );
     connect( a, SIGNAL( activated() ), this, SLOT( editCopy() ) );
     connect( editor, SIGNAL(copyAvailable(bool)), a, SLOT(setEnabled(bool)) );
     a->addTo( tbEdit );
     a->addTo( edit );
-    a = new QAction( tr( "Cut" ), Resource::loadIconSet("cut"),
+    a = new QAction( tr( "Cut" ), Opie::Core::OResource::loadPixmap("cut", Opie::Core::OResource::SmallIcon ),
          QString::null, 0, this, "editCut" );
     connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) );
     connect( editor, SIGNAL(copyAvailable(bool)), a, SLOT(setEnabled(bool)) );
     a->addTo( tbEdit );
     a->addTo( edit );
-    a = new QAction( tr( "Paste" ), Resource::loadPixmap("paste"),
+    a = new QAction( tr( "Paste" ), Opie::Core::OResource::loadPixmap("paste", Opie::Core::OResource::SmallIcon ),
          QString::null, 0, this, "editPaste" );
     connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) );
     a->addTo( tbEdit );
     a->addTo( edit );
 
     tbFont = new QToolBar( this );
     tbFont->setLabel( "Font Actions" );
     tbFont->setHorizontalStretchable(TRUE);
 
     comboFont = new QComboBox( FALSE, tbFont );
     FontDatabase db;
     QStringList f= db.families();
     comboFont->insertStringList( db.families() );
     connect( comboFont, SIGNAL( activated(const QString&) ),
        this, SLOT( textFamily(const QString&) ) );
     comboFont->setCurrentItem( comboFont->listBox()->index( comboFont->listBox()->findItem( QApplication::font().family() ) ) );
     comboFont->setMaximumWidth(90);
 
     comboSize = new QComboBox( TRUE, tbFont );
     QValueList<int> sizes = db.standardSizes();
     QValueList<int>::Iterator it = sizes.begin();
     for ( ; it != sizes.end(); ++it )
   comboSize->insertItem( QString::number( *it ) );
     connect( comboSize, SIGNAL( activated(const QString&) ),
        this, SLOT( textSize(const QString&) ) );
     comboSize->lineEdit()->setText( QString::number( QApplication::font().pointSize() ) );
     comboSize->setFixedWidth( 38 );
 
     tbStyle = new QToolBar( this );
     tbStyle->setLabel( "Style Actions" );
 
     actionTextBold = new QAction( tr( "Bold" ),
-          Resource::loadPixmap("bold"),
-          QString::null, CTRL + Key_B,
-          this, "textBold" );
+                                  Opie::Core::OResource::loadPixmap("bold", Opie::Core::OResource::SmallIcon ),
+                                  QString::null, CTRL + Key_B,
+                                  this, "textBold" );
     connect( actionTextBold, SIGNAL( activated() ), this, SLOT( textBold() ) );
     actionTextBold->addTo( tbStyle );
     actionTextBold->setToggleAction( TRUE );
     actionTextItalic = new QAction( tr( "Italic" ),
-            Resource::loadPixmap("italic"),
-            tr( "&Italic" ), CTRL + Key_I,
-            this, "textItalic" );
+                                    Opie::Core::OResource::loadPixmap("italic", Opie::Core::OResource::SmallIcon ),
+                                    tr( "&Italic" ), CTRL + Key_I,
+                                    this, "textItalic" );
     connect( actionTextItalic, SIGNAL( activated() ), this,
        SLOT( textItalic() ) );
     actionTextItalic->addTo( tbStyle );
     actionTextItalic->setToggleAction( TRUE );
     actionTextUnderline = new QAction( tr( "Underline" ),
-               Resource::loadPixmap("underline"),
-               tr( "&Underline" ), CTRL + Key_U,
-               this, "textUnderline" );
+                                       Opie::Core::OResource::loadPixmap("underline", Opie::Core::OResource::SmallIcon ),
+                                       tr( "&Underline" ), CTRL + Key_U,
+                                       this, "textUnderline" );
     connect( actionTextUnderline, SIGNAL( activated() ),
        this, SLOT( textUnderline() ) );
     actionTextUnderline->addTo( tbStyle );
     actionTextUnderline->setToggleAction( TRUE );
 
     alignMenu = new ButtonMenu( tbStyle );
-    alignMenu->insertItem( Resource::loadPixmap("left"), tr("Left"), AlignLeft );
-    alignMenu->insertItem( Resource::loadPixmap("center"), tr("Center"), AlignCenter );
-    alignMenu->insertItem( Resource::loadPixmap("right"), tr("Right"), AlignRight );
-    alignMenu->insertItem( Resource::loadPixmap("opie-write/justify"), tr("Full"), Qt3::AlignJustify );
+    alignMenu->insertItem( Opie::Core::OResource::loadPixmap("left", Opie::Core::OResource::SmallIcon), tr("Left"), AlignLeft );
+    alignMenu->insertItem( Opie::Core::OResource::loadPixmap("center", Opie::Core::OResource::SmallIcon),
+                           tr("Center"), AlignCenter );
+    alignMenu->insertItem( Opie::Core::OResource::loadPixmap("right", Opie::Core::OResource::SmallIcon),
+                           tr("Right"), AlignRight );
+    alignMenu->insertItem( Opie::Core::OResource::loadPixmap("opie-write/justify", Opie::Core::OResource::SmallIcon),
+                           tr("Full"), Qt3::AlignJustify );
     connect( alignMenu, SIGNAL(activated(int)), this, SLOT(textAlign(int)) );
 }
 
 Qt3::QTextEdit *MainWindow::currentEditor() const
 {
     return editor;
 }
 
 void MainWindow::doConnections( Qt3::QTextEdit *e )
 {
     connect( e, SIGNAL( currentFontChanged(const QFont&) ),
        this, SLOT( fontChanged(const QFont&) ) );
     connect( e, SIGNAL( currentColorChanged(const QColor&) ),
        this, SLOT( colorChanged(const QColor&) ) );
     connect( e, SIGNAL( currentAlignmentChanged(int) ),
        this, SLOT( alignmentChanged(int) ) );
 }
 
 void MainWindow::updateFontSizeCombo( const QFont &f )
 {
     comboSize->clear();
     FontDatabase fdb;
     QValueList<int> sizes = fdb.pointSizes( f.family() );
     QValueList<int>::Iterator it = sizes.begin();
     for ( ; it != sizes.end(); ++it )
   comboSize->insertItem( QString::number( *it ) );
 }
 
 void MainWindow::editUndo()
 {
     if ( !currentEditor() )
   return;
     currentEditor()->undo();
 }
 
 void MainWindow::editRedo()
 {
     if ( !currentEditor() )
   return;
     currentEditor()->redo();
 }
 
 void MainWindow::editCut()
 {
     if ( !currentEditor() )
   return;
     currentEditor()->cut();
 }
 
 void MainWindow::editCopy()
 {
     if ( !currentEditor() )
   return;
     currentEditor()->copy();
 }
 
 void MainWindow::editPaste()
 {
     if ( !currentEditor() )
   return;
     currentEditor()->paste();
 }
 
 void MainWindow::textBold()
 {
     if ( !currentEditor() )
   return;
     currentEditor()->setBold( actionTextBold->isOn() );
 }
 
 void MainWindow::textUnderline()
 {
     if ( !currentEditor() )
   return;
     currentEditor()->setUnderline( actionTextUnderline->isOn() );
 }
 
 void MainWindow::textItalic()
 {
     if ( !currentEditor() )
   return;
     currentEditor()->setItalic( actionTextItalic->isOn() );
 }
 
 void MainWindow::textFamily( const QString &f )
 {
     if ( !currentEditor() )
   return;
     currentEditor()->setFamily( f );
     currentEditor()->viewport()->setFocus();
 }
 
 void MainWindow::textSize( const QString &p )
 {
     if ( !currentEditor() )
   return;