summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-03-18 23:13:24 (UTC)
committer kergoth <kergoth>2002-03-18 23:13:24 (UTC)
commit35d040816fd59e247efbe9727ecd810bcba7c2b9 (patch) (side-by-side diff)
treebd8af7644f6ff0bfa4c1a14b3e66306ad06b9e46
parent2a6b7129c74b7769c6a61a2dcdebce69e8756f62 (diff)
downloadopie-35d040816fd59e247efbe9727ecd810bcba7c2b9.zip
opie-35d040816fd59e247efbe9727ecd810bcba7c2b9.tar.gz
opie-35d040816fd59e247efbe9727ecd810bcba7c2b9.tar.bz2
Fixing package conflicts.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--apps/Applications/opiemail.desktop2
-rw-r--r--core/launcher/launcherview.cpp2
-rw-r--r--pics/launcher/opie-background.png (renamed from pics/qpe-background.png)bin26866 -> 26866 bytes
-rw-r--r--pics/opiemail/opiemail.png (renamed from pics/opiemail.png)bin2136 -> 2136 bytes
-rw-r--r--pics/textedit/s_hidden.png (renamed from pics/s_hidden.png)bin356 -> 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 @@
[Desktop Entry]
Comment=An EMail Client
Exec=opiemail
-Icon=opiemail
+Icon=opiemail/opiemail
Type=Application
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
@@ -128,13 +128,13 @@ public:
void drawBackground( QPainter *p, const QRect &r )
{
Config config("qpe");
config.setGroup("Appearance");
QString backgroundImage = config.readEntry("BackgroundImage");
- if (backgroundImage.isNull()) backgroundImage="qpe-background";
+ if (backgroundImage.isNull()) backgroundImage="opie-background";
int backgroundMode = QPixmap::defaultDepth() >= 12 ? 1 : 0;
//int backgroundMode = 2;
if ( backgroundMode == 1 ) {
// Double buffer the background
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