summaryrefslogtreecommitdiffstats
path: root/rbutil
diff options
context:
space:
mode:
authorChristi Scarborough <christi@coraline.org>2006-12-11 22:22:36 +0000
committerChristi Scarborough <christi@coraline.org>2006-12-11 22:22:36 +0000
commite6697099947df9206c79bc629516e31ede70c385 (patch)
treecab6123ede23d3fe6a44273d99145396c77569a9 /rbutil
parent46eb5c6bcdbd25664501df47d7d798f3e63acd29 (diff)
downloadrockbox-e6697099947df9206c79bc629516e31ede70c385.tar.gz
rockbox-e6697099947df9206c79bc629516e31ede70c385.tar.bz2
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
Diffstat (limited to 'rbutil')
-rw-r--r--rbutil/archos.icobin0 -> 21606 bytes
-rw-r--r--rbutil/copying.txt2
-rw-r--r--rbutil/rbutil.cbp19
-rw-r--r--rbutil/rbutil.cpp5
-rw-r--r--rbutil/rbutilApp.h2
-rw-r--r--rbutil/wizard_pages.h12
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
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
-Public License instead of this License. \ No newline at end of file
+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 @@
<Option compilerVar="CPP" />
<Option compile="0" />
<Option link="0" />
+ <Option target="default" />
</Unit>
<Unit filename="fonts_3d.xpm">
<Option compilerVar="CPP" />
@@ -104,12 +105,6 @@
<Option compilerVar="CPP" />
<Option target="default" />
</Unit>
- <Unit filename="rbutil.exe.Manifest">
- <Option compilerVar="CPP" />
- <Option compile="0" />
- <Option link="0" />
- <Option target="default" />
- </Unit>
<Unit filename="rbutil.h">
<Option compilerVar="CPP" />
<Option compile="0" />
@@ -154,6 +149,12 @@
<Option link="0" />
<Option target="default" />
</Unit>
+ <Unit filename="tools2_3d.xpm">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="default" />
+ </Unit>
<Unit filename="uninstall_3d.xpm">
<Option compilerVar="CPP" />
<Option compile="0" />
@@ -176,6 +177,12 @@
<Option link="0" />
<Option target="default" />
</Unit>
+ <Unit filename="wx_pch.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="default" />
+ </Unit>
<Extensions />
</Project>
</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);
const wxChar* _rootmatch[] = {
wxT("rockbox.*"),
wxT("ajbrec.ajz"),
- wxT("archos.mod")
+ wxT("archos.mod"),
+ wxT(".scrobbler.*"),
+ wxT("battery_bench.txt"),
+ wxT("battery.dummy"),
};
const wxArrayString* rootmatch = new wxArrayString(
(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:
};
-
+
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
public:
wxPlatformPage(wxWizard *parent);
virtual bool TransferDataFromWindow(void);
-
+
public:
wxListBox* PlatformListBox;
};
@@ -17,17 +17,17 @@ class wxLocationPage : public wxWizardPageSimple
{
private:
DECLARE_EVENT_TABLE()
-
+
public:
enum {
ID_LOCATION_BTN = 1000,
};
-
+
public:
wxLocationPage(wxWizard* parent);
virtual bool TransferDataFromWindow(void);
void OnLocationBtn(wxCommandEvent& event);
-
+
public:
wxStaticText* LocationText;
};
@@ -47,7 +47,7 @@ public:
virtual bool TransferDataFromWindow(void);
void OnBuildBox(wxCommandEvent& event);
void OnPageShown(wxWizardEvent& event);
-
+
public:
wxRadioBox* BuildRadioBox;
wxStaticText* DetailText;
@@ -59,7 +59,7 @@ class wxFullUninstallPage : public wxWizardPageSimple
public:
wxFullUninstallPage(wxWizard *parent);
virtual bool TransferDataFromWindow(void);
-
+
public:
wxCheckBox* FullCheckBox;
};