summaryrefslogtreecommitdiff
path: root/core
authordrw <drw>2005-04-24 20:24:00 (UTC)
committer drw <drw>2005-04-24 20:24:00 (UTC)
commit01ab9377017060c7ad3ab9e4ed2b76a879d442f6 (patch) (side-by-side diff)
treec265ad8794f510a4808e545d8d18ca73ea32f04e /core
parent9f4dd8e0d2cbe83d23c5405394d5e076dd6c2c6b (diff)
downloadopie-01ab9377017060c7ad3ab9e4ed2b76a879d442f6.zip
opie-01ab9377017060c7ad3ab9e4ed2b76a879d442f6.tar.gz
opie-01ab9377017060c7ad3ab9e4ed2b76a879d442f6.tar.bz2
Resource -> OResource
Diffstat (limited to 'core') (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/button/buttonsettings.cpp46
-rw-r--r--core/settings/button/buttonutils.cpp8
2 files changed, 28 insertions, 26 deletions
diff --git a/core/settings/button/buttonsettings.cpp b/core/settings/button/buttonsettings.cpp
index a90b4a1..a476a6b 100644
--- a/core/settings/button/buttonsettings.cpp
+++ b/core/settings/button/buttonsettings.cpp
@@ -1,28 +1,28 @@
/*
-               =. This file is part of the OPIE Project
-             .=l. Copyright (c) 2002 Robert Griebl <sandman@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.,
+ =. This file is part of the OPIE Project
+ .=l. Copyright (c) 2002 Robert Griebl <sandman@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 "buttonsettings.h"
@@ -114,23 +114,23 @@ ButtonSettings::ButtonSettings ( QWidget *parent , const char *, bool, WFlags
l = new QLabel ( tr( "Press:" ), framehold );
lay-> addWidget ( l, i, 1, AlignLeft | AlignBottom );
l = new QLabel ( tr( "Hold:" ), framehold );
lay-> addWidget ( l, i + 1, 1, AlignLeft | AlignTop );
l = new QLabel ( framehold );
- l-> setFixedSize ( 16, 16 );
+ l-> setFixedSize ( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
lay-> addWidget ( l, i, 2, AlignLeft | AlignBottom );
bi-> m_picon = l;
l = new QLabel ( framehold );
l-> setAlignment ( AlignLeft | AlignVCenter | SingleLine );
lay-> addWidget ( l, i, 3, AlignLeft | AlignBottom );
bi-> m_plabel = l;
l = new QLabel ( framehold );
- l-> setFixedSize ( 16, 16 );
+ l-> setFixedSize ( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
lay-> addWidget ( l, i + 1, 2, AlignLeft | AlignTop );
bi-> m_hicon = l;
l = new QLabel ( framehold );
l-> setAlignment ( AlignLeft | AlignVCenter | SingleLine );
lay-> addWidget ( l, i + 1, 3, AlignLeft | AlignTop );
diff --git a/core/settings/button/buttonutils.cpp b/core/settings/button/buttonutils.cpp
index 9bf4b53..05fa883 100644
--- a/core/settings/button/buttonutils.cpp
+++ b/core/settings/button/buttonutils.cpp
@@ -1,13 +1,14 @@
#include <stdlib.h>
+#include <opie2/oresource.h>
+
#include <qapplication.h>
#include <qlistview.h>
#include <qpe/applnk.h>
#include <qpe/mimetype.h>
-#include <qpe/resource.h>
#include "buttonutils.h"
using namespace Opie;
using namespace Opie::Core;
@@ -69,13 +70,14 @@ qCopInfo ButtonUtils::messageToInfo ( const OQCopMessage &c )
if ( ch == "ignore" )
return qCopInfo ( qApp-> translate ( "ButtonSettings", "<nobr>Ignored</nobr>" ));
for ( const predef_qcop *p = predef; p-> m_text; p++ ) {
if (( ch == p-> m_channel ) && ( f == p-> m_function ))
- return qCopInfo ( qApp-> translate ( "ButtonSettings", p-> m_text ), Resource::loadPixmap ( p-> m_pixmap ));
+ return qCopInfo ( qApp-> translate ( "ButtonSettings", p-> m_text ),
+ Opie::Core::OResource::loadPixmap( p->m_pixmap, Opie::Core::OResource::SmallIcon ) );
}
if ( ch. left ( 16 ) == "QPE/Application/" ) {
QString app = ch. mid ( 16 );
const AppLnk *applnk = m_apps-> findExec ( app );
if ( applnk )
@@ -93,13 +95,13 @@ qCopInfo ButtonUtils::messageToInfo ( const OQCopMessage &c )
void ButtonUtils::insertActions ( QListViewItem *here )
{
for ( const predef_qcop *p = predef; p-> m_text; p++ ) {
QListViewItem *item = new QListViewItem ( here, qApp-> translate ( "ButtonSettings", p-> m_text ), p-> m_channel, p-> m_function );
- item-> setPixmap ( 0, Resource::loadPixmap ( p-> m_pixmap ));
+ item-> setPixmap ( 0, Opie::Core::OResource::loadPixmap( p->m_pixmap, Opie::Core::OResource::SmallIcon ) );
}
}
void ButtonUtils::insertAppLnks ( QListViewItem *here )
{