len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-08 12:45:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

rbutil: make autodetection silent on startup.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13703 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Wenger 2007-06-24 20:32:28 +00:00
parent 9d0e4e102b
commit a92fc620f0
3 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rbutil/rbutil.cbp
View file

@ -18,6 +18,7 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option projectResourceIncludeDirsRelation="0" /> <Option projectResourceIncludeDirsRelation="0" />
<ExtraCommands> <ExtraCommands>
<Add before="cmd /c cd icons &amp;&amp; bin2c.exe *.png" />
<Add after="upx --best --compress-icons=0 rbutil.exe" /> <Add after="upx --best --compress-icons=0 rbutil.exe" />
</ExtraCommands> </ExtraCommands>
<MakeCommands> <MakeCommands>
@ -91,9 +92,6 @@
<Add directory="$(#WX.lib)" /> <Add directory="$(#WX.lib)" />
<Add directory=".\" /> <Add directory=".\" />
</Linker> </Linker>
<ExtraCommands>
<Add before="cmd /c cd icons &amp;&amp; bin2c.exe *.png" />
</ExtraCommands>
<Unit filename="Makefile" /> <Unit filename="Makefile" />
<Unit filename="archos.ico" /> <Unit filename="archos.ico" />
<Unit filename="autodetection.cpp" /> <Unit filename="autodetection.cpp" />

16
rbutil/rbutilCtrls.cpp
View file

@ -433,11 +433,15 @@ void DeviceSelectorCtrl::OnComboBox(wxCommandEvent& event)
void DeviceSelectorCtrl::OnAutoDetect(wxCommandEvent& event) void DeviceSelectorCtrl::OnAutoDetect(wxCommandEvent& event)
{ {
AutoDetect(); if(!AutoDetect())
{
WARN_DIALOG(wxT("No Device detected. If you have a Device connected, select the correct one manually."),
wxT("Detecting a Device"));
}
} }
void DeviceSelectorCtrl::AutoDetect() bool DeviceSelectorCtrl::AutoDetect()
{ {
UsbDeviceInfo device; UsbDeviceInfo device;
@ -453,19 +457,19 @@ void DeviceSelectorCtrl::AutoDetect()
{ {
gv->curdestdir = device.path; gv->curdestdir = device.path;
} }
return true;
} }
else if(device.status == TOMANYDEVICES) else if(device.status == TOMANYDEVICES)
{ {
WARN_DIALOG(wxT("More then one device detected, please connect only One"), WARN_DIALOG(wxT("More then one device detected, please connect only One"),
wxT("Detecting a Device")); wxT("Detecting a Device"));
return; return true;
} }
} }
else else
{ {
WARN_DIALOG(wxT("No Device detected. If you have a Device connected, select the correct one manually."),
wxT("Detecting a Device")); return false;
return;
} }
} }

2
rbutil/rbutilCtrls.h
View file

@ -177,7 +177,7 @@ public:
wxString getDevice(); wxString getDevice();
void setDefault(); void setDefault();
void AutoDetect(); bool AutoDetect();
protected: protected:
wxString m_currentDevice; wxString m_currentDevice;