From ff9e4b1adf69c2037069212131b8788b007cf624 Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Fri, 30 Aug 2013 13:00:27 -0300 Subject: [PATCH] New help menu --- src/Gui/CommandStd.cpp | 113 ++- src/Gui/Icons/applications-python.svg | 142 ++++ src/Gui/Icons/internet-web-browser.svg | 982 +++++++++++++++++++++++++ src/Gui/Icons/resource.qrc | 2 + src/Gui/OnlineDocumentation.cpp | 9 +- src/Gui/Workbench.cpp | 11 +- 6 files changed, 1240 insertions(+), 19 deletions(-) create mode 100644 src/Gui/Icons/applications-python.svg create mode 100644 src/Gui/Icons/internet-web-browser.svg diff --git a/src/Gui/CommandStd.cpp b/src/Gui/CommandStd.cpp index 4bb0148a2..5ba4beddd 100644 --- a/src/Gui/CommandStd.cpp +++ b/src/Gui/CommandStd.cpp @@ -277,7 +277,7 @@ StdCmdWhatsThis::StdCmdWhatsThis() sToolTipText = QT_TR_NOOP("What's This"); sWhatsThis = "Std_WhatsThis"; sStatusTip = QT_TR_NOOP("What's This"); - sAccel = keySequenceToAccel(QKeySequence::WhatsThis); + sAccel = keySequenceToAccel(QKeySequence::WhatsThis); sPixmap = "WhatsThis"; eType = 0; } @@ -421,7 +421,7 @@ StdCmdOnlineHelp::StdCmdOnlineHelp() sWhatsThis = "Std_OnlineHelp"; sStatusTip = QT_TR_NOOP("Help"); sPixmap = "help-browser"; - sAccel = keySequenceToAccel(QKeySequence::HelpContents); + sAccel = keySequenceToAccel(QKeySequence::HelpContents); eType = 0; } @@ -449,9 +449,9 @@ StdCmdOnlineHelpWebsite::StdCmdOnlineHelpWebsite() void StdCmdOnlineHelpWebsite::activated(int iMsg) { - ParameterGrp::handle hURLGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/OnlineHelp"); - std::string url = hURLGrp->GetASCII("DownloadURL", "http://apps.sourceforge.net/mediawiki/free-cad/index.php?title=Online_Help_Toc"); - OpenURLInBrowser(url.c_str()); + ParameterGrp::handle hURLGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/OnlineHelp"); + std::string url = hURLGrp->GetASCII("DownloadURL", "http://www.freecadweb.org/wiki/index.php?title=Online_Help_Toc"); + OpenURLInBrowser(url.c_str()); } //=========================================================================== @@ -468,12 +468,105 @@ StdCmdFreeCADWebsite::StdCmdFreeCADWebsite() sToolTipText = QT_TR_NOOP("The FreeCAD website"); sWhatsThis = "Std_FreeCADWebsite"; sStatusTip = QT_TR_NOOP("FreeCAD Website"); + sPixmap = "internet-web-browser"; eType = 0; } void StdCmdFreeCADWebsite::activated(int iMsg) { - OpenURLInBrowser("http://apps.sourceforge.net/mediawiki/free-cad/index.php?title=Main_Page"); + OpenURLInBrowser("http://www.freecadweb.org"); +} + +//=========================================================================== +// Std_FreeCADUserHub +//=========================================================================== + +DEF_STD_CMD(StdCmdFreeCADUserHub); + +StdCmdFreeCADUserHub::StdCmdFreeCADUserHub() + :Command("Std_FreeCADUserHub") +{ + sGroup = QT_TR_NOOP("Help"); + sMenuText = QT_TR_NOOP("Users documentation"); + sToolTipText = QT_TR_NOOP("Documentation for users on the FreeCAD website"); + sWhatsThis = "Std_FreeCADUserHub"; + sStatusTip = QT_TR_NOOP("Users documentation"); + sPixmap = "internet-web-browser"; + eType = 0; +} + +void StdCmdFreeCADUserHub::activated(int iMsg) +{ + OpenURLInBrowser("http://www.freecadweb.org/wiki/index.php?title=User_hub"); +} + +//=========================================================================== +// Std_FreeCADPowerUserHub +//=========================================================================== + +DEF_STD_CMD(StdCmdFreeCADPowerUserHub); + +StdCmdFreeCADPowerUserHub::StdCmdFreeCADPowerUserHub() + :Command("Std_FreeCADPowerUserHub") +{ + sGroup = QT_TR_NOOP("Help"); + sMenuText = QT_TR_NOOP("Python scripting documentation"); + sToolTipText = QT_TR_NOOP("Python scripting documentation on the FreeCAD website"); + sWhatsThis = "Std_FreeCADPowerUserHub"; + sStatusTip = QT_TR_NOOP("PowerUsers documentation"); + sPixmap = "internet-web-browser"; + eType = 0; +} + +void StdCmdFreeCADPowerUserHub::activated(int iMsg) +{ + OpenURLInBrowser("http://www.freecadweb.org/wiki/index.php?title=Power_users_hub"); +} + +//=========================================================================== +// Std_FreeCADForum +//=========================================================================== + +DEF_STD_CMD(StdCmdFreeCADForum); + +StdCmdFreeCADForum::StdCmdFreeCADForum() + :Command("Std_FreeCADForum") +{ + sGroup = QT_TR_NOOP("Help"); + sMenuText = QT_TR_NOOP("FreeCAD Forum"); + sToolTipText = QT_TR_NOOP("The FreeCAD forum, where you can find help from other users"); + sWhatsThis = "Std_FreeCADForum"; + sStatusTip = QT_TR_NOOP("The FreeCAD Forum"); + sPixmap = "internet-web-browser"; + eType = 0; +} + +void StdCmdFreeCADForum::activated(int iMsg) +{ + OpenURLInBrowser("http://sourceforge.net/apps/phpbb/free-cad"); +} + +//=========================================================================== +// Std_FreeCADFAQ +//=========================================================================== + +DEF_STD_CMD(StdCmdFreeCADFAQ); + +StdCmdFreeCADFAQ::StdCmdFreeCADFAQ() + :Command("Std_FreeCADFAQ") +{ + sGroup = QT_TR_NOOP("Help"); + sMenuText = QT_TR_NOOP("FreeCAD FAQ"); + sToolTipText = QT_TR_NOOP("Frequently Asked Questions on the FreeCAD website"); + sWhatsThis = "Std_FreeCADFAQ"; + sStatusTip = QT_TR_NOOP("Frequently Asked Questions"); + sPixmap = "internet-web-browser"; + eType = 0; +} + +void StdCmdFreeCADFAQ::activated(int iMsg) +{ + OpenURLInBrowser("http://www.freecadweb.org/wiki/index.php?title=FAQ"); } //=========================================================================== @@ -490,13 +583,13 @@ StdCmdPythonWebsite::StdCmdPythonWebsite() sToolTipText = QT_TR_NOOP("The official Python website"); sWhatsThis = "Std_PythonWebsite"; sStatusTip = QT_TR_NOOP("Python Website"); - sPixmap = "python"; + sPixmap = "applications-python"; eType = 0; } void StdCmdPythonWebsite::activated(int iMsg) { - OpenURLInBrowser("http://python.org"); + OpenURLInBrowser("http://python.org"); } //=========================================================================== @@ -575,6 +668,10 @@ void CreateStdCommands(void) rcCmdMgr.addCommand(new StdCmdOnlineHelp()); rcCmdMgr.addCommand(new StdCmdOnlineHelpWebsite()); rcCmdMgr.addCommand(new StdCmdFreeCADWebsite()); + rcCmdMgr.addCommand(new StdCmdFreeCADUserHub()); + rcCmdMgr.addCommand(new StdCmdFreeCADPowerUserHub()); + rcCmdMgr.addCommand(new StdCmdFreeCADForum()); + rcCmdMgr.addCommand(new StdCmdFreeCADFAQ()); rcCmdMgr.addCommand(new StdCmdPythonWebsite()); //rcCmdMgr.addCommand(new StdCmdMeasurementSimple()); //rcCmdMgr.addCommand(new StdCmdDownloadOnlineHelp()); diff --git a/src/Gui/Icons/applications-python.svg b/src/Gui/Icons/applications-python.svg new file mode 100644 index 000000000..d782f8dde --- /dev/null +++ b/src/Gui/Icons/applications-python.svg @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/Gui/Icons/internet-web-browser.svg b/src/Gui/Icons/internet-web-browser.svg new file mode 100644 index 000000000..d2366a9dc --- /dev/null +++ b/src/Gui/Icons/internet-web-browser.svg @@ -0,0 +1,982 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Globe + + + Jakub Steiner + + + + + Tuomas Kuosmanen + + + + http://jimmac.musichall.cz + + + globe + international + web + www + internet + network + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Gui/Icons/resource.qrc b/src/Gui/Icons/resource.qrc index e27da77af..bb248ed5e 100644 --- a/src/Gui/Icons/resource.qrc +++ b/src/Gui/Icons/resource.qrc @@ -53,7 +53,9 @@ window-new.svg camera-photo.svg applications-accessories.svg + applications-python.svg accessories-text-editor.svg + internet-web-browser.svg view-unselectable.svg view-refresh.svg view-fullscreen.svg diff --git a/src/Gui/OnlineDocumentation.cpp b/src/Gui/OnlineDocumentation.cpp index 985b9c0d1..8f932b262 100644 --- a/src/Gui/OnlineDocumentation.cpp +++ b/src/Gui/OnlineDocumentation.cpp @@ -407,10 +407,11 @@ StdCmdPythonHelp::StdCmdPythonHelp() : Command("Std_PythonHelp"), server(0) { sGroup = QT_TR_NOOP("Tools"); - sMenuText = QT_TR_NOOP("Python Modules"); - sToolTipText = QT_TR_NOOP("Opens a browser to show the Python modules"); - sWhatsThis = QT_TR_NOOP("Opens a browser to show the Python modules"); - sStatusTip = QT_TR_NOOP("Opens a browser to show the Python modules"); + sMenuText = QT_TR_NOOP("Automatic python modules documentation"); + sToolTipText = QT_TR_NOOP("Opens a browser to show the Python modules documentation"); + sWhatsThis = QT_TR_NOOP("Opens a browser to show the Python modules documentation"); + sStatusTip = QT_TR_NOOP("Opens a browser to show the Python modules documentation"); + sPixmap = "applications-python"; } StdCmdPythonHelp::~StdCmdPythonHelp() diff --git a/src/Gui/Workbench.cpp b/src/Gui/Workbench.cpp index cffc7161c..13ee7d523 100644 --- a/src/Gui/Workbench.cpp +++ b/src/Gui/Workbench.cpp @@ -514,15 +514,12 @@ MenuItem* StdWorkbench::setupMenuBar() const sep->setCommand( "Separator" ); // Help - MenuItem* helpWebsites = new MenuItem; - helpWebsites->setCommand("&On-line help"); - *helpWebsites << "Std_OnlineHelpWebsite" << "Std_FreeCADWebsite" << "Std_PythonWebsite"; - MenuItem* help = new MenuItem( menuBar ); help->setCommand("&Help"); - *help << "Std_OnlineHelp" << "Std_PythonHelp" - << helpWebsites << "Separator" << "Std_About" - << "Std_AboutQt" << "Separator" << "Std_WhatsThis"; + *help << "Std_OnlineHelp" << "Std_FreeCADWebsite" + << "Std_FreeCADUserHub" << "Std_FreeCADPowerUserHub" + << "Std_PythonHelp" << "Std_FreeCADForum" + << "Std_FreeCADFAQ" << "Std_About" << "Std_WhatsThis"; return menuBar; }