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/impl/doc | |
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/impl/doc') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/opie-eye/impl/doc/doc.pro | 7 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/impl/doc/doc_ifaceinfo.cpp | 4 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/impl/doc/doc_lister.cpp | 17 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/impl/doc/doc_lister.h | 1 |
4 files changed, 17 insertions, 12 deletions
diff --git a/noncore/graphics/opie-eye/impl/doc/doc.pro b/noncore/graphics/opie-eye/impl/doc/doc.pro new file mode 100644 index 0000000..076aa3b --- a/dev/null +++ b/noncore/graphics/opie-eye/impl/doc/doc.pro | |||
@@ -0,0 +1,7 @@ | |||
1 | HEADERS += impl/doc/doc_dirview.h \ | ||
2 | impl/doc/doc_ifaceinfo.h \ | ||
3 | impl/doc/doc_lister.h | ||
4 | |||
5 | SOURCES += impl/doc/doc_dirview.cpp \ | ||
6 | impl/doc/doc_ifaceinfo.cpp \ | ||
7 | impl/doc/doc_lister.cpp | ||
diff --git a/noncore/graphics/opie-eye/impl/doc/doc_ifaceinfo.cpp b/noncore/graphics/opie-eye/impl/doc/doc_ifaceinfo.cpp index a6d6f3c..356a4b6 100644 --- a/noncore/graphics/opie-eye/impl/doc/doc_ifaceinfo.cpp +++ b/noncore/graphics/opie-eye/impl/doc/doc_ifaceinfo.cpp | |||
@@ -29,29 +29,29 @@ namespace { | |||
29 | } | 29 | } |
30 | #endif | 30 | #endif |
31 | 31 | ||
32 | DocInterfaceInfo::DocInterfaceInfo() { | 32 | DocInterfaceInfo::DocInterfaceInfo() { |
33 | } | 33 | } |
34 | DocInterfaceInfo::~DocInterfaceInfo() { | 34 | DocInterfaceInfo::~DocInterfaceInfo() { |
35 | } | 35 | } |
36 | 36 | ||
37 | QString DocInterfaceInfo::name()const { | 37 | QString DocInterfaceInfo::name()const { |
38 | return QString::fromLatin1(QObject::tr("DocView" )); | 38 | return QString::fromLatin1(QObject::tr("DocView" )); |
39 | } | 39 | } |
40 | 40 | ||
41 | QWidget* DocInterfaceInfo::configWidget(const Config& cfg) { | 41 | QWidget* DocInterfaceInfo::configWidget(const Config& ) { |
42 | #if 0 | 42 | #if 0 |
43 | DirImageWidget* wid = new DirImageWidget(); | 43 | DirImageWidget* wid = new DirImageWidget(); |
44 | wid->chkbox->setChecked( cfg.readBoolEntry("Dir_Check_All_Files", true) ); | 44 | wid->chkbox->setChecked( cfg.readBoolEntry("Dir_Check_All_Files", true) ); |
45 | 45 | ||
46 | return wid; | 46 | return wid; |
47 | #endif | 47 | #endif |
48 | return 0L; | 48 | return 0L; |
49 | } | 49 | } |
50 | 50 | ||
51 | void DocInterfaceInfo::writeConfig( QWidget* , Config& ) { | 51 | void DocInterfaceInfo::writeConfig( QWidget* , Config& ) { |
52 | #if 0 | 52 | #if 0 |
53 | owarn << "Write Config" << oendl; | 53 | owarn << "Write Config" << oendl; |
54 | DirImageWidget* wid = static_cast<DirImageWidget*>(_wid); | 54 | DirImageWidget* wid = static_cast<DirImageWidget*>(_wid); |
55 | cfg.writeEntry("Dir_Check_All_Files", wid->chkbox->isChecked() ); | 55 | cfg.writeEntry("Dir_Check_All_Files", wid->chkbox->isChecked() ); |
56 | #endif | 56 | #endif |
57 | } | 57 | } |
diff --git a/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp b/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp index d4d1831..722fb95 100644 --- a/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp +++ b/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp | |||
@@ -12,40 +12,41 @@ | |||
12 | #include <qpe/qpeapplication.h> | 12 | #include <qpe/qpeapplication.h> |
13 | #include <qpe/applnk.h> | 13 | #include <qpe/applnk.h> |
14 | 14 | ||
15 | using namespace Opie::Core; | 15 | using namespace Opie::Core; |
16 | 16 | ||
17 | /* QT */ | 17 | /* QT */ |
18 | #include <qdir.h> | 18 | #include <qdir.h> |
19 | #include <qfileinfo.h> | 19 | #include <qfileinfo.h> |
20 | 20 | ||
21 | Doc_DirLister::Doc_DirLister() | 21 | Doc_DirLister::Doc_DirLister() |
22 | : PDirLister( "doc_dir_lister" ) | 22 | : PDirLister( "doc_dir_lister" ) |
23 | { | 23 | { |
24 | /* connect the signals */ | ||
24 | SlaveMaster* master = SlaveMaster::self(); | 25 | SlaveMaster* master = SlaveMaster::self(); |
25 | connect( master, SIGNAL(sig_start()), this, SIGNAL(sig_start()) ); | 26 | connect( master, SIGNAL(sig_start()), this, SIGNAL(sig_start()) ); |
26 | connect( master, SIGNAL(sig_end()), this, SIGNAL(sig_end()) ); | 27 | connect( master, SIGNAL(sig_end()), this, SIGNAL(sig_end()) ); |
27 | connect( master, SIGNAL(sig_thumbInfo(const QString&, const QString&)), | 28 | connect( master, SIGNAL(sig_thumbInfo(const QString&, const QString&)), |
28 | this, SLOT(slotThumbInfo(const QString&, const QString&)) ); | 29 | this, SLOT(slotThumbInfo(const QString&, const QString&)) ); |
29 | connect( master, SIGNAL(sig_fullInfo(const QString&, const QString&)), | 30 | connect( master, SIGNAL(sig_fullInfo(const QString&, const QString&)), |
30 | this, SLOT(slotFullInfo(const QString&, const QString&)) ); | 31 | this, SLOT(slotFullInfo(const QString&, const QString&)) ); |
31 | connect( master, SIGNAL(sig_thumbNail(const QString&, const QPixmap&)), | 32 | connect( master, SIGNAL(sig_thumbNail(const QString&, const QPixmap&)), |
32 | this, SLOT(slotThumbNail(const QString&, const QPixmap&)) ); | 33 | this, SLOT(slotThumbNail(const QString&, const QPixmap&)) ); |
33 | 34 | ||
34 | m_namemap.clear(); | 35 | m_namemap.clear(); |
35 | m_filemap.clear(); | 36 | m_filemap.clear(); |
36 | } | 37 | } |
37 | 38 | ||
38 | QString Doc_DirLister::defaultPath()const { | 39 | QString Doc_DirLister::defaultPath()const { |
39 | return ""; QPEApplication::documentDir(); | 40 | return QString::null; |
40 | } | 41 | } |
41 | 42 | ||
42 | QString Doc_DirLister::setStartPath(const QString&) { | 43 | QString Doc_DirLister::setStartPath(const QString&) { |
43 | static const QString Mtype_str("image/jpeg;image/gif;image/bmp;image/png"); | 44 | static const QString Mtype_str("image/jpeg;image/gif;image/bmp;image/png"); |
44 | if (m_namemap.isEmpty()) { | 45 | if (m_namemap.isEmpty()) { |
45 | DocLnkSet ds; | 46 | DocLnkSet ds; |
46 | Global::findDocuments(&ds,Mtype_str); | 47 | Global::findDocuments(&ds,Mtype_str); |
47 | QListIterator<DocLnk> dit(ds.children()); | 48 | QListIterator<DocLnk> dit(ds.children()); |
48 | for( ; dit.current(); ++dit) { | 49 | for( ; dit.current(); ++dit) { |
49 | // if (! (*dit)->isValid()) continue; | 50 | // if (! (*dit)->isValid()) continue; |
50 | m_namemap[(*dit)->name()]=(*dit)->file(); | 51 | m_namemap[(*dit)->name()]=(*dit)->file(); |
51 | m_filemap[(*dit)->file()]=(*dit)->name(); | 52 | m_filemap[(*dit)->file()]=(*dit)->name(); |
@@ -69,84 +70,80 @@ QStringList Doc_DirLister::files()const { | |||
69 | for (it = m_namemap.begin();it != m_namemap.end();++it) { | 70 | for (it = m_namemap.begin();it != m_namemap.end();++it) { |
70 | out.append(it.key()); | 71 | out.append(it.key()); |
71 | } | 72 | } |
72 | return out; | 73 | return out; |
73 | } | 74 | } |
74 | 75 | ||
75 | void Doc_DirLister::deleteImage( const QString& ) | 76 | void Doc_DirLister::deleteImage( const QString& ) |
76 | { | 77 | { |
77 | } | 78 | } |
78 | 79 | ||
79 | void Doc_DirLister::thumbNail( const QString& str, int w, int h) { | 80 | void Doc_DirLister::thumbNail( const QString& str, int w, int h) { |
80 | if (m_namemap.find(str)==m_namemap.end()) { | 81 | if (m_namemap.find(str)==m_namemap.end()) { |
81 | owarn << "Item " << str << " not found" << oendl; | ||
82 | return; | 82 | return; |
83 | } | 83 | } |
84 | QString fname = m_namemap[str]; | 84 | QString fname = m_namemap[str]; |
85 | SlaveMaster::self()->thumbNail( fname, w, h ); | 85 | SlaveMaster::self()->thumbNail( fname, w, h ); |
86 | } | 86 | } |
87 | 87 | ||
88 | QImage Doc_DirLister::image( const QString& str, Factor f, int m) { | 88 | QImage Doc_DirLister::image( const QString& str, Factor f, int m) { |
89 | if (m_namemap.find(str)==m_namemap.end()) { | 89 | if (m_namemap.find(str)==m_namemap.end()) { |
90 | owarn << "Item " << str << " not found" << oendl; | ||
91 | return QImage(); | 90 | return QImage(); |
92 | } | 91 | } |
93 | QString fname = m_namemap[str]; | 92 | QString fname = m_namemap[str]; |
94 | return SlaveMaster::self()->image( fname, f, m ); | 93 | return SlaveMaster::self()->image( fname, f, m ); |
95 | } | 94 | } |
96 | 95 | ||
97 | void Doc_DirLister::imageInfo( const QString& str) { | 96 | void Doc_DirLister::imageInfo( const QString& str) { |
98 | if (m_namemap.find(str)==m_namemap.end()) { | 97 | if (m_namemap.find(str)==m_namemap.end()) { |
99 | owarn << "Item " << str << " not found" << oendl; | ||
100 | return; | 98 | return; |
101 | } | 99 | } |
102 | QString fname = m_namemap[str]; | 100 | QString fname = m_namemap[str]; |
103 | SlaveMaster::self()->thumbInfo( fname ); | 101 | SlaveMaster::self()->thumbInfo( fname ); |
104 | } | 102 | } |
105 | 103 | ||
106 | void Doc_DirLister::fullImageInfo( const QString& str) { | 104 | void Doc_DirLister::fullImageInfo( const QString& str) { |
107 | if (m_namemap.find(str)==m_namemap.end()) { | 105 | if (m_namemap.find(str)==m_namemap.end()) { |
108 | owarn << "Item " << str << " not found" << oendl; | ||
109 | return; | 106 | return; |
110 | } | 107 | } |
111 | QString fname = m_namemap[str]; | 108 | QString fname = m_namemap[str]; |
112 | SlaveMaster::self()->imageInfo( fname ); | 109 | SlaveMaster::self()->imageInfo( fname ); |
113 | } | 110 | } |
114 | 111 | ||
115 | void Doc_DirLister::slotFullInfo(const QString&f, const QString&t) | 112 | void Doc_DirLister::slotFullInfo(const QString&f, const QString&t) |
116 | { | 113 | { |
117 | if (m_filemap.find(f)==m_filemap.end()) { | 114 | if (m_filemap.find(f)==m_filemap.end()) { |
118 | owarn << "Item " << f << " not found" << oendl; | ||
119 | return; | 115 | return; |
120 | } | 116 | } |
121 | QString name = m_filemap[f]; | 117 | QString name = m_filemap[f]; |
122 | emit sig_fullInfo(name, t); | 118 | emit sig_fullInfo(name, t); |
123 | } | 119 | } |
124 | 120 | ||
125 | void Doc_DirLister::slotThumbInfo(const QString&f, const QString&t) | 121 | void Doc_DirLister::slotThumbInfo(const QString&f, const QString&t) |
126 | { | 122 | { |
127 | if (m_filemap.find(f)==m_filemap.end()) { | 123 | if (m_filemap.find(f)==m_filemap.end()) { |
128 | owarn << "Item " << f << " not found" << oendl; | ||
129 | return; | 124 | return; |
130 | } | 125 | } |
131 | QString name = m_filemap[f]; | 126 | QString name = m_filemap[f]; |
132 | emit sig_thumbInfo(name, t); | 127 | emit sig_thumbInfo(name, t); |
133 | } | 128 | } |
134 | 129 | ||
135 | void Doc_DirLister::slotThumbNail(const QString&f, const QPixmap&p) | 130 | void Doc_DirLister::slotThumbNail(const QString&f, const QPixmap&p) |
136 | { | 131 | { |
137 | if (m_filemap.find(f)==m_filemap.end()) { | 132 | if (m_filemap.find(f)==m_filemap.end()) { |
138 | owarn << "Item " << f << " not found" << oendl; | ||
139 | return; | 133 | return; |
140 | } | 134 | } |
141 | QString name = m_filemap[f]; | 135 | QString name = m_filemap[f]; |
142 | emit sig_thumbNail(name, p); | 136 | emit sig_thumbNail(name, p); |
143 | } | 137 | } |
144 | 138 | ||
145 | QString Doc_DirLister::nameToFname(const QString&name)const | 139 | QString Doc_DirLister::nameToFname(const QString&name)const |
146 | { | 140 | { |
147 | if (m_namemap.find(name)==m_namemap.end()) { | 141 | if (m_namemap.find(name)==m_namemap.end()) { |
148 | owarn << "Item " << name << " not found" << oendl; | ||
149 | return QString::null; | 142 | return QString::null; |
150 | } | 143 | } |
151 | return m_namemap[name]; | 144 | return m_namemap[name]; |
152 | } | 145 | } |
146 | |||
147 | QString Doc_DirLister::dirUp( const QString& p ) const{ | ||
148 | return p; | ||
149 | } | ||
diff --git a/noncore/graphics/opie-eye/impl/doc/doc_lister.h b/noncore/graphics/opie-eye/impl/doc/doc_lister.h index a65b616..5884a35 100644 --- a/noncore/graphics/opie-eye/impl/doc/doc_lister.h +++ b/noncore/graphics/opie-eye/impl/doc/doc_lister.h | |||
@@ -20,22 +20,23 @@ public: | |||
20 | QString defaultPath()const; | 20 | QString defaultPath()const; |
21 | QString setStartPath( const QString& ); | 21 | QString setStartPath( const QString& ); |
22 | QString currentPath()const; | 22 | QString currentPath()const; |
23 | QStringList folders()const; | 23 | QStringList folders()const; |
24 | QStringList files()const; | 24 | QStringList files()const; |
25 | 25 | ||
26 | void deleteImage( const QString& ); | 26 | void deleteImage( const QString& ); |
27 | void thumbNail( const QString&, int, int ); | 27 | void thumbNail( const QString&, int, int ); |
28 | QImage image( const QString&, Factor, int ); | 28 | QImage image( const QString&, Factor, int ); |
29 | void imageInfo( const QString& ); | 29 | void imageInfo( const QString& ); |
30 | void fullImageInfo( const QString& ); | 30 | void fullImageInfo( const QString& ); |
31 | virtual QString nameToFname(const QString&name)const; | 31 | virtual QString nameToFname(const QString&name)const; |
32 | QString dirUp( const QString& )const; | ||
32 | 33 | ||
33 | private: | 34 | private: |
34 | QMap<QString,QString> m_namemap,m_filemap; | 35 | QMap<QString,QString> m_namemap,m_filemap; |
35 | protected slots: | 36 | protected slots: |
36 | virtual void slotFullInfo(const QString&, const QString&); | 37 | virtual void slotFullInfo(const QString&, const QString&); |
37 | virtual void slotThumbInfo(const QString&, const QString&); | 38 | virtual void slotThumbInfo(const QString&, const QString&); |
38 | virtual void slotThumbNail(const QString&, const QPixmap&); | 39 | virtual void slotThumbNail(const QString&, const QPixmap&); |
39 | }; | 40 | }; |
40 | 41 | ||
41 | #endif | 42 | #endif |