summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-03-18 23:02:41 (UTC)
committer kergoth <kergoth>2002-03-18 23:02:41 (UTC)
commit2a6b7129c74b7769c6a61a2dcdebce69e8756f62 (patch) (unidiff)
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
@@ -83,7 +83,7 @@ void StartMenu::loadOptions()
83 useWidePopupMenu = FALSE; 83 useWidePopupMenu = FALSE;
84 popupMenuSidePixmap = "go"; 84 popupMenuSidePixmap = "go";
85 startButtonIsFlat = TRUE; 85 startButtonIsFlat = TRUE;
86 startButtonPixmap = "start_button"; 86 startButtonPixmap = "launcher/start_button";
87#endif 87#endif
88} 88}
89 89
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 @@
1/* XPM */
2static char * start_button_xpm[] = {
3"50 16 7 1",
4 " c None",
5 ".c #707070",
6 "+c #FFFFFF",
7 "@c #000000",
8 "#c #008200",
9 "$c #C0C0C0",
10 "%c #B7B500",
11".++++++++++++++++++++++++++++++++++++++++++++++++@",
12"+##############$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$@",
13"+####@@@@@@####$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$@",
14"+###@@@@@@@@###$$$@@@@$$$$@$$$$$$$$$$$$$$$$$$@$$$@",
15"+##@@#####@@@##$$@@$$@@$$@@$$$$$$$$$$$$$$$$$@@$$$@",
16"+#@@#######@@@#$$@@$$$$$@@@@@$$@@@@$$$@@$@@@@@@@$@",
17"+#@#########@@#$$@@@$$$$$@@$$$@@$$@@$$@@$@@$@@$$$@",
18"+#@###@%@###@@#$$$@@@@$$$@@$$$$$$$@@$$@@@$$$@@$$$@",
19"+#@###%%%###@@#$$$$$@@@$$@@$$$$@@@@@$$@@$$$$@@$$$@",
20"+#@###@%@###@@#$$$$$$@@$$@@$$$@@$$@@$$@@$$$$@@$$$@",
21"+#@#########@@#$$@@$$@@$$@@$$$@@$$@@$$@@$$$$@@$$$@",
22"+#@@########@@#$$$@@@@$$$$@@@$$@@@$@@$@@$$$$$@@@$@",
23"+##@@######@@@#$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$@",
24"+###@@####@@@##$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$@",
25"+####@@@@@@@###$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$@",
26"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"};