author | zecke <zecke> | 2005-02-05 16:05:04 (UTC) |
---|---|---|
committer | zecke <zecke> | 2005-02-05 16:05:04 (UTC) |
commit | 23fc6bad8aa84ee1a690a07124ba9e59650e2aea (patch) (unidiff) | |
tree | 73f5efbf4ae055b781c78d395fa32bebc2705344 | |
parent | 8ba13dd38e7da296177719dcc8fddbbe978a4b9a (diff) | |
download | opie-23fc6bad8aa84ee1a690a07124ba9e59650e2aea.zip opie-23fc6bad8aa84ee1a690a07124ba9e59650e2aea.tar.gz opie-23fc6bad8aa84ee1a690a07124ba9e59650e2aea.tar.bz2 |
Implement deletion for the Document and Camera Liste
This should fix 1540
-rw-r--r-- | noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp | 2 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/impl/doc/doc_lister.cpp | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp b/noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp index 3c3d702..147eb9c 100644 --- a/noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp +++ b/noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp | |||
@@ -131,49 +131,49 @@ QStringList DCIM_DirLister::findCameras()const { | |||
131 | if ( lst.isEmpty() ) { | 131 | if ( lst.isEmpty() ) { |
132 | m_mode = ListingUnknown; | 132 | m_mode = ListingUnknown; |
133 | lst << QObject::tr("Error no Camera Dir found"); | 133 | lst << QObject::tr("Error no Camera Dir found"); |
134 | }else | 134 | }else |
135 | m_mode = ListingStart; | 135 | m_mode = ListingStart; |
136 | 136 | ||
137 | return lst; | 137 | return lst; |
138 | } | 138 | } |
139 | 139 | ||
140 | QStringList DCIM_DirLister::findAlbums()const { | 140 | QStringList DCIM_DirLister::findAlbums()const { |
141 | QStringList lst = QDir( m_path ).entryList( QDir::Dirs ); | 141 | QStringList lst = QDir( m_path ).entryList( QDir::Dirs ); |
142 | lst.remove( "." ); | 142 | lst.remove( "." ); |
143 | lst.remove( ".." ); | 143 | lst.remove( ".." ); |
144 | 144 | ||
145 | return lst; | 145 | return lst; |
146 | } | 146 | } |
147 | 147 | ||
148 | QStringList DCIM_DirLister::findImages()const { | 148 | QStringList DCIM_DirLister::findImages()const { |
149 | return QDir( m_path ).entryList("*.jpg *.jpeg *.png", QDir::Files ); | 149 | return QDir( m_path ).entryList("*.jpg *.jpeg *.png", QDir::Files ); |
150 | } | 150 | } |
151 | 151 | ||
152 | void DCIM_DirLister::deleteImage( const QString& fl ) { | 152 | void DCIM_DirLister::deleteImage( const QString& fl ) { |
153 | QFileInfo inf( fl ); | 153 | QFileInfo inf( fl ); |
154 | QFile::remove( fl ); | 154 | QFile::remove( fl ); |
155 | QFile::remove( inf.dirPath ()+"/preview"+ | 155 | QFile::remove( inf.dirPath ()+"/preview/"+ |
156 | inf.fileName() ); | 156 | inf.fileName() ); |
157 | } | 157 | } |
158 | 158 | ||
159 | void DCIM_DirLister::thumbNail( const QString& _str, int w, int h ) { | 159 | void DCIM_DirLister::thumbNail( const QString& _str, int w, int h ) { |
160 | QFileInfo inf( _str ); | 160 | QFileInfo inf( _str ); |
161 | QString str = QFileInfo( inf.dirPath()+"/preview"+ inf.fileName() ).exists() ? | 161 | QString str = QFileInfo( inf.dirPath()+"/preview"+ inf.fileName() ).exists() ? |
162 | inf.dirPath()+"/preview"+ inf.fileName() : _str; | 162 | inf.dirPath()+"/preview"+ inf.fileName() : _str; |
163 | 163 | ||
164 | SlaveMaster::self()->thumbNail( str, w, h ); | 164 | SlaveMaster::self()->thumbNail( str, w, h ); |
165 | } | 165 | } |
166 | 166 | ||
167 | QImage DCIM_DirLister::image( const QString& str, Factor f, int m ) { | 167 | QImage DCIM_DirLister::image( const QString& str, Factor f, int m ) { |
168 | return SlaveMaster::self()->image( str, f, m ); | 168 | return SlaveMaster::self()->image( str, f, m ); |
169 | } | 169 | } |
170 | 170 | ||
171 | void DCIM_DirLister::imageInfo( const QString& str ) { | 171 | void DCIM_DirLister::imageInfo( const QString& str ) { |
172 | SlaveMaster::self()->thumbInfo( str ); | 172 | SlaveMaster::self()->thumbInfo( str ); |
173 | } | 173 | } |
174 | 174 | ||
175 | void DCIM_DirLister::fullImageInfo( const QString& str ) { | 175 | void DCIM_DirLister::fullImageInfo( const QString& str ) { |
176 | SlaveMaster::self()->imageInfo( str ); | 176 | SlaveMaster::self()->imageInfo( str ); |
177 | } | 177 | } |
178 | 178 | ||
179 | QString DCIM_DirLister::nameToFname( const QString& name )const { | 179 | QString DCIM_DirLister::nameToFname( const QString& name )const { |
diff --git a/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp b/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp index 4a491e2..5281b75 100644 --- a/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp +++ b/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp | |||
@@ -72,50 +72,60 @@ QString Doc_DirLister::setStartPath(const QString&) { | |||
72 | QString Doc_DirLister::currentPath()const | 72 | QString Doc_DirLister::currentPath()const |
73 | { | 73 | { |
74 | return QString::null; | 74 | return QString::null; |
75 | } | 75 | } |
76 | 76 | ||
77 | 77 | ||
78 | QStringList Doc_DirLister::folders()const { | 78 | QStringList Doc_DirLister::folders()const { |
79 | return QStringList(); | 79 | return QStringList(); |
80 | } | 80 | } |
81 | 81 | ||
82 | QStringList Doc_DirLister::files()const { | 82 | QStringList Doc_DirLister::files()const { |
83 | QStringList out; | 83 | QStringList out; |
84 | QListIterator<DocLnk> dit(m_ds.children()); | 84 | QListIterator<DocLnk> dit(m_ds.children()); |
85 | for( ; dit.current(); ++dit) { | 85 | for( ; dit.current(); ++dit) { |
86 | if (!(*dit)->isValid()) continue; | 86 | if (!(*dit)->isValid()) continue; |
87 | if (!matchCat((*dit))) continue; | 87 | if (!matchCat((*dit))) continue; |
88 | QString s = (*dit)->name(); | 88 | QString s = (*dit)->name(); |
89 | s+=char(0); | 89 | s+=char(0); |
90 | s+=(*dit)->file(); | 90 | s+=(*dit)->file(); |
91 | out.append(s); | 91 | out.append(s); |
92 | } | 92 | } |
93 | return out; | 93 | return out; |
94 | } | 94 | } |
95 | 95 | ||
96 | void Doc_DirLister::deleteImage( const QString& ) | 96 | void Doc_DirLister::deleteImage( const QString& f) |
97 | { | 97 | { |
98 | /* | ||
99 | * find the file in the set of doclnks | ||
100 | */ | ||
101 | QListIterator<DocLnk> dit(m_ds.children()); | ||
102 | for( ; dit.current(); ++dit) { | ||
103 | if ( f == (*dit)->file() ) { | ||
104 | (*dit)->removeFiles(); | ||
105 | return; | ||
106 | } | ||
107 | } | ||
98 | } | 108 | } |
99 | 109 | ||
100 | void Doc_DirLister::thumbNail( const QString& str, int w, int h) | 110 | void Doc_DirLister::thumbNail( const QString& str, int w, int h) |
101 | { | 111 | { |
102 | SlaveMaster::self()->thumbNail( str, w, h ); | 112 | SlaveMaster::self()->thumbNail( str, w, h ); |
103 | } | 113 | } |
104 | 114 | ||
105 | QImage Doc_DirLister::image( const QString& str, Factor f, int m) | 115 | QImage Doc_DirLister::image( const QString& str, Factor f, int m) |
106 | { | 116 | { |
107 | return SlaveMaster::self()->image(str, f, m ); | 117 | return SlaveMaster::self()->image(str, f, m ); |
108 | } | 118 | } |
109 | 119 | ||
110 | void Doc_DirLister::imageInfo( const QString& str) { | 120 | void Doc_DirLister::imageInfo( const QString& str) { |
111 | SlaveMaster::self()->thumbInfo( str ); | 121 | SlaveMaster::self()->thumbInfo( str ); |
112 | } | 122 | } |
113 | 123 | ||
114 | void Doc_DirLister::fullImageInfo( const QString& str) { | 124 | void Doc_DirLister::fullImageInfo( const QString& str) { |
115 | SlaveMaster::self()->imageInfo(str); | 125 | SlaveMaster::self()->imageInfo(str); |
116 | } | 126 | } |
117 | 127 | ||
118 | void Doc_DirLister::slotFullInfo(const QString&f, const QString&t) | 128 | void Doc_DirLister::slotFullInfo(const QString&f, const QString&t) |
119 | { | 129 | { |
120 | emit sig_fullInfo(f, t); | 130 | emit sig_fullInfo(f, t); |
121 | } | 131 | } |