eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

link to docs from application Help menu (Ticket #90)

Browse source
This commit is contained in:
Volker Fischer 2020-05-02 08:24:01 +02:00
parent 9a6653525b
commit 51e1edfad5
6 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -10,13 +10,13 @@
* added bassoon instrument icon, created by dszgit (Ticket #131) * added bassoon instrument icon, created by dszgit (Ticket #131)
* link to docs from application Help menu (Ticket #90)
* bug fix: for mono capture jack audio interface Jamulus complains it cannot make connections (Ticket #137) * bug fix: for mono capture jack audio interface Jamulus complains it cannot make connections (Ticket #137)
TODO implement panning for channels (Ticket #52, #145) TODO implement panning for channels (Ticket #52, #145)
TODO improve help menu, see https://github.com/corrados/jamulus/issues/90
TODO support internationalization TODO support internationalization
TODO standard style: meter bar gets smaller sometimes if board is full and fader text is short TODO standard style: meter bar gets smaller sometimes if board is full and fader text is short

2
src/clientdlg.cpp
View file

@ -283,7 +283,7 @@ CClientDlg::CClientDlg ( CClient* pNCliP,
pMenu = new QMenuBar ( this ); pMenu = new QMenuBar ( this );
pMenu->addMenu ( pViewMenu ); pMenu->addMenu ( pViewMenu );
pMenu->addMenu ( new CHelpMenu ( this ) ); pMenu->addMenu ( new CHelpMenu ( true, this ) );
// Now tell the layout about the menu // Now tell the layout about the menu
layout()->setMenuBar ( pMenu ); layout()->setMenuBar ( pMenu );

6
src/global.h
View file

@ -105,8 +105,10 @@ LED bar: lbr
#define DEFAULT_SERVER_ADDRESS "jamulus.fischvolk.de" #define DEFAULT_SERVER_ADDRESS "jamulus.fischvolk.de"
#define DEFAULT_SERVER_NAME "Central Server" #define DEFAULT_SERVER_NAME "Central Server"
// download URL // getting started and software manual URL
#define SOFTWARE_DOWNLOAD_URL "http://sourceforge.net/projects/llcon/files" #define CLIENT_GETTING_STARTED_URL "https://github.com/corrados/jamulus/wiki/Software-Manual"
#define SERVER_GETTING_STARTED_URL "https://github.com/corrados/jamulus/wiki/Running-a-Server"
#define SOFTWARE_MANUAL_URL "https://github.com/corrados/jamulus/blob/master/src/res/homepage/manual.md"
// determining server internal address uses well-known host and port // determining server internal address uses well-known host and port
// (Google DNS, or something else reliable) // (Google DNS, or something else reliable)

2
src/serverdlg.cpp
View file

@ -283,7 +283,7 @@ lvwClients->setMinimumHeight ( 140 );
pMenu = new QMenuBar ( this ); pMenu = new QMenuBar ( this );
pMenu->addMenu ( pViewMenu ); pMenu->addMenu ( pViewMenu );
pMenu->addMenu ( new CHelpMenu ( this ) ); pMenu->addMenu ( new CHelpMenu ( false, this ) );
// Now tell the layout about the menu // Now tell the layout about the menu
layout()->setMenuBar ( pMenu ); layout()->setMenuBar ( pMenu );

18
src/util.cpp
View file

@ -806,16 +806,20 @@ void CMusProfDlg::OnSkillActivated ( int iCntryListItem )
// Help menu ------------------------------------------------------------------- // Help menu -------------------------------------------------------------------
CHelpMenu::CHelpMenu ( QWidget* parent ) : QMenu ( "&?", parent ) CHelpMenu::CHelpMenu ( const bool bIsClient, QWidget* parent ) : QMenu ( "&Help", parent )
{ {
// standard help menu consists of about and what's this help // standard help menu consists of about and what's this help
addAction ( tr ( "What's &This" ), this, if ( bIsClient )
SLOT ( OnHelpWhatsThis() ), QKeySequence ( Qt::SHIFT + Qt::Key_F1 ) ); {
addAction ( tr ( "Getting &Started..." ), this, SLOT ( OnHelpClientGetStarted() ) );
addAction ( tr ( "Software &Manual..." ), this, SLOT ( OnHelpSoftwareMan() ) );
}
else
{
addAction ( tr ( "Getting &Started..." ), this, SLOT ( OnHelpServerGetStarted() ) );
}
addSeparator(); addSeparator();
addAction ( tr ( "&Download Link..." ), this, addAction ( tr ( "What's &This" ), this, SLOT ( OnHelpWhatsThis() ), QKeySequence ( Qt::SHIFT + Qt::Key_F1 ) );
SLOT ( OnHelpDownloadLink() ) );
addSeparator(); addSeparator();
addAction ( tr ( "&About..." ), this, SLOT ( OnHelpAbout() ) ); addAction ( tr ( "&About..." ), this, SLOT ( OnHelpAbout() ) );
} }

11
src/util.h
View file

@ -473,16 +473,17 @@ class CHelpMenu : public QMenu
Q_OBJECT Q_OBJECT
public: public:
CHelpMenu ( QWidget* parent = nullptr ); CHelpMenu ( const bool bIsClient, QWidget* parent = nullptr );
protected: protected:
CAboutDlg AboutDlg; CAboutDlg AboutDlg;
public slots: public slots:
void OnHelpWhatsThis() { QWhatsThis::enterWhatsThisMode(); } void OnHelpWhatsThis() { QWhatsThis::enterWhatsThisMode(); }
void OnHelpAbout() { AboutDlg.exec(); } void OnHelpAbout() { AboutDlg.exec(); }
void OnHelpDownloadLink() void OnHelpClientGetStarted() { QDesktopServices::openUrl ( QUrl ( CLIENT_GETTING_STARTED_URL ) ); }
{ QDesktopServices::openUrl ( QUrl ( SOFTWARE_DOWNLOAD_URL ) ); } void OnHelpServerGetStarted() { QDesktopServices::openUrl ( QUrl ( SERVER_GETTING_STARTED_URL ) ); }
void OnHelpSoftwareMan() { QDesktopServices::openUrl ( QUrl ( SOFTWARE_MANUAL_URL ) ); }
}; };