summaryrefslogtreecommitdiff
authorzecke <zecke>2005-05-09 20:31:12 (UTC)
committer zecke <zecke>2005-05-09 20:31:12 (UTC)
commit43c1f1abbcb6166b2a0239d70ba149601ee80ba6 (patch) (side-by-side diff)
tree3aab5af9156ea9c453b55995bf73695d202f23e8
parentf7b59d9b31766517bd45cdc54454b68ddf85c448 (diff)
downloadopie-43c1f1abbcb6166b2a0239d70ba149601ee80ba6.zip
opie-43c1f1abbcb6166b2a0239d70ba149601ee80ba6.tar.gz
opie-43c1f1abbcb6166b2a0239d70ba149601ee80ba6.tar.bz2
Temporarily show more images for me... until Drw or Skyhusker do it the way
they want it
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/oresource.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/libopie2/opiecore/oresource.cpp b/libopie2/opiecore/oresource.cpp
index 0d6e60a..7253d56 100644
--- a/libopie2/opiecore/oresource.cpp
+++ b/libopie2/opiecore/oresource.cpp
@@ -12,65 +12,64 @@
.="- .-=="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 program 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
..}^=.=       =       ; Library General Public License for more
++=   -.     .`     .: details.
 :     =  ...= . :.=-
 -.   .:....=;==+<; You should have received a copy of the GNU
  -_. . .   )=.  = Library General Public License along with
    --        :-=` this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#include <opie2/oapplication.h>
#include <opie2/odebug.h>
#include <qpe/applnk.h>
+#include <qpe/resource.h>
#include "oresource.h"
namespace Opie {
namespace Core {
static int smallIconSize = -1; // Size of small icons (width & height)
static int bigIconSize = -1; // Size of large icons (width & height)
QImage OResource::loadImage( const QString &name, Scale scale )
{
// Load image
- QString filename;
- filename.sprintf( "%spics/%s.png", (const char*) oApp->qpeDir(), (const char*) name );
- QImage image( filename );
+ QImage image = Resource::loadImage( name );
if ( image.isNull() )
- odebug << "libopie2 OResource: can't find image " << filename << oendl;
+ odebug << "libopie2 OResource: can't find image " << name << oendl;
// Scale image (if necessary)
if ( scale == SmallIcon )
{
// Retrieve size of small icons
if ( smallIconSize == -1 )
smallIconSize = AppLnk::smallIconSize();
// Scale image
return image.smoothScale( smallIconSize, smallIconSize );
}
else if ( scale == BigIcon )
{
// Retrieve size of big icons
if ( bigIconSize == -1 )
bigIconSize = AppLnk::bigIconSize();
// Scale image
return image.smoothScale( bigIconSize, bigIconSize );
}
else
return image;
}