diff options
author | Dominik Wenger <domonoky@googlemail.com> | 2007-06-24 20:16:40 +0000 |
---|---|---|
committer | Dominik Wenger <domonoky@googlemail.com> | 2007-06-24 20:16:40 +0000 |
commit | 9d0e4e102b082448e140e95a40c8f1b12714be48 (patch) | |
tree | d691af2c16209562512af3556dfd56bda44112af /rbutil | |
parent | e596a80e8d84d7b458f1629cb87030b27b5ccca4 (diff) | |
download | rockbox-9d0e4e102b082448e140e95a40c8f1b12714be48.tar.gz rockbox-9d0e4e102b082448e140e95a40c8f1b12714be48.zip |
rbutil: attempt autodetection at startup.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13702 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil')
-rw-r--r-- | rbutil/rbutilApp.cpp | 5 | ||||
-rw-r--r-- | rbutil/rbutilCtrls.cpp | 2 | ||||
-rw-r--r-- | rbutil/rbutilFrm.cpp | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/rbutil/rbutilApp.cpp b/rbutil/rbutilApp.cpp index 3bc5d59305..f3de467106 100644 --- a/rbutil/rbutilApp.cpp +++ b/rbutil/rbutilApp.cpp | |||
@@ -79,15 +79,14 @@ bool rbutilFrmApp::OnInit() | |||
79 | ReadUserConfig(); | 79 | ReadUserConfig(); |
80 | 80 | ||
81 | wxInitAllImageHandlers(); //init Image handlers | 81 | wxInitAllImageHandlers(); //init Image handlers |
82 | initIpodpatcher(); // reserve mem for ipodpatcher | ||
83 | initSansaPatcher(); // reserve mem for sansapatcher | ||
82 | 84 | ||
83 | rbutilFrm *myFrame = new rbutilFrm(NULL); | 85 | rbutilFrm *myFrame = new rbutilFrm(NULL); |
84 | SetTopWindow(myFrame); | 86 | SetTopWindow(myFrame); |
85 | 87 | ||
86 | myFrame->Show(TRUE); | 88 | myFrame->Show(TRUE); |
87 | 89 | ||
88 | initIpodpatcher(); // reserve mem for ipodpatcher | ||
89 | initSansaPatcher(); // reserve mem for sansapatcher | ||
90 | |||
91 | wxLogVerbose(wxT("=== end rbUtilFrmApp::OnInit()")); | 90 | wxLogVerbose(wxT("=== end rbUtilFrmApp::OnInit()")); |
92 | return TRUE; | 91 | return TRUE; |
93 | } | 92 | } |
diff --git a/rbutil/rbutilCtrls.cpp b/rbutil/rbutilCtrls.cpp index 441d046ca8..baa8bc8361 100644 --- a/rbutil/rbutilCtrls.cpp +++ b/rbutil/rbutilCtrls.cpp | |||
@@ -463,7 +463,7 @@ void DeviceSelectorCtrl::AutoDetect() | |||
463 | } | 463 | } |
464 | else | 464 | else |
465 | { | 465 | { |
466 | WARN_DIALOG(wxT("No Device detected. (This function only works if you have already installed rockbox or if you use a ipod or a sansa)."), | 466 | WARN_DIALOG(wxT("No Device detected. If you have a Device connected, select the correct one manually."), |
467 | wxT("Detecting a Device")); | 467 | wxT("Detecting a Device")); |
468 | return; | 468 | return; |
469 | } | 469 | } |
diff --git a/rbutil/rbutilFrm.cpp b/rbutil/rbutilFrm.cpp index 8654dd0706..9b4a19b887 100644 --- a/rbutil/rbutilFrm.cpp +++ b/rbutil/rbutilFrm.cpp | |||
@@ -76,9 +76,9 @@ rbutilFrm::~rbutilFrm() {} | |||
76 | 76 | ||
77 | void rbutilFrm::CreateGUIControls(void) | 77 | void rbutilFrm::CreateGUIControls(void) |
78 | { | 78 | { |
79 | wxLogVerbose(wxT("=== begin rbutilFrm::CreateGUIControls()")); | 79 | wxLogVerbose(wxT("=== begin rbutilFrm::CreateGUIControls()")); |
80 | 80 | ||
81 | wxBoxSizer* WxBoxSizer1 = new wxBoxSizer(wxVERTICAL); | 81 | wxBoxSizer* WxBoxSizer1 = new wxBoxSizer(wxVERTICAL); |
82 | this->SetSizer(WxBoxSizer1); | 82 | this->SetSizer(WxBoxSizer1); |
83 | this->SetAutoLayout(TRUE); | 83 | this->SetAutoLayout(TRUE); |
84 | 84 | ||
@@ -96,8 +96,10 @@ void rbutilFrm::CreateGUIControls(void) | |||
96 | 96 | ||
97 | myDeviceSelector = new DeviceSelectorCtrl(mainPanel,wxID_ANY); | 97 | myDeviceSelector = new DeviceSelectorCtrl(mainPanel,wxID_ANY); |
98 | myDeviceSelector->setDefault(); | 98 | myDeviceSelector->setDefault(); |
99 | myDeviceSelector->AutoDetect(); | ||
99 | WxBoxSizer0->Add(myDeviceSelector,0,wxGROW|wxALL,5); | 100 | WxBoxSizer0->Add(myDeviceSelector,0,wxGROW|wxALL,5); |
100 | 101 | ||
102 | |||
101 | wxNotebook* tabwindow = new wxNotebook(mainPanel,wxID_ANY); | 103 | wxNotebook* tabwindow = new wxNotebook(mainPanel,wxID_ANY); |
102 | WxBoxSizer0->Add(tabwindow,1,wxGROW|wxALL,5); | 104 | WxBoxSizer0->Add(tabwindow,1,wxGROW|wxALL,5); |
103 | 105 | ||