author | zecke <zecke> | 2004-08-27 22:22:44 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-08-27 22:22:44 (UTC) |
commit | 7d1ca5dba4cab829d9f7a8c79fb772dc3b643eac (patch) (unidiff) | |
tree | 1d189e90585190465233a67c7c9a2a740cb1d98a /noncore/graphics/opie-eye/lib | |
parent | a6e7ebcee38719a9f33ede08ed4c8a364c2ecb20 (diff) | |
download | opie-7d1ca5dba4cab829d9f7a8c79fb772dc3b643eac.zip opie-7d1ca5dba4cab829d9f7a8c79fb772dc3b643eac.tar.gz opie-7d1ca5dba4cab829d9f7a8c79fb772dc3b643eac.tar.bz2 |
-Removal of debug messages
-Cleanups of .pro files
-Cleanups of source code
And finally the long awaited DigiCam (dcim) Backend
Diffstat (limited to 'noncore/graphics/opie-eye/lib') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/opie-eye/lib/slavemaster.cpp | 26 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/lib/slavemaster.h | 10 |
2 files changed, 31 insertions, 5 deletions
diff --git a/noncore/graphics/opie-eye/lib/slavemaster.cpp b/noncore/graphics/opie-eye/lib/slavemaster.cpp index 5bb7ab8..d7165cc 100644 --- a/noncore/graphics/opie-eye/lib/slavemaster.cpp +++ b/noncore/graphics/opie-eye/lib/slavemaster.cpp | |||
@@ -27,7 +27,7 @@ QDataStream & operator >> (QDataStream & str, bool & b) | |||
27 | * ! We don't put a Pixmap in!!!! | 27 | * ! We don't put a Pixmap in!!!! |
28 | */ | 28 | */ |
29 | QDataStream &operator<<( QDataStream& s, const PixmapInfo& inf) { | 29 | QDataStream &operator<<( QDataStream& s, const PixmapInfo& inf) { |
30 | owarn << "Image request is " << inf.file.latin1() << " " << inf.width << " " << inf.height << "" << oendl; | 30 | owarn << "Image request is " << inf.file.latin1() << " " << inf.width << " " << inf.height << "" << oendl; |
31 | return s << inf.file << inf.width << inf.height; | 31 | return s << inf.file << inf.width << inf.height; |
32 | } | 32 | } |
33 | QDataStream &operator>>( QDataStream& s, PixmapInfo& inf ) { | 33 | QDataStream &operator>>( QDataStream& s, PixmapInfo& inf ) { |
@@ -82,10 +82,10 @@ void SlaveMaster::imageInfo( const QString& str ) { | |||
82 | 82 | ||
83 | void SlaveMaster::thumbNail( const QString& str, int w, int h ) { | 83 | void SlaveMaster::thumbNail( const QString& str, int w, int h ) { |
84 | if ( str.isEmpty() ) { | 84 | if ( str.isEmpty() ) { |
85 | owarn << "Asking for empty nail" << oendl; | 85 | owarn << "Asking for empty nail" << oendl; |
86 | return; | 86 | return; |
87 | } | 87 | } |
88 | owarn << "Asking for thumbNail in size " << w << " " << h << "" + str << oendl; | 88 | owarn << "Asking for thumbNail in size " << w << " " << h << "" + str << oendl; |
89 | PixmapInfo item; | 89 | PixmapInfo item; |
90 | item.file = str; item.width = w; item.height = h; | 90 | item.file = str; item.width = w; item.height = h; |
91 | item.pixmap = QPixmap(); | 91 | item.pixmap = QPixmap(); |
@@ -109,7 +109,7 @@ void SlaveMaster::recieve( const QCString& str, const QByteArray& at) { | |||
109 | else if ( str == "pixmapsHandled(StringList)" ) | 109 | else if ( str == "pixmapsHandled(StringList)" ) |
110 | stream >> infos; | 110 | stream >> infos; |
111 | 111 | ||
112 | owarn << "PixInfos " << pixinfos.count() << "" << oendl; | 112 | owarn << "PixInfos " << pixinfos.count() << "" << oendl; |
113 | 113 | ||
114 | bool got_data = ( !infos.isEmpty() || !pixinfos.isEmpty() ); | 114 | bool got_data = ( !infos.isEmpty() || !pixinfos.isEmpty() ); |
115 | if ( got_data ) { | 115 | if ( got_data ) { |
@@ -149,6 +149,22 @@ void SlaveMaster::slotTimerStart() { | |||
149 | m_inThumbNail.clear(); | 149 | m_inThumbNail.clear(); |
150 | } | 150 | } |
151 | 151 | ||
152 | QImage SlaveMaster::image( const QString& str, PDirLister::Factor, int ) { | 152 | QImage SlaveMaster::image( const QString& , PDirLister::Factor, int ) { |
153 | return QImage(); | 153 | return QImage(); |
154 | } | 154 | } |
155 | |||
156 | |||
157 | namespace SlaveHelper { | ||
158 | void slaveConnectSignals( QObject* target ) { | ||
159 | SlaveMaster* master = SlaveMaster::self(); | ||
160 | |||
161 | QObject::connect( master, SIGNAL(sig_start()), target, SIGNAL(sig_start()) ); | ||
162 | QObject::connect( master, SIGNAL(sig_end()), target, SIGNAL(sig_end()) ); | ||
163 | QObject::connect( master, SIGNAL(sig_thumbInfo(const QString&, const QString&)), | ||
164 | target, SIGNAL(sig_thumbInfo(const QString&, const QString&)) ); | ||
165 | QObject::connect( master, SIGNAL(sig_fullInfo(const QString&, const QString&)), | ||
166 | target, SIGNAL(sig_fullInfo(const QString&, const QString&)) ); | ||
167 | QObject::connect( master, SIGNAL(sig_thumbNail(const QString&, const QPixmap&)), | ||
168 | target, SIGNAL(sig_thumbNail(const QString&, const QPixmap&)) ); | ||
169 | } | ||
170 | } | ||
diff --git a/noncore/graphics/opie-eye/lib/slavemaster.h b/noncore/graphics/opie-eye/lib/slavemaster.h index f5284a6..98c3403 100644 --- a/noncore/graphics/opie-eye/lib/slavemaster.h +++ b/noncore/graphics/opie-eye/lib/slavemaster.h | |||
@@ -8,6 +8,16 @@ | |||
8 | #include <qstring.h> | 8 | #include <qstring.h> |
9 | #include <qsize.h> | 9 | #include <qsize.h> |
10 | 10 | ||
11 | namespace SlaveHelper { | ||
12 | /** | ||
13 | * Small Helper to create a SlaveMaster | ||
14 | * and to connect its' signals to the | ||
15 | * object. To use the object as a proxy | ||
16 | */ | ||
17 | void slaveConnectSignals( QObject* ); | ||
18 | } | ||
19 | |||
20 | |||
11 | class SlaveMaster : public QObject { | 21 | class SlaveMaster : public QObject { |
12 | Q_OBJECT | 22 | Q_OBJECT |
13 | typedef QValueList<ImageInfo> ImageInfos; | 23 | typedef QValueList<ImageInfo> ImageInfos; |