-rw-r--r-- | apps/Applications/opiemail.desktop | 2 | ||||
-rw-r--r-- | core/launcher/launcherview.cpp | 2 | ||||
-rw-r--r-- | pics/launcher/opie-background.png (renamed from pics/qpe-background.png) | bin | 26866 -> 26866 bytes | |||
-rw-r--r-- | pics/opiemail/opiemail.png (renamed from pics/opiemail.png) | bin | 2136 -> 2136 bytes | |||
-rw-r--r-- | pics/textedit/s_hidden.png (renamed from pics/s_hidden.png) | bin | 356 -> 356 bytes |
5 files changed, 2 insertions, 2 deletions
diff --git a/apps/Applications/opiemail.desktop b/apps/Applications/opiemail.desktop index b123edf..c3cd6f1 100644 --- a/apps/Applications/opiemail.desktop +++ b/apps/Applications/opiemail.desktop | |||
@@ -1,6 +1,6 @@ | |||
1 | [Desktop Entry] | 1 | [Desktop Entry] |
2 | Comment=An EMail Client | 2 | Comment=An EMail Client |
3 | Exec=opiemail | 3 | Exec=opiemail |
4 | Icon=opiemail | 4 | Icon=opiemail/opiemail |
5 | Type=Application | 5 | Type=Application |
6 | Name=EMail | 6 | Name=EMail |
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp index 538ad79..cd336d2 100644 --- a/core/launcher/launcherview.cpp +++ b/core/launcher/launcherview.cpp | |||
@@ -102,65 +102,65 @@ public: | |||
102 | 102 | ||
103 | QStringList mimeTypes() const; | 103 | QStringList mimeTypes() const; |
104 | QStringList categories() const; | 104 | QStringList categories() const; |
105 | 105 | ||
106 | void clear() | 106 | void clear() |
107 | { | 107 | { |
108 | mimes.clear(); | 108 | mimes.clear(); |
109 | cats.clear(); | 109 | cats.clear(); |
110 | QIconView::clear(); | 110 | QIconView::clear(); |
111 | hidden.clear(); | 111 | hidden.clear(); |
112 | } | 112 | } |
113 | 113 | ||
114 | void addCatsAndMimes(AppLnk* app) | 114 | void addCatsAndMimes(AppLnk* app) |
115 | { | 115 | { |
116 | // QStringList c = app->categories(); | 116 | // QStringList c = app->categories(); |
117 | // for (QStringList::ConstIterator cit=c.begin(); cit!=c.end(); ++cit) { | 117 | // for (QStringList::ConstIterator cit=c.begin(); cit!=c.end(); ++cit) { |
118 | // cats.replace(*cit,(void*)1); | 118 | // cats.replace(*cit,(void*)1); |
119 | // } | 119 | // } |
120 | QString maj=app->type(); | 120 | QString maj=app->type(); |
121 | int sl=maj.find('/'); | 121 | int sl=maj.find('/'); |
122 | if (sl>=0) { | 122 | if (sl>=0) { |
123 | QString k = maj.left(sl); | 123 | QString k = maj.left(sl); |
124 | mimes.replace(k,(void*)1); | 124 | mimes.replace(k,(void*)1); |
125 | } | 125 | } |
126 | } | 126 | } |
127 | 127 | ||
128 | void drawBackground( QPainter *p, const QRect &r ) | 128 | void drawBackground( QPainter *p, const QRect &r ) |
129 | { | 129 | { |
130 | Config config("qpe"); | 130 | Config config("qpe"); |
131 | config.setGroup("Appearance"); | 131 | config.setGroup("Appearance"); |
132 | QString backgroundImage = config.readEntry("BackgroundImage"); | 132 | QString backgroundImage = config.readEntry("BackgroundImage"); |
133 | 133 | ||
134 | if (backgroundImage.isNull()) backgroundImage="qpe-background"; | 134 | if (backgroundImage.isNull()) backgroundImage="opie-background"; |
135 | int backgroundMode = QPixmap::defaultDepth() >= 12 ? 1 : 0; | 135 | int backgroundMode = QPixmap::defaultDepth() >= 12 ? 1 : 0; |
136 | //int backgroundMode = 2; | 136 | //int backgroundMode = 2; |
137 | 137 | ||
138 | if ( backgroundMode == 1 ) { | 138 | if ( backgroundMode == 1 ) { |
139 | 139 | ||
140 | // Double buffer the background | 140 | // Double buffer the background |
141 | static QPixmap *bg = NULL; | 141 | static QPixmap *bg = NULL; |
142 | static QColor bgColor; | 142 | static QColor bgColor; |
143 | 143 | ||
144 | if ( (bg == NULL) || (bgColor != colorGroup().button()) ) { | 144 | if ( (bg == NULL) || (bgColor != colorGroup().button()) ) { |
145 | // Create a new background double buffer | 145 | // Create a new background double buffer |
146 | if (bg == NULL) | 146 | if (bg == NULL) |
147 | bg = new QPixmap( width(), height() ); | 147 | bg = new QPixmap( width(), height() ); |
148 | bgColor = colorGroup().button(); | 148 | bgColor = colorGroup().button(); |
149 | QPainter painter( bg ); | 149 | QPainter painter( bg ); |
150 | 150 | ||
151 | painter.fillRect( QRect( 0, 0, width(), height() ), colorGroup().background().light(110)); | 151 | painter.fillRect( QRect( 0, 0, width(), height() ), colorGroup().background().light(110)); |
152 | // Overlay the Qtopia logo in the center | 152 | // Overlay the Qtopia logo in the center |
153 | QImage logo; | 153 | QImage logo; |
154 | if (QFile::exists(backgroundImage)) { | 154 | if (QFile::exists(backgroundImage)) { |
155 | logo = QImage(backgroundImage); | 155 | logo = QImage(backgroundImage); |
156 | } else { | 156 | } else { |
157 | logo = Resource::loadImage(backgroundImage ); | 157 | logo = Resource::loadImage(backgroundImage ); |
158 | } | 158 | } |
159 | if ( !logo.isNull() ) | 159 | if ( !logo.isNull() ) |
160 | painter.drawImage( (width() - logo.width()) / 2, | 160 | painter.drawImage( (width() - logo.width()) / 2, |
161 | (height() - logo.height()) / 2, logo ); | 161 | (height() - logo.height()) / 2, logo ); |
162 | } | 162 | } |
163 | 163 | ||
164 | // Draw the double buffer to the widget (it is tiled for when the icon view is large) | 164 | // Draw the double buffer to the widget (it is tiled for when the icon view is large) |
165 | p->drawTiledPixmap( r, *bg, QPoint( (r.x() + contentsX()) % bg->width(), | 165 | p->drawTiledPixmap( r, *bg, QPoint( (r.x() + contentsX()) % bg->width(), |
166 | (r.y() + contentsY()) % bg->height() ) ); | 166 | (r.y() + contentsY()) % bg->height() ) ); |
diff --git a/pics/qpe-background.png b/pics/launcher/opie-background.png index 06461bf..06461bf 100644 --- a/pics/qpe-background.png +++ b/pics/launcher/opie-background.png | |||
Binary files differ | |||
diff --git a/pics/opiemail.png b/pics/opiemail/opiemail.png index 0095184..0095184 100644 --- a/pics/opiemail.png +++ b/pics/opiemail/opiemail.png | |||
Binary files differ | |||
diff --git a/pics/s_hidden.png b/pics/textedit/s_hidden.png index a9f3c54..a9f3c54 100644 --- a/pics/s_hidden.png +++ b/pics/textedit/s_hidden.png | |||
Binary files differ | |||