summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-03-18 23:02:41 (UTC)
committer kergoth <kergoth>2002-03-18 23:02:41 (UTC)
commit2a6b7129c74b7769c6a61a2dcdebce69e8756f62 (patch) (side-by-side diff)
tree5b4c82d0861a8fd6ecd87afa9ccce9328e9bfb8c
parent5041129a9cba3222990fec42d0a96ceb660f9e86 (diff)
downloadopie-2a6b7129c74b7769c6a61a2dcdebce69e8756f62.zip
opie-2a6b7129c74b7769c6a61a2dcdebce69e8756f62.tar.gz
opie-2a6b7129c74b7769c6a61a2dcdebce69e8756f62.tar.bz2
Fixing package conflicts.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/startmenu.cpp2
-rw-r--r--pics/launcher/start_button.png (renamed from pics/start_button.png)bin780 -> 780 bytes
-rw-r--r--pics/start_button.xpm26
3 files changed, 1 insertions, 27 deletions
diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp
index 007b483..237a2de 100644
--- a/core/launcher/startmenu.cpp
+++ b/core/launcher/startmenu.cpp
@@ -84,5 +84,5 @@ void StartMenu::loadOptions()
popupMenuSidePixmap = "go";
startButtonIsFlat = TRUE;
- startButtonPixmap = "start_button";
+ startButtonPixmap = "launcher/start_button";
#endif
}
diff --git a/pics/start_button.png b/pics/launcher/start_button.png
index c84c00b..c84c00b 100644
--- a/pics/start_button.png
+++ b/pics/launcher/start_button.png
Binary files differ
diff --git a/pics/start_button.xpm b/pics/start_button.xpm
deleted file mode 100644
index 6eba2a5..0000000
--- a/pics/start_button.xpm
+++ b/dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * start_button_xpm[] = {
-"50 16 7 1",
-" c None",
-". c #707070",
-"+ c #FFFFFF",
-"@ c #000000",
-"# c #008200",
-"$ c #C0C0C0",
-"% c #B7B500",
-".++++++++++++++++++++++++++++++++++++++++++++++++@",
-"+##############$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$@",
-"+####@@@@@@####$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$@",
-"+###@@@@@@@@###$$$@@@@$$$$@$$$$$$$$$$$$$$$$$$@$$$@",
-"+##@@#####@@@##$$@@$$@@$$@@$$$$$$$$$$$$$$$$$@@$$$@",
-"+#@@#######@@@#$$@@$$$$$@@@@@$$@@@@$$$@@$@@@@@@@$@",
-"+#@#########@@#$$@@@$$$$$@@$$$@@$$@@$$@@$@@$@@$$$@",
-"+#@###@%@###@@#$$$@@@@$$$@@$$$$$$$@@$$@@@$$$@@$$$@",
-"+#@###%%%###@@#$$$$$@@@$$@@$$$$@@@@@$$@@$$$$@@$$$@",
-"+#@###@%@###@@#$$$$$$@@$$@@$$$@@$$@@$$@@$$$$@@$$$@",
-"+#@#########@@#$$@@$$@@$$@@$$$@@$$@@$$@@$$$$@@$$$@",
-"+#@@########@@#$$$@@@@$$$$@@@$$@@@$@@$@@$$$$$@@@$@",
-"+##@@######@@@#$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$@",
-"+###@@####@@@##$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$@",
-"+####@@@@@@@###$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$@",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"};