summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-03-18 23:13:24 (UTC)
committer kergoth <kergoth>2002-03-18 23:13:24 (UTC)
commit35d040816fd59e247efbe9727ecd810bcba7c2b9 (patch) (unidiff)
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 @@
1[Desktop Entry] 1[Desktop Entry]
2Comment=An EMail Client 2Comment=An EMail Client
3Exec=opiemail 3Exec=opiemail
4Icon=opiemail 4Icon=opiemail/opiemail
5Type=Application 5Type=Application
6Name=EMail 6Name=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
@@ -122,25 +122,25 @@ public:
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)
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