Skip to content

Commit

Permalink
don't link to fityk-announce
Browse files Browse the repository at this point in the history
  • Loading branch information
wojdyr committed Sep 18, 2021
1 parent edc127b commit ff01eb2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 12 deletions.
2 changes: 0 additions & 2 deletions doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,6 @@ The author is grateful to all people who supported Fityk with subscriptions.

Version 1.3.1 was released on 2016-12-19
(`changelog <https://github.com/wojdyr/fityk/raw/master/NEWS>`_).
New version `notifications <http://fityk-announce.nieto.pl/>`_
are delivered via email and feeds.

.. |ico-win| image:: img/ico-win.png
.. |ico-tux| image:: img/ico-tux.png
Expand Down
18 changes: 8 additions & 10 deletions wxgui/frame.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -131,16 +131,16 @@ static const wxString website_url(
wxT("http://fityk.nieto.pl/"));
static const wxString wiki_url(
wxT("https://github.com/wojdyr/fityk/wiki"));
static const wxString feedback_url(
wxT("http://fityk.nieto.pl/feedback/") + pchar2wx(VERSION));
static const wxString issues_url(
wxT("http://github.com/wojdyr/fityk/issues"));

enum {
// menu
ID_H_MANUAL = 24001 ,
ID_H_WEBSITE ,
ID_H_WIKI ,
ID_H_DISCUSSIONS ,
ID_H_FEEDBACK ,
ID_H_ISSUES ,
ID_H_EXAMPLE1 ,
ID_H_EXAMPLE2 ,
ID_H_EXAMPLE3 ,
Expand Down Expand Up @@ -384,7 +384,7 @@ BEGIN_EVENT_TABLE(FFrame, wxFrame)
EVT_MENU (ID_H_WEBSITE, FFrame::OnOnline)
EVT_MENU (ID_H_WIKI, FFrame::OnOnline)
EVT_MENU (ID_H_DISCUSSIONS, FFrame::OnOnline)
EVT_MENU (ID_H_FEEDBACK, FFrame::OnOnline)
EVT_MENU (ID_H_ISSUES, FFrame::OnOnline)
EVT_MENU_RANGE (ID_H_EXAMPLE1, ID_H_EXAMPLE4, FFrame::OnExample)
EVT_MENU (wxID_ABOUT, FFrame::OnAbout)
EVT_MENU (wxID_EXIT, FFrame::OnQuit)
Expand Down Expand Up @@ -810,10 +810,8 @@ void FFrame::set_menubar()
wiki_url);
append_mi(help_menu, ID_H_DISCUSSIONS, GET_BMP(web16),
wxT("&Visit Discussions"), discussions_url);
/*
append_mi(help_menu, ID_H_FEEDBACK, GET_BMP(web16),
wxT("&Anonymous Feedback"), feedback_url);
*/
append_mi(help_menu, ID_H_ISSUES, GET_BMP(web16),
wxT("&Visit Issues"), issues_url);
wxMenu* help_menu_examples = new wxMenu;
help_menu_examples->Append(ID_H_EXAMPLE1, wxT("&Single Peak"),
wxT("nacl01.fit"));
Expand Down Expand Up @@ -912,8 +910,8 @@ void FFrame::OnOnline(wxCommandEvent& event)
url = &wiki_url;
else if (event.GetId() == ID_H_DISCUSSIONS)
url = &discussions_url;
else //if (event.GetId() == ID_H_FEEDBACK)
url = &feedback_url;
else //if (event.GetId() == ID_H_ISSUES)
url = &issues_url;
bool r = wxLaunchDefaultBrowser(*url);
if (!r)
wxMessageBox(wxT("Can not open URL in browser,")
Expand Down

0 comments on commit ff01eb2

Please sign in to comment.