summaryrefslogtreecommitdiff
authordrw <drw>2003-04-29 01:09:51 (UTC)
committer drw <drw>2003-04-29 01:09:51 (UTC)
commit2f26f696ca6acd05aa615e15d891eede9907a1c0 (patch) (side-by-side diff)
tree5a0096175cc9879b7d6f8b0f40ad2333d5e52cbe
parent63d3f7ca039d93612abaa4a65fc00b337c42ec9d (diff)
downloadopie-2f26f696ca6acd05aa615e15d891eede9907a1c0.zip
opie-2f26f696ca6acd05aa615e15d891eede9907a1c0.tar.gz
opie-2f26f696ca6acd05aa615e15d891eede9907a1c0.tar.bz2
Now use QTextView for package information. This is for scroll through long package descriptions (e.g. OZ busybox).
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/packagewin.cpp16
-rw-r--r--noncore/settings/aqpkg/packagewin.h4
2 files changed, 10 insertions, 10 deletions
diff --git a/noncore/settings/aqpkg/packagewin.cpp b/noncore/settings/aqpkg/packagewin.cpp
index f00453e..7971ccc 100644
--- a/noncore/settings/aqpkg/packagewin.cpp
+++ b/noncore/settings/aqpkg/packagewin.cpp
@@ -1,119 +1,119 @@
/*
                This file is part of the OPIE Project
=.
             .=l. Copyright (c) 2002 OPIE team <opie@handhelds.org?>
           .>+-=
 _;:,     .>    :=|. This file is free software; you can
.> <`_,   >  .   <= redistribute it and/or modify it under
:`=1 )Y*s>-.--   : the terms of the GNU General Public
.="- .-=="i,     .._ License as published by the Free Software
 - .   .-<_>     .<> Foundation; either version 2 of the License,
     ._= =}       : or (at your option) any later version.
    .%`+i>       _;_.
    .i_,=:_.      -<s. This file is distributed in the hope that
     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
    : ..    .:,     . . . without even the implied warranty of
    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
..}^=.=       =       ; Public License for more details.
++=   -.     .`     .:
 :     =  ...= . :.=- You should have received a copy of the GNU
 -.   .:....=;==+<; General Public License along with this file;
  -_. . .   )=.  = see the file COPYING. If not, write to the
    --        :-=` Free Software Foundation, Inc.,
59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#include "packagewin.h"
#include "package.h"
#include "datamgr.h"
#include <qpe/resource.h>
-#include <qlabel.h>
#include <qlayout.h>
#include <qpushbutton.h>
#include <qstring.h>
+#include <qtextview.h>
PackageWindow::PackageWindow( Package *package, const QString &server )
: QWidget( 0, 0, 0 )
{
- QVBoxLayout *layout = new QVBoxLayout( this, 4, 4 );
QString str;
if ( package )
{
setCaption( package->getPackageName() );
QString destName;
if ( package->getLocalPackage() )
{
if ( package->getLocalPackage()->getInstalledTo() )
destName = package->getLocalPackage()->getInstalledTo()->getDestinationName();
}
else
{
if ( package->getInstalledTo() )
destName = package->getInstalledTo()->getDestinationName();
}
if ( !package->isPackageStoredLocally() )
{
str.append( tr( "<b>Description</b> - " ) );
str.append( package->getDescription() );
if ( !destName.isNull() )
{
str.append( tr( "<p><b>Installed To</b> - " ) );
str.append( destName );
}
str.append( tr( "<p><b>Size</b> - " ) );
str.append( package->getPackageSize() );
str.append( tr( "<p><b>Section</b> - " ) );
str.append( package->getSection() );
}
else
{
str.append( tr( "<p><b>Filename</b> - " ) );
str.append( package->getFilename() );
}
if ( server == LOCAL_SERVER )
{
str.append( tr( "<p><b>Version Installed</b> - " ) );
str.append( package->getVersion() );
}
else
{
str.append( tr( "<p><b>Version Available</b> - " ) );
str.append( package->getVersion() );
if ( package->getLocalPackage() )
{
if ( package->isInstalled() )
{
str.append( tr( "<p><b>Version Installed</b> - " ) );
str.append( package->getInstalledVersion() );
}
}
}
}
else
{
setCaption( tr( "Package Information" ) );
str = tr( "Package information is unavailable" );
}
-
- QLabel *l = new QLabel( str, this );
- l->setTextFormat( Qt::RichText );
- l->setAlignment( Qt::AlignLeft | Qt::AlignVCenter | Qt::WordBreak );
+
+ QVBoxLayout *layout = new QVBoxLayout( this, 4, 4 );
+
+ QTextView *l = new QTextView( str, QString::null, this );
+ //l->setTextFormat( Qt::RichText );
+ //l->setAlignment( Qt::AlignLeft | Qt::AlignVCenter | Qt::WordBreak );
layout->addWidget( l );
-
+
QPushButton *btn = new QPushButton( Resource::loadPixmap( "enter" ), tr( "Close" ), this );
layout->addWidget( btn );
connect( btn, SIGNAL( clicked() ), this, SLOT( close() ) );
}
PackageWindow::~PackageWindow()
{
}
-
diff --git a/noncore/settings/aqpkg/packagewin.h b/noncore/settings/aqpkg/packagewin.h
index c1943b5..b4fdcad 100644
--- a/noncore/settings/aqpkg/packagewin.h
+++ b/noncore/settings/aqpkg/packagewin.h
@@ -1,45 +1,45 @@
/*
                This file is part of the OPIE Project
=.
             .=l. Copyright (c) 2002 OPIE team <opie@handhelds.org?>
           .>+-=
 _;:,     .>    :=|. This file is free software; you can
.> <`_,   >  .   <= redistribute it and/or modify it under
:`=1 )Y*s>-.--   : the terms of the GNU General Public
.="- .-=="i,     .._ License as published by the Free Software
 - .   .-<_>     .<> Foundation; either version 2 of the License,
     ._= =}       : or (at your option) any later version.
    .%`+i>       _;_.
    .i_,=:_.      -<s. This file is distributed in the hope that
     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
    : ..    .:,     . . . without even the implied warranty of
    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
..}^=.=       =       ; Public License for more details.
++=   -.     .`     .:
 :     =  ...= . :.=- You should have received a copy of the GNU
 -.   .:....=;==+<; General Public License along with this file;
  -_. . .   )=.  = see the file COPYING. If not, write to the
    --        :-=` Free Software Foundation, Inc.,
59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#ifndef PACKAGEWIN_H
#define PACKAGEWIN_H
#include <qwidget.h>
class Package;
class PackageWindow :public QWidget
{
Q_OBJECT
-public:
+public:
PackageWindow( Package * = 0x0, const QString & = QString::null );
~PackageWindow();
};
-#endif \ No newline at end of file
+#endif