Mercurial > octave
changeset 22588:e22906126af5
maint: merge stable to default.
author | Kai T. Ohlhus <k.ohlhus@gmail.com> |
---|---|
date | Tue, 04 Oct 2016 22:52:25 +0200 |
parents | d0e972e74851 (current diff) 752661b4725e (diff) |
children | 0614fb6fef67 |
files | |
diffstat | 3 files changed, 0 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/main-window.cc Tue Oct 04 18:56:29 2016 +0100 +++ b/libgui/src/main-window.cc Tue Oct 04 22:52:25 2016 +0200 @@ -630,12 +630,6 @@ } void -main_window::open_agora_page (void) -{ - QDesktopServices::openUrl (QUrl ("http://agora.octave.org")); -} - -void main_window::open_contribute_page (void) { QDesktopServices::openUrl (QUrl ("http://octave.org/contribute.html")); @@ -2007,9 +2001,6 @@ _octave_packages_action = add_action (help_menu, QIcon (), tr ("Octave Packages"), SLOT (open_octave_packages_page ())); - _agora_action = add_action (help_menu, QIcon (), - tr ("Share Code"), SLOT (open_agora_page ())); - _contribute_action = add_action (help_menu, QIcon (), tr ("Contribute"), SLOT (open_contribute_page ())); @@ -2280,7 +2271,6 @@ shortcut_manager::set_shortcut (_online_doc_action, "main_help:online_doc"); shortcut_manager::set_shortcut (_report_bug_action, "main_help:report_bug"); shortcut_manager::set_shortcut (_octave_packages_action, "main_help:packages"); - shortcut_manager::set_shortcut (_agora_action, "main_help:agora"); shortcut_manager::set_shortcut (_contribute_action, "main_help:contribute"); shortcut_manager::set_shortcut (_developer_action, "main_help:developer"); shortcut_manager::set_shortcut (_about_octave_action, "main_help:about"); @@ -2337,7 +2327,6 @@ _online_doc_action->setShortcut (no_key); _report_bug_action->setShortcut (no_key); _octave_packages_action->setShortcut (no_key); - _agora_action->setShortcut (no_key); _contribute_action->setShortcut (no_key); _developer_action->setShortcut (no_key); _about_octave_action->setShortcut (no_key); @@ -2400,4 +2389,3 @@ { _clipboard->clear (QClipboard::Clipboard); } -
--- a/libgui/src/main-window.h Tue Oct 04 18:56:29 2016 +0100 +++ b/libgui/src/main-window.h Tue Oct 04 22:52:25 2016 +0200 @@ -131,7 +131,6 @@ void display_community_news (const QString& news); void open_bug_tracker_page (void); void open_octave_packages_page (void); - void open_agora_page (void); void open_contribute_page (void); void open_donate_page (void); void process_settings_dialog_request (const QString& desired_tab @@ -362,7 +361,6 @@ QAction *_online_doc_action; QAction *_report_bug_action; QAction *_octave_packages_action; - QAction *_agora_action; QAction *_contribute_action; QAction *_developer_action; QAction *_about_octave_action; @@ -437,4 +435,3 @@ }; #endif -
--- a/libgui/src/shortcut-manager.cc Tue Oct 04 18:56:29 2016 +0100 +++ b/libgui/src/shortcut-manager.cc Tue Oct 04 22:52:25 2016 +0200 @@ -172,7 +172,6 @@ QKeySequence ()); init (tr ("Report Bug"), "main_help:report_bug", QKeySequence ()); init (tr ("Octave Packages"), "main_help:packages", QKeySequence ()); - init (tr ("Share Code"), "main_help:agora", QKeySequence ()); init (tr ("Contribute to Octave"), "main_help:contribute", QKeySequence ()); init (tr ("Octave Developer Resources"), "main_help:developer", QKeySequence ()); @@ -780,4 +779,3 @@ setText (QKeySequence(key).toString ()); } } -