Skip to content

Commit 665c05a

Browse files
rgleasonrgleason
authored
Merge pull request #19 from seandepagnier/master
sean's recent canges
2 parents 808262f + 48a8f90 commit 665c05a

File tree

6 files changed

+451
-206
lines changed

6 files changed

+451
-206
lines changed

‎WeatherFax.fbp

Lines changed: 403 additions & 182 deletions
Large diffs are not rendered by default.

‎data/WeatherFaxInternetRetrieval.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@
469469
<Area Name="A" lat1="10S" lat2="70N" lon1="20W" lon2="160E" />
470470
</Region>
471471
</Server>
472-
<Server Name="German Weather DWD" Url="https://www.dwd.de/DWD/wetter/wv_spez/hobbymet/wetterkarten/">
472+
<Server Name="German Weather DWD" Url="http://www.dwd.de/DWD/wetter/wv_spez/hobbymet/wetterkarten/">
473473
<Region Name="European">
474474
<Map Url="bwk_bodendruck_na_ana.png" Contents="Surface Anlys(4mb)" Area="A" />
475475
<Map Url="ico_tkboden_na_024.png" Contents="24hr Forecast" Area="B" />

‎src/WeatherFax.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,11 @@ void WeatherFax::OnLeftUp( wxMouseEvent& event )
351351
{
352352
m_tDownTimer.Stop();
353353
}
354+
355+
void WeatherFax::OnDownTimer( wxTimerEvent & )
356+
{
357+
m_lFaxes->PopupMenu( m_menu4, m_downPos );
358+
}
354359
#endif
355360

356361
void WeatherFax::EnableDisplayControls(bool enable)
@@ -783,11 +788,6 @@ void WeatherFax::OnAbout( wxCommandEvent& event )
783788
dlg.ShowModal();
784789
}
785790

786-
void WeatherFax::OnDownTimer( wxTimerEvent & )
787-
{
788-
m_lFaxes->PopupMenu( m_menu4, m_downPos );
789-
}
790-
791791
bool WeatherFax::DownloadFile( wxString filename )
792792
{
793793
const wxString url = m_weatherfax_pi.m_UpdateDataBaseUrl + filename;

‎src/WeatherFax.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ class WeatherFax : public WeatherFaxBase
7878
#endif
7979
void OnLeftDown( wxMouseEvent& event );
8080
void OnLeftUp( wxMouseEvent& event );
81+
void OnDownTimer( wxTimerEvent & );
8182

8283
void OnClose( wxCloseEvent& event ) { Hide(); }
8384
void EnableDisplayControls(bool enable);
@@ -98,7 +99,6 @@ class WeatherFax : public WeatherFaxBase
9899
void OnInternet( wxCommandEvent& event );
99100
void OnUpdateData( wxCommandEvent& event );
100101
void OnAbout( wxCommandEvent& event );
101-
void OnDownTimer( wxTimerEvent & );
102102

103103
bool Show( bool show = true );
104104
void WizardFinished(WeatherFaxWizard *wizard);
@@ -125,8 +125,11 @@ class WeatherFax : public WeatherFaxBase
125125
wxTimer m_tDeleteAudioWizard, m_tDownTimer;
126126

127127
private:
128-
wxPoint m_downPos, m_startPos, m_startMouse;
129128
bool DownloadFile( wxString filename );
129+
130+
#ifdef __OCPN__ANDROID__
131+
wxPoint m_downPos, m_startPos, m_startMouse;
132+
#endif
130133
};
131134

132135
class FaxDecoder;

‎src/WeatherFaxUI.cpp

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
///////////////////////////////////////////////////////////////////////////
2-
// C++ code generated with wxFormBuilder (version Apr 1 2019)
2+
// C++ code generated with wxFormBuilder (version Mar 28 2019)
33
// http://www.wxformbuilder.org/
44
//
55
// PLEASE DO *NOT* EDIT THIS FILE!
@@ -743,6 +743,26 @@ InternetRetrievalDialogBase::InternetRetrievalDialogBase( wxWindow* parent, wxWi
743743
wxStaticBoxSizer* sbSizer121;
744744
sbSizer121 = new wxStaticBoxSizer( new wxStaticBox( m_panel8, wxID_ANY, _("Regions") ), wxVERTICAL );
745745

746+
wxFlexGridSizer* fgSizer69;
747+
fgSizer69 = new wxFlexGridSizer( 0, 1, 0, 0 );
748+
fgSizer69->AddGrowableCol( 0 );
749+
fgSizer69->AddGrowableRow( 0 );
750+
fgSizer69->SetFlexibleDirection( wxBOTH );
751+
fgSizer69->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
752+
753+
wxFlexGridSizer* fgSizer281;
754+
fgSizer281 = new wxFlexGridSizer( 0, 1, 0, 0 );
755+
fgSizer281->AddGrowableCol( 0 );
756+
fgSizer281->AddGrowableRow( 0 );
757+
fgSizer281->SetFlexibleDirection( wxBOTH );
758+
fgSizer281->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
759+
760+
fgSizer281->SetMinSize( wxSize( -1,0 ) );
761+
m_lRegions = new wxListBox( sbSizer121->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), 0, NULL, wxLB_EXTENDED );
762+
m_lRegions->SetMinSize( wxSize( -1,0 ) );
763+
764+
fgSizer281->Add( m_lRegions, 0, wxALL|wxEXPAND, 5 );
765+
746766
wxFlexGridSizer* fgSizer291;
747767
fgSizer291 = new wxFlexGridSizer( 0, 2, 0, 0 );
748768
fgSizer291->SetFlexibleDirection( wxBOTH );
@@ -755,20 +775,18 @@ InternetRetrievalDialogBase::InternetRetrievalDialogBase( wxWindow* parent, wxWi
755775
fgSizer291->Add( m_bNoRegions, 0, wxALL, 5 );
756776

757777

758-
sbSizer121->Add( fgSizer291, 1, 0, 5 );
778+
fgSizer281->Add( fgSizer291, 1, 0, 5 );
759779

760-
wxFlexGridSizer* fgSizer281;
761-
fgSizer281 = new wxFlexGridSizer( 0, 1, 0, 0 );
762-
fgSizer281->AddGrowableCol( 0 );
763-
fgSizer281->AddGrowableRow( 0 );
764-
fgSizer281->SetFlexibleDirection( wxBOTH );
765-
fgSizer281->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
766780

767-
m_lRegions = new wxListBox( sbSizer121->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), 0, NULL, wxLB_EXTENDED );
768-
fgSizer281->Add( m_lRegions, 0, wxALL|wxEXPAND, 5 );
781+
fgSizer69->Add( fgSizer281, 2, wxEXPAND, 5 );
769782

783+
m_bClose = new wxButton( sbSizer121->GetStaticBox(), wxID_ANY, _("Close"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
784+
m_bClose->SetMinSize( wxSize( -1,30 ) );
770785

771-
sbSizer121->Add( fgSizer281, 2, wxEXPAND, 5 );
786+
fgSizer69->Add( m_bClose, 0, wxALIGN_RIGHT|wxALL, 5 );
787+
788+
789+
sbSizer121->Add( fgSizer69, 1, wxEXPAND, 5 );
772790

773791

774792
fgSizer42->Add( sbSizer121, 1, wxEXPAND, 5 );
@@ -803,9 +821,10 @@ InternetRetrievalDialogBase::InternetRetrievalDialogBase( wxWindow* parent, wxWi
803821
m_bAllServers->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( InternetRetrievalDialogBase::OnAllServers ), NULL, this );
804822
m_bNoServers->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( InternetRetrievalDialogBase::OnNoServers ), NULL, this );
805823
m_lServers->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( InternetRetrievalDialogBase::OnFilterServers ), NULL, this );
824+
m_lRegions->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( InternetRetrievalDialogBase::OnFilterRegions ), NULL, this );
806825
m_bAllRegions->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( InternetRetrievalDialogBase::OnAllRegions ), NULL, this );
807826
m_bNoRegions->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( InternetRetrievalDialogBase::OnNoRegions ), NULL, this );
808-
m_lRegions->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( InternetRetrievalDialogBase::OnFilterRegions ), NULL, this );
827+
m_bClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( InternetRetrievalDialogBase::OnClose ), NULL, this );
809828
}
810829

811830
InternetRetrievalDialogBase::~InternetRetrievalDialogBase()
@@ -826,9 +845,10 @@ InternetRetrievalDialogBase::~InternetRetrievalDialogBase()
826845
m_bAllServers->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( InternetRetrievalDialogBase::OnAllServers ), NULL, this );
827846
m_bNoServers->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( InternetRetrievalDialogBase::OnNoServers ), NULL, this );
828847
m_lServers->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( InternetRetrievalDialogBase::OnFilterServers ), NULL, this );
848+
m_lRegions->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( InternetRetrievalDialogBase::OnFilterRegions ), NULL, this );
829849
m_bAllRegions->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( InternetRetrievalDialogBase::OnAllRegions ), NULL, this );
830850
m_bNoRegions->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( InternetRetrievalDialogBase::OnNoRegions ), NULL, this );
831-
m_lRegions->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( InternetRetrievalDialogBase::OnFilterRegions ), NULL, this );
851+
m_bClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( InternetRetrievalDialogBase::OnClose ), NULL, this );
832852

833853
}
834854

‎src/WeatherFaxUI.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
///////////////////////////////////////////////////////////////////////////
2-
// C++ code generated with wxFormBuilder (version Apr 1 2019)
2+
// C++ code generated with wxFormBuilder (version Mar 28 2019)
33
// http://www.wxformbuilder.org/
44
//
55
// PLEASE DO *NOT* EDIT THIS FILE!
@@ -207,9 +207,10 @@ class InternetRetrievalDialogBase : public wxDialog
207207
wxButton* m_bAllServers;
208208
wxButton* m_bNoServers;
209209
wxListBox* m_lServers;
210+
wxListBox* m_lRegions;
210211
wxButton* m_bAllRegions;
211212
wxButton* m_bNoRegions;
212-
wxListBox* m_lRegions;
213+
wxButton* m_bClose;
213214

214215
// Virtual event handlers, overide them in your derived class
215216
virtual void OnRetrieve( wxMouseEvent& event ) { event.Skip(); }
@@ -224,9 +225,9 @@ class InternetRetrievalDialogBase : public wxDialog
224225
virtual void OnAllServers( wxCommandEvent& event ) { event.Skip(); }
225226
virtual void OnNoServers( wxCommandEvent& event ) { event.Skip(); }
226227
virtual void OnFilterServers( wxCommandEvent& event ) { event.Skip(); }
228+
virtual void OnFilterRegions( wxCommandEvent& event ) { event.Skip(); }
227229
virtual void OnAllRegions( wxCommandEvent& event ) { event.Skip(); }
228230
virtual void OnNoRegions( wxCommandEvent& event ) { event.Skip(); }
229-
virtual void OnFilterRegions( wxCommandEvent& event ) { event.Skip(); }
230231

231232

232233
public:

0 commit comments

Comments
 (0)