author | kergoth <kergoth> | 2003-08-09 17:42:14 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-08-09 17:42:14 (UTC) |
commit | 1ab4ca95e4d2cf24d32b38c9031cb6076351e730 (patch) (side-by-side diff) | |
tree | 644d196b01c7f280981bd17da23c7592a18e5643 /core/apps/helpbrowser/helpbrowser.cpp | |
parent | ec14206f63dd93e9fb84c76cbc76fc1968637590 (diff) | |
download | opie-1ab4ca95e4d2cf24d32b38c9031cb6076351e730.zip opie-1ab4ca95e4d2cf24d32b38c9031cb6076351e730.tar.gz opie-1ab4ca95e4d2cf24d32b38c9031cb6076351e730.tar.bz2 |
Merge from BRANCH_1_0
Diffstat (limited to 'core/apps/helpbrowser/helpbrowser.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/apps/helpbrowser/helpbrowser.cpp | 48 |
1 files changed, 35 insertions, 13 deletions
diff --git a/core/apps/helpbrowser/helpbrowser.cpp b/core/apps/helpbrowser/helpbrowser.cpp index 48da7c6..531dbff 100644 --- a/core/apps/helpbrowser/helpbrowser.cpp +++ b/core/apps/helpbrowser/helpbrowser.cpp @@ -1,5 +1,5 @@ -#/********************************************************************** -** Copyright (C) 2000 Trolltech AS. All rights reserved. +/********************************************************************** +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qtopia Environment. +** This file is part of the Qtopia Environment. ** @@ -20,2 +20,4 @@ +#define QTOPIA_INTERNAL_LANGLIST + #include "helpbrowser.h" @@ -24,2 +26,4 @@ #include <qpe/resource.h> +#include <qpe/mimetype.h> +#include <qpe/applnk.h> #include <qpe/global.h> @@ -32,2 +36,3 @@ #include <qpe/qpetoolbar.h> +#include <qpe/qcopenvelope_qws.h> #include <qtoolbutton.h> @@ -50,4 +55,5 @@ -#include <ctype.h> +#include <cctype> +#include "magictextbrowser.h" @@ -60,7 +66,10 @@ HelpBrowser::HelpBrowser( QWidget* parent, const char *name, WFlags f ) + + void HelpBrowser::init( const QString& _home ) { - setIcon( Resource::loadPixmap( "help_icon" ) ); + setIcon( Resource::loadPixmap( "HelpBrowser" ) ); + setBackgroundMode( PaletteButton ); - browser = new QTextBrowser( this ); + browser = new MagicTextBrowser( this ); browser->setFrameStyle( QFrame::Panel | QFrame::Sunken ); @@ -82,3 +91,3 @@ void HelpBrowser::init( const QString& _home ) - //QPopupMenu* go = new QPopupMenu( this ); + QPopupMenu* go = new QPopupMenu( this ); backAction = new QAction( tr( "Backward" ), Resource::loadIconSet( "back" ), QString::null, 0, this, 0 ); @@ -87,3 +96,3 @@ void HelpBrowser::init( const QString& _home ) backAction, SLOT( setEnabled( bool ) ) ); - //backAction->addTo( go ); + backAction->addTo( go ); backAction->addTo( toolbar ); @@ -95,3 +104,3 @@ void HelpBrowser::init( const QString& _home ) forwardAction, SLOT( setEnabled( bool ) ) ); - //forwardAction->addTo( go ); + forwardAction->addTo( go ); forwardAction->addTo( toolbar ); @@ -99,6 +108,5 @@ void HelpBrowser::init( const QString& _home ) - QAction *a = new QAction( tr( "Home" ), Resource::loadPixmap( -"home" ), QString::null, 0, this, 0 ); + QAction *a = new QAction( tr( "Home" ), Resource::loadIconSet( "home" ), QString::null, 0, this, 0 ); connect( a, SIGNAL( activated() ), browser, SLOT( home() ) ); - //a->addTo( go ); + a->addTo( go ); a->addTo( toolbar ); @@ -114,3 +122,3 @@ void HelpBrowser::init( const QString& _home ) - //menu->insertItem( tr("Go"), go ); + menu->insertItem( tr("Go"), go ); menu->insertItem( tr( "Bookmarks" ), bookm ); @@ -119,2 +127,9 @@ void HelpBrowser::init( const QString& _home ) browser->setFocus(); + browser->setFrameStyle( QFrame::NoFrame ); + +#if !defined(QT_NO_COP) + QCopChannel *addressChannel = new QCopChannel("QPE/HelpBrowser" , this ); + connect (addressChannel, SIGNAL( received(const QCString &, const QByteArray &)), + this, SLOT ( appMessage(const QCString &, const QByteArray &) ) ); +#endif @@ -126,2 +141,3 @@ void HelpBrowser::appMessage(const QCString& msg, const QByteArray& data) { + qDebug("reached appMessage"); if ( msg == "showFile(QString)" ) { @@ -131,2 +147,8 @@ void HelpBrowser::appMessage(const QCString& msg, const QByteArray& data) setDocument( fn ); + + QPEApplication::setKeepRunning(); + + showMaximized(); + setActiveWindow(); + raise(); } |