summaryrefslogtreecommitdiff
path: root/core/apps/helpbrowser/helpbrowser.cpp
Unidiff
Diffstat (limited to 'core/apps/helpbrowser/helpbrowser.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/helpbrowser/helpbrowser.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/core/apps/helpbrowser/helpbrowser.cpp b/core/apps/helpbrowser/helpbrowser.cpp
index 4bd9565..c2059c0 100644
--- a/core/apps/helpbrowser/helpbrowser.cpp
+++ b/core/apps/helpbrowser/helpbrowser.cpp
@@ -25,8 +25,10 @@
25 25
26/* OPIE */ 26/* OPIE */
27#include <opie2/odebug.h> 27#include <opie2/odebug.h>
28#include <opie2/oresource.h>
29
28#include <qpe/qpeapplication.h> 30#include <qpe/qpeapplication.h>
29#include <qpe/resource.h> 31
30using namespace Opie::Core; 32using namespace Opie::Core;
31 33
32/* QT */ 34/* QT */
@@ -47,7 +49,7 @@ HelpBrowser::HelpBrowser( QWidget* parent, const char *name, WFlags f )
47 49
48void HelpBrowser::init( const QString& _home ) 50void HelpBrowser::init( const QString& _home )
49{ 51{
50 setIcon( Resource::loadPixmap( "HelpBrowser" ) ); 52 setIcon( Opie::Core::OResource::loadPixmap( "HelpBrowser", Opie::Core::OResource::SmallIcon ) );
51 setBackgroundMode( PaletteButton ); 53 setBackgroundMode( PaletteButton );
52 54
53 browser = new MagicTextBrowser( this ); 55 browser = new MagicTextBrowser( this );
@@ -69,7 +71,8 @@ void HelpBrowser::init( const QString& _home )
69 // addToolBar( toolbar, "Toolbar"); 71 // addToolBar( toolbar, "Toolbar");
70 72
71 QPopupMenu* go = new QPopupMenu( this ); 73 QPopupMenu* go = new QPopupMenu( this );
72 backAction = new QAction( tr( "Backward" ), Resource::loadIconSet( "back" ), QString::null, 0, this, 0 ); 74 backAction = new QAction( tr( "Backward" ), Opie::Core::OResource::loadPixmap( "back", Opie::Core::OResource::SmallIcon ),
75 QString::null, 0, this, 0 );
73 connect( backAction, SIGNAL( activated() ), browser, SLOT( backward() ) ); 76 connect( backAction, SIGNAL( activated() ), browser, SLOT( backward() ) );
74 connect( browser, SIGNAL( backwardAvailable(bool) ), 77 connect( browser, SIGNAL( backwardAvailable(bool) ),
75 backAction, SLOT( setEnabled(bool) ) ); 78 backAction, SLOT( setEnabled(bool) ) );
@@ -77,7 +80,8 @@ void HelpBrowser::init( const QString& _home )
77 backAction->addTo( toolbar ); 80 backAction->addTo( toolbar );
78 backAction->setEnabled( FALSE ); 81 backAction->setEnabled( FALSE );
79 82
80 forwardAction = new QAction( tr( "Forward" ), Resource::loadIconSet( "forward" ), QString::null, 0, this, 0 ); 83 forwardAction = new QAction( tr( "Forward" ), Opie::Core::OResource::loadPixmap( "forward", Opie::Core::OResource::SmallIcon ),
84 QString::null, 0, this, 0 );
81 connect( forwardAction, SIGNAL( activated() ), browser, SLOT( forward() ) ); 85 connect( forwardAction, SIGNAL( activated() ), browser, SLOT( forward() ) );
82 connect( browser, SIGNAL( forwardAvailable(bool) ), 86 connect( browser, SIGNAL( forwardAvailable(bool) ),
83 forwardAction, SLOT( setEnabled(bool) ) ); 87 forwardAction, SLOT( setEnabled(bool) ) );
@@ -85,7 +89,8 @@ void HelpBrowser::init( const QString& _home )
85 forwardAction->addTo( toolbar ); 89 forwardAction->addTo( toolbar );
86 forwardAction->setEnabled( FALSE ); 90 forwardAction->setEnabled( FALSE );
87 91
88 QAction *a = new QAction( tr( "Home" ), Resource::loadIconSet( "home" ), QString::null, 0, this, 0 ); 92 QAction *a = new QAction( tr( "Home" ), Opie::Core::OResource::loadPixmap( "home", Opie::Core::OResource::SmallIcon ),
93 QString::null, 0, this, 0 );
89 connect( a, SIGNAL( activated() ), browser, SLOT( home() ) ); 94 connect( a, SIGNAL( activated() ), browser, SLOT( home() ) );
90 a->addTo( go ); 95 a->addTo( go );
91 a->addTo( toolbar ); 96 a->addTo( toolbar );