diff options
author | Christi Scarborough <christi@coraline.org> | 2006-12-11 22:22:36 +0000 |
---|---|---|
committer | Christi Scarborough <christi@coraline.org> | 2006-12-11 22:22:36 +0000 |
commit | e6697099947df9206c79bc629516e31ede70c385 (patch) | |
tree | cab6123ede23d3fe6a44273d99145396c77569a9 | |
parent | 46eb5c6bcdbd25664501df47d7d798f3e63acd29 (diff) | |
download | rockbox-e6697099947df9206c79bc629516e31ede70c385.tar.gz rockbox-e6697099947df9206c79bc629516e31ede70c385.zip |
Right. Fixed line feeds. archos.ico is binary. Added a couple more files rockbox leaves in the root to the list.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11727 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | rbutil/archos.ico | bin | 0 -> 21606 bytes | |||
-rw-r--r-- | rbutil/copying.txt | 2 | ||||
-rw-r--r-- | rbutil/rbutil.cbp | 19 | ||||
-rw-r--r-- | rbutil/rbutil.cpp | 5 | ||||
-rw-r--r-- | rbutil/rbutilApp.h | 2 | ||||
-rw-r--r-- | rbutil/wizard_pages.h | 12 |
6 files changed, 25 insertions, 15 deletions
diff --git a/rbutil/archos.ico b/rbutil/archos.ico new file mode 100644 index 0000000000..6c2171337e --- /dev/null +++ b/rbutil/archos.ico | |||
Binary files differ | |||
diff --git a/rbutil/copying.txt b/rbutil/copying.txt index 8957c246ca..d57cce3cfb 100644 --- a/rbutil/copying.txt +++ b/rbutil/copying.txt | |||
@@ -367,4 +367,4 @@ This General Public License does not permit incorporating your program into | |||
367 | proprietary programs. If your program is a subroutine library, you may | 367 | proprietary programs. If your program is a subroutine library, you may |
368 | consider it more useful to permit linking proprietary applications with the | 368 | consider it more useful to permit linking proprietary applications with the |
369 | library. If this is what you want to do, use the GNU Library General | 369 | library. If this is what you want to do, use the GNU Library General |
370 | Public License instead of this License. \ No newline at end of file | 370 | Public License instead of this License. |
diff --git a/rbutil/rbutil.cbp b/rbutil/rbutil.cbp index 9c4e6de22e..ae6fc4a15a 100644 --- a/rbutil/rbutil.cbp +++ b/rbutil/rbutil.cbp | |||
@@ -76,6 +76,7 @@ | |||
76 | <Option compilerVar="CPP" /> | 76 | <Option compilerVar="CPP" /> |
77 | <Option compile="0" /> | 77 | <Option compile="0" /> |
78 | <Option link="0" /> | 78 | <Option link="0" /> |
79 | <Option target="default" /> | ||
79 | </Unit> | 80 | </Unit> |
80 | <Unit filename="fonts_3d.xpm"> | 81 | <Unit filename="fonts_3d.xpm"> |
81 | <Option compilerVar="CPP" /> | 82 | <Option compilerVar="CPP" /> |
@@ -104,12 +105,6 @@ | |||
104 | <Option compilerVar="CPP" /> | 105 | <Option compilerVar="CPP" /> |
105 | <Option target="default" /> | 106 | <Option target="default" /> |
106 | </Unit> | 107 | </Unit> |
107 | <Unit filename="rbutil.exe.Manifest"> | ||
108 | <Option compilerVar="CPP" /> | ||
109 | <Option compile="0" /> | ||
110 | <Option link="0" /> | ||
111 | <Option target="default" /> | ||
112 | </Unit> | ||
113 | <Unit filename="rbutil.h"> | 108 | <Unit filename="rbutil.h"> |
114 | <Option compilerVar="CPP" /> | 109 | <Option compilerVar="CPP" /> |
115 | <Option compile="0" /> | 110 | <Option compile="0" /> |
@@ -154,6 +149,12 @@ | |||
154 | <Option link="0" /> | 149 | <Option link="0" /> |
155 | <Option target="default" /> | 150 | <Option target="default" /> |
156 | </Unit> | 151 | </Unit> |
152 | <Unit filename="tools2_3d.xpm"> | ||
153 | <Option compilerVar="CPP" /> | ||
154 | <Option compile="0" /> | ||
155 | <Option link="0" /> | ||
156 | <Option target="default" /> | ||
157 | </Unit> | ||
157 | <Unit filename="uninstall_3d.xpm"> | 158 | <Unit filename="uninstall_3d.xpm"> |
158 | <Option compilerVar="CPP" /> | 159 | <Option compilerVar="CPP" /> |
159 | <Option compile="0" /> | 160 | <Option compile="0" /> |
@@ -176,6 +177,12 @@ | |||
176 | <Option link="0" /> | 177 | <Option link="0" /> |
177 | <Option target="default" /> | 178 | <Option target="default" /> |
178 | </Unit> | 179 | </Unit> |
180 | <Unit filename="wx_pch.h"> | ||
181 | <Option compilerVar="CPP" /> | ||
182 | <Option compile="0" /> | ||
183 | <Option link="0" /> | ||
184 | <Option target="default" /> | ||
185 | </Unit> | ||
179 | <Extensions /> | 186 | <Extensions /> |
180 | </Project> | 187 | </Project> |
181 | </CodeBlocks_project_file> \ No newline at end of file | 188 | </CodeBlocks_project_file> \ No newline at end of file |
diff --git a/rbutil/rbutil.cpp b/rbutil/rbutil.cpp index 8abd362a81..7591408022 100644 --- a/rbutil/rbutil.cpp +++ b/rbutil/rbutil.cpp | |||
@@ -36,7 +36,10 @@ wxDEFINE_SCOPED_PTR_TYPE(wxZipEntry); | |||
36 | const wxChar* _rootmatch[] = { | 36 | const wxChar* _rootmatch[] = { |
37 | wxT("rockbox.*"), | 37 | wxT("rockbox.*"), |
38 | wxT("ajbrec.ajz"), | 38 | wxT("ajbrec.ajz"), |
39 | wxT("archos.mod") | 39 | wxT("archos.mod"), |
40 | wxT(".scrobbler.*"), | ||
41 | wxT("battery_bench.txt"), | ||
42 | wxT("battery.dummy"), | ||
40 | }; | 43 | }; |
41 | const wxArrayString* rootmatch = new wxArrayString( | 44 | const wxArrayString* rootmatch = new wxArrayString( |
42 | (size_t) (sizeof(_rootmatch) / sizeof(wxChar*)), _rootmatch); | 45 | (size_t) (sizeof(_rootmatch) / sizeof(wxChar*)), _rootmatch); |
diff --git a/rbutil/rbutilApp.h b/rbutil/rbutilApp.h index 18b3e0c737..bac6dc2c32 100644 --- a/rbutil/rbutilApp.h +++ b/rbutil/rbutilApp.h | |||
@@ -38,4 +38,4 @@ public: | |||
38 | 38 | ||
39 | }; | 39 | }; |
40 | 40 | ||
41 | 41 | ||
diff --git a/rbutil/wizard_pages.h b/rbutil/wizard_pages.h index 982ff1e65e..6fa6b88034 100644 --- a/rbutil/wizard_pages.h +++ b/rbutil/wizard_pages.h | |||
@@ -8,7 +8,7 @@ class wxPlatformPage : public wxWizardPageSimple | |||
8 | public: | 8 | public: |
9 | wxPlatformPage(wxWizard *parent); | 9 | wxPlatformPage(wxWizard *parent); |
10 | virtual bool TransferDataFromWindow(void); | 10 | virtual bool TransferDataFromWindow(void); |
11 | 11 | ||
12 | public: | 12 | public: |
13 | wxListBox* PlatformListBox; | 13 | wxListBox* PlatformListBox; |
14 | }; | 14 | }; |
@@ -17,17 +17,17 @@ class wxLocationPage : public wxWizardPageSimple | |||
17 | { | 17 | { |
18 | private: | 18 | private: |
19 | DECLARE_EVENT_TABLE() | 19 | DECLARE_EVENT_TABLE() |
20 | 20 | ||
21 | public: | 21 | public: |
22 | enum { | 22 | enum { |
23 | ID_LOCATION_BTN = 1000, | 23 | ID_LOCATION_BTN = 1000, |
24 | }; | 24 | }; |
25 | 25 | ||
26 | public: | 26 | public: |
27 | wxLocationPage(wxWizard* parent); | 27 | wxLocationPage(wxWizard* parent); |
28 | virtual bool TransferDataFromWindow(void); | 28 | virtual bool TransferDataFromWindow(void); |
29 | void OnLocationBtn(wxCommandEvent& event); | 29 | void OnLocationBtn(wxCommandEvent& event); |
30 | 30 | ||
31 | public: | 31 | public: |
32 | wxStaticText* LocationText; | 32 | wxStaticText* LocationText; |
33 | }; | 33 | }; |
@@ -47,7 +47,7 @@ public: | |||
47 | virtual bool TransferDataFromWindow(void); | 47 | virtual bool TransferDataFromWindow(void); |
48 | void OnBuildBox(wxCommandEvent& event); | 48 | void OnBuildBox(wxCommandEvent& event); |
49 | void OnPageShown(wxWizardEvent& event); | 49 | void OnPageShown(wxWizardEvent& event); |
50 | 50 | ||
51 | public: | 51 | public: |
52 | wxRadioBox* BuildRadioBox; | 52 | wxRadioBox* BuildRadioBox; |
53 | wxStaticText* DetailText; | 53 | wxStaticText* DetailText; |
@@ -59,7 +59,7 @@ class wxFullUninstallPage : public wxWizardPageSimple | |||
59 | public: | 59 | public: |
60 | wxFullUninstallPage(wxWizard *parent); | 60 | wxFullUninstallPage(wxWizard *parent); |
61 | virtual bool TransferDataFromWindow(void); | 61 | virtual bool TransferDataFromWindow(void); |
62 | 62 | ||
63 | public: | 63 | public: |
64 | wxCheckBox* FullCheckBox; | 64 | wxCheckBox* FullCheckBox; |
65 | }; | 65 | }; |