summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/library.pro2
-rw-r--r--library/resource.h10
2 files changed, 12 insertions, 0 deletions
diff --git a/library/library.pro b/library/library.pro
index 95c18a2..7143454 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -94,46 +94,48 @@ SOURCES = calendar.cpp \
94 timestring.cpp \ 94 timestring.cpp \
95 fontdatabase.cpp \ 95 fontdatabase.cpp \
96 power.cpp \ 96 power.cpp \
97 storage.cpp \ 97 storage.cpp \
98 qpemessagebox.cpp \ 98 qpemessagebox.cpp \
99 backend/timeconversion.cpp \ 99 backend/timeconversion.cpp \
100 qpedebug.cpp \ 100 qpedebug.cpp \
101 qpemenubar.cpp \ 101 qpemenubar.cpp \
102 qpetoolbar.cpp \ 102 qpetoolbar.cpp \
103 backend/categories.cpp \ 103 backend/categories.cpp \
104 backend/stringutil.cpp \ 104 backend/stringutil.cpp \
105 backend/palmtoprecord.cpp \ 105 backend/palmtoprecord.cpp \
106 backend/task.cpp \ 106 backend/task.cpp \
107 backend/event.cpp \ 107 backend/event.cpp \
108 backend/contact.cpp \ 108 backend/contact.cpp \
109 categorymenu.cpp \ 109 categorymenu.cpp \
110 categoryedit_p.cpp \ 110 categoryedit_p.cpp \
111 categoryselect.cpp \ 111 categoryselect.cpp \
112 categorywidget.cpp \ 112 categorywidget.cpp \
113 ir.cpp \ 113 ir.cpp \
114 backend/vcc_yacc.cpp \ 114 backend/vcc_yacc.cpp \
115 backend/vobject.cpp \ 115 backend/vobject.cpp \
116 findwidget_p.cpp \ 116 findwidget_p.cpp \
117 finddialog.cpp \ 117 finddialog.cpp \
118 lnkproperties.cpp \ 118 lnkproperties.cpp \
119 widget_showing.cpp 119 widget_showing.cpp
120 120
121 121
122 122
123# Qt 3 compatibility 123# Qt 3 compatibility
124HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h 124HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h
125SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp 125SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp
126
127DEFINES += OPIE_INTERNAL_LIBRARY_BUILD
126INCLUDEPATH += $(OPIEDIR)/include backend 128INCLUDEPATH += $(OPIEDIR)/include backend
127 LIBS += -ldl -lcrypt -lm 129 LIBS += -ldl -lcrypt -lm
128INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui 130INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui
129 TARGET = qpe 131 TARGET = qpe
130 DESTDIR = $(OPIEDIR)/lib$(PROJMAK) 132 DESTDIR = $(OPIEDIR)/lib$(PROJMAK)
131 VERSION = 1.5.0.1 133 VERSION = 1.5.0.1
132 134
133include( $(OPIEDIR)/include.pro ) 135include( $(OPIEDIR)/include.pro )
134 136
135contains( CONFIG, LIBQPE_WITHROHFEEDBACK ){ 137contains( CONFIG, LIBQPE_WITHROHFEEDBACK ){
136 DEFINES += OPIE_WITHROHFEEDBACK 138 DEFINES += OPIE_WITHROHFEEDBACK
137 SOURCES += backend/rohfeedback.cpp 139 SOURCES += backend/rohfeedback.cpp
138 HEADERS += backend/rohfeedback.h 140 HEADERS += backend/rohfeedback.h
139} 141}
diff --git a/library/resource.h b/library/resource.h
index 4a3502a..9e4cb54 100644
--- a/library/resource.h
+++ b/library/resource.h
@@ -13,54 +13,64 @@
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20#ifndef PIXMAPLOADER_H 20#ifndef PIXMAPLOADER_H
21#define PIXMAPLOADER_H 21#define PIXMAPLOADER_H
22 22
23#include <qimage.h> 23#include <qimage.h>
24#include <qbitmap.h> 24#include <qbitmap.h>
25#include <qiconset.h> 25#include <qiconset.h>
26#include <qstringlist.h> 26#include <qstringlist.h>
27 27
28class Resource 28class Resource
29{ 29{
30public: 30public:
31 Resource() {} 31 Resource() {}
32 32
33 static QImage loadImage( const QString &name); 33 static QImage loadImage( const QString &name);
34 34
35 static QPixmap loadPixmap( const QString &name ); 35 static QPixmap loadPixmap( const QString &name );
36 static QBitmap loadBitmap( const QString &name ); 36 static QBitmap loadBitmap( const QString &name );
37 static QString findPixmap( const QString &name ); 37 static QString findPixmap( const QString &name );
38 38
39 static QIconSet loadIconSet( const QString &name ); 39 static QIconSet loadIconSet( const QString &name );
40 40
41 static QString findSound( const QString &name ); 41 static QString findSound( const QString &name );
42 static QStringList allSounds(); 42 static QStringList allSounds();
43}; 43};
44 44
45#ifdef OPIE_INTERNAL_LIBRARY_BUILD
45extern bool qpe_fast_findPixmap; 46extern bool qpe_fast_findPixmap;
47#endif
48
49
46// Inline for compatibility with SHARP ROMs 50// Inline for compatibility with SHARP ROMs
47inline QIconSet Resource::loadIconSet( const QString &pix ) 51inline QIconSet Resource::loadIconSet( const QString &pix )
48{ 52{
53
54#ifdef OPIE_INTERNAL_LIBRARY_BUILD
49 /* 55 /*
50 * disable the slow load 56 * disable the slow load
51 */ 57 */
52 bool oldMode = qpe_fast_findPixmap; 58 bool oldMode = qpe_fast_findPixmap;
53 qpe_fast_findPixmap = true; 59 qpe_fast_findPixmap = true;
60#endif
54 61
55 QPixmap dpm = loadPixmap( pix + "_disabled" ); 62 QPixmap dpm = loadPixmap( pix + "_disabled" );
56 QPixmap pm = loadPixmap( pix ); 63 QPixmap pm = loadPixmap( pix );
57 QIconSet is( pm ); 64 QIconSet is( pm );
58 if ( !dpm.isNull() ) 65 if ( !dpm.isNull() )
59 is.setPixmap( dpm, pm.width() <= 22 ? QIconSet::Small : QIconSet::Large, QIconSet::Disabled ); 66 is.setPixmap( dpm, pm.width() <= 22 ? QIconSet::Small : QIconSet::Large, QIconSet::Disabled );
60 67
68#ifdef OPIE_INTERNAL_LIBRARY_BUILD
61 qpe_fast_findPixmap = oldMode; 69 qpe_fast_findPixmap = oldMode;
70#endif
71
62 return is; 72 return is;
63} 73}
64 74
65 75
66#endif 76#endif