vecsAudioSndCrdStereo;
diff --git a/src/util.cpp b/src/util.cpp
index d7d6bc7e..44ceb1fd 100755
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -348,16 +348,14 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
{
setupUi ( this );
- // set the text for the about dialog html text control
- txvCredits->setOpenExternalLinks ( true );
- txvCredits->setText (
- "" // general description of software
- "" + tr ( "The " ) + APP_NAME +
+ // general description of software
+ txvAbout->setText (
+ "
" + tr ( "The " ) + APP_NAME +
tr ( " software enables musicians to perform real-time jam sessions "
- "over the internet. There is a " ) + APP_NAME + tr ( " "
+ "over the internet." ) + "
" + tr ( "There is a " ) + APP_NAME + tr ( " "
"server which collects the audio data from each " ) +
APP_NAME + tr ( " client, mixes the audio data and sends the mix back "
- "to each client." ) + "
"
+ "to each client." ) + ""
"" // GPL header text
"This program is free software; you can redistribute it and/or modify "
"it under the terms of the GNU General Public License as published by "
@@ -370,27 +368,48 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
"License along with his program; if not, write to the Free Software "
"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 "
"USA"
- "
"
- "" + APP_NAME + // libraries used by this compilation
+ "
" );
+
+ // libraries used by this compilation
+ txvLibraries->setText ( APP_NAME +
tr ( " uses the following libraries, resources or code snippets:" ) +
- ""
- ""
- "We would like to acknowledge the contributors listed in the "
- "Github Contributors list"
- "
");
+ "
" + tr ( "Qt cross-platform application framework" ) +
+ ", http://www.qt.io
"
+ "Opus Interactive Audio Codec"
+ ", http://www.opus-codec.org
"
+ "" + tr ( "Audio reverberation code by Perry R. Cook and Gary P. Scavone" ) +
+ ", 1995 - 2004, "
+ "The Synthesis ToolKit in C++ (STK)
"
+ "" + tr ( "Some pixmaps are from the" ) + " Open Clip Art Library (OCAL), "
+ "http://openclipart.org
"
+ "" + tr ( "Country flag icons from Mark James" ) +
+ ", http://www.famfamfam.com
" );
+
+ // contributors list
+ txvContributors->setText (
+ "Peter L. Jones (pljones)
"
+ "Jonathan Baker-Bates (gilgongo)
"
+ "Daniele Masato (doloopuntil)
"
+ "Simon Tomlinson (sthenos)
"
+ "Marc jr. Landolt (braindef)
"
+ "Olivier Humbert (trebmuh)
"
+ "mirabilos (mirabilos)
"
+ "newlaurent62 (newlaurent62)
"
+ "Emlyn Bolton (emlynmac)
"
+ "Jos van den Oever (vandenoever)
"
+ "Tormod Volden (tormodvolden)
"
+ "Stanislas Michalak (stanislas-m)
"
+ "
" + tr ( "For details on the contributions check out the " ) +
+ "" + tr ( "Github Contributors list" ) + "." );
+
+ // translators
+ txvTranslation->setText (
+ "Spanish
"
+ "Daryl Hanlon (ignotus666)
"
+ "French
"
+ "Olivier Humbert (trebmuh)
"
+ "Portuguese
"
+ "Miguel de Matos (Snayler)
" );
// set version number in about dialog
lblVersion->setText ( GetVersionAndNameStr() );
@@ -406,7 +425,7 @@ QString CAboutDlg::GetVersionAndNameStr ( const bool bWithHtml )
// name, short description and GPL hint
if ( bWithHtml )
{
- strVersionText += "";
+ strVersionText += "";
}
else
{
@@ -424,24 +443,14 @@ QString CAboutDlg::GetVersionAndNameStr ( const bool bWithHtml )
strVersionText += "\n *** ";
}
- strVersionText += tr ( "Internet Jam Session Software" );
-
- if ( bWithHtml )
- {
- strVersionText += "
";
- }
- else
+ if ( !bWithHtml )
{
+ strVersionText += tr ( "Internet Jam Session Software" );
strVersionText += "\n *** ";
}
strVersionText += tr ( "Under the GNU General Public License (GPL)" );
- if ( bWithHtml )
- {
- strVersionText += "";
- }
-
return strVersionText;
}
@@ -462,9 +471,9 @@ CLicenceDlg::CLicenceDlg ( QWidget* parent ) : QDialog ( parent )
QVBoxLayout* pLayout = new QVBoxLayout ( this );
QHBoxLayout* pSubLayout = new QHBoxLayout;
QTextBrowser* txvLicence = new QTextBrowser ( this );
- QCheckBox* chbAgree = new QCheckBox ( "I &agree to the above licence terms", this );
- butAccept = new QPushButton ( "Accept", this );
- QPushButton* butDecline = new QPushButton ( "Decline", this );
+ QCheckBox* chbAgree = new QCheckBox ( tr ( "I &agree to the above licence terms" ), this );
+ butAccept = new QPushButton ( tr ( "Accept" ), this );
+ QPushButton* butDecline = new QPushButton ( tr ( "Decline" ), this );
pSubLayout->addStretch();
pSubLayout->addWidget ( chbAgree );
@@ -486,10 +495,10 @@ CLicenceDlg::CLicenceDlg ( QWidget* parent ) : QDialog ( parent )
"You agree that all data, sounds, or other works transmitted to this server "
"are owned and created by you or your licensors, and that you are making these "
"data, sounds or other works available via the following Creative Commons "
- "License (for more information on this license, see "
+ "License (for more information on this license, see " ) +
""
- "http://creativecommons.org/licenses/by-nc-sa/4.0):" ) + "" +
- "Attribution-NonCommercial-ShareAlike 4.0
" +
+ "http://creativecommons.org/licenses/by-nc-sa/4.0):"
+ "Attribution-NonCommercial-ShareAlike 4.0
"
"" + tr ( "You are free to:" ) +
"
"
"- " + tr ( "Share" ) + " - " +
@@ -539,22 +548,22 @@ CMusProfDlg::CMusProfDlg ( CClient* pNCliP,
- label with combo box for skill level
- OK button
*/
- setWindowTitle ( "Musician Profile" );
+ setWindowTitle ( tr ( "Musician Profile" ) );
setWindowIcon ( QIcon ( QString::fromUtf8 ( ":/png/main/res/fronticon.png" ) ) );
QVBoxLayout* pLayout = new QVBoxLayout ( this );
QHBoxLayout* pButSubLayout = new QHBoxLayout;
- QLabel* plblAlias = new QLabel ( "Alias/Name", this );
+ QLabel* plblAlias = new QLabel ( tr ( "Alias/Name" ), this );
pedtAlias = new QLineEdit ( this );
- QLabel* plblInstrument = new QLabel ( "Instrument", this );
+ QLabel* plblInstrument = new QLabel ( tr ( "Instrument" ), this );
pcbxInstrument = new QComboBox ( this );
- QLabel* plblCountry = new QLabel ( "Country", this );
+ QLabel* plblCountry = new QLabel ( tr ( "Country" ), this );
pcbxCountry = new QComboBox ( this );
- QLabel* plblCity = new QLabel ( "City", this );
+ QLabel* plblCity = new QLabel ( tr ( "City" ), this );
pedtCity = new QLineEdit ( this );
- QLabel* plblSkill = new QLabel ( "Skill", this );
+ QLabel* plblSkill = new QLabel ( tr ( "Skill" ), this );
pcbxSkill = new QComboBox ( this );
- QPushButton* butClose = new QPushButton ( "&Close", this );
+ QPushButton* butClose = new QPushButton ( tr ( "&Close" ), this );
QGridLayout* pGridLayout = new QGridLayout;
plblAlias->setSizePolicy ( QSizePolicy::Minimum, QSizePolicy::Expanding );
@@ -592,13 +601,31 @@ CMusProfDlg::CMusProfDlg ( CClient* pNCliP,
// add an entry for all known instruments
for ( int iCurInst = 0; iCurInst < CInstPictures::GetNumAvailableInst(); iCurInst++ )
{
- // create a combo box item with text and image
- pcbxInstrument->addItem (
- QIcon ( CInstPictures::GetResourceReference ( iCurInst ) ),
- CInstPictures::GetName ( iCurInst ),
- iCurInst );
+ // create a combo box item with text, image and background color
+ QColor InstrColor;
+
+ pcbxInstrument->addItem ( QIcon ( CInstPictures::GetResourceReference ( iCurInst ) ),
+ CInstPictures::GetName ( iCurInst ),
+ iCurInst );
+
+ switch ( CInstPictures::GetCategory ( iCurInst ) )
+ {
+ case CInstPictures::IC_OTHER_INSTRUMENT: InstrColor = QColor ( Qt::blue ); break;
+ case CInstPictures::IC_WIND_INSTRUMENT: InstrColor = QColor ( Qt::green ); break;
+ case CInstPictures::IC_STRING_INSTRUMENT: InstrColor = QColor ( Qt::red ); break;
+ case CInstPictures::IC_PLUCKING_INSTRUMENT: InstrColor = QColor ( Qt::cyan ); break;
+ case CInstPictures::IC_PERCUSSION_INSTRUMENT: InstrColor = QColor ( Qt::white ); break;
+ case CInstPictures::IC_KEYBOARD_INSTRUMENT: InstrColor = QColor ( Qt::yellow ); break;
+ case CInstPictures::IC_MULTIPLE_INSTRUMENT: InstrColor = QColor ( Qt::black ); break;
+ }
+
+ InstrColor.setAlpha ( 10 );
+ pcbxInstrument->setItemData ( iCurInst, InstrColor, Qt::BackgroundRole );
}
+ // sort the items in alphabetical order
+ pcbxInstrument->model()->sort ( 0 );
+
// Country flag icons combo box --------------------------------------------
// add an entry for all known country flags
@@ -609,8 +636,7 @@ CMusProfDlg::CMusProfDlg ( CClient* pNCliP,
if ( static_cast ( iCurCntry ) != QLocale::AnyCountry )
{
// get current country enum
- QLocale::Country eCountry =
- static_cast ( iCurCntry );
+ QLocale::Country eCountry = static_cast ( iCurCntry );
// try to load icon from resource file name
QIcon CurFlagIcon;
@@ -635,7 +661,7 @@ CMusProfDlg::CMusProfDlg ( CClient* pNCliP,
FlagNoneIcon.addFile ( ":/png/flags/res/flags/flagnone.png" );
pcbxCountry->insertItem ( 0,
FlagNoneIcon,
- "None",
+ tr ( "None" ),
static_cast ( QLocale::AnyCountry ) );
@@ -647,35 +673,35 @@ CMusProfDlg::CMusProfDlg ( CClient* pNCliP,
RGBCOL_G_SL_NOT_SET,
RGBCOL_B_SL_NOT_SET ) );
- pcbxSkill->addItem ( QIcon ( SLPixmap ), "None", SL_NOT_SET );
+ pcbxSkill->addItem ( QIcon ( SLPixmap ), tr ( "None" ), SL_NOT_SET );
SLPixmap.fill ( QColor::fromRgb ( RGBCOL_R_SL_BEGINNER,
RGBCOL_G_SL_BEGINNER,
RGBCOL_B_SL_BEGINNER ) );
- pcbxSkill->addItem ( QIcon ( SLPixmap ), "Beginner", SL_BEGINNER );
+ pcbxSkill->addItem ( QIcon ( SLPixmap ), tr ( "Beginner" ), SL_BEGINNER );
SLPixmap.fill ( QColor::fromRgb ( RGBCOL_R_SL_INTERMEDIATE,
RGBCOL_G_SL_INTERMEDIATE,
RGBCOL_B_SL_INTERMEDIATE ) );
- pcbxSkill->addItem ( QIcon ( SLPixmap ), "Intermediate", SL_INTERMEDIATE );
+ pcbxSkill->addItem ( QIcon ( SLPixmap ), tr ( "Intermediate" ), SL_INTERMEDIATE );
SLPixmap.fill ( QColor::fromRgb ( RGBCOL_R_SL_SL_PROFESSIONAL,
RGBCOL_G_SL_SL_PROFESSIONAL,
RGBCOL_B_SL_SL_PROFESSIONAL ) );
- pcbxSkill->addItem ( QIcon ( SLPixmap ), "Expert", SL_PROFESSIONAL );
+ pcbxSkill->addItem ( QIcon ( SLPixmap ), tr ( "Expert" ), SL_PROFESSIONAL );
// Add help text to controls -----------------------------------------------
// fader tag
- QString strFaderTag = tr ( "Musician Profile: Set your name "
- "or an alias here so that the other musicians you want to play with "
+ QString strFaderTag = "" + tr ( "Musician Profile" ) + ": " + tr (
+ "Set your name or an alias here so that the other musicians you want to play with "
"know who you are. Additionally you may set an instrument picture of "
"the instrument you play and a flag of the country you are living. "
"The city you live in and the skill level of playing your instrument "
- "may also be added.\n"
+ "may also be added." ) + "
" + tr (
"What you set here will appear at your fader on the mixer board when "
"you are connected to a " ) + APP_NAME + tr ( " server. This tag will "
"also show up at each client which is connected to the same server as "
@@ -806,16 +832,20 @@ void CMusProfDlg::OnSkillActivated ( int iCntryListItem )
// Help menu -------------------------------------------------------------------
-CHelpMenu::CHelpMenu ( QWidget* parent ) : QMenu ( "&?", parent )
+CHelpMenu::CHelpMenu ( const bool bIsClient, QWidget* parent ) : QMenu ( tr ( "&Help" ), parent )
{
// standard help menu consists of about and what's this help
- addAction ( tr ( "What's &This" ), this,
- SLOT ( OnHelpWhatsThis() ), QKeySequence ( Qt::SHIFT + Qt::Key_F1 ) );
-
+ if ( bIsClient )
+ {
+ addAction ( tr ( "Getting &Started..." ), this, SLOT ( OnHelpClientGetStarted() ) );
+ addAction ( tr ( "Software &Manual..." ), this, SLOT ( OnHelpSoftwareMan() ) );
+ }
+ else
+ {
+ addAction ( tr ( "Getting &Started..." ), this, SLOT ( OnHelpServerGetStarted() ) );
+ }
addSeparator();
- addAction ( tr ( "&Download Link..." ), this,
- SLOT ( OnHelpDownloadLink() ) );
-
+ addAction ( tr ( "What's &This" ), this, SLOT ( OnHelpWhatsThis() ), QKeySequence ( Qt::SHIFT + Qt::Key_F1 ) );
addSeparator();
addAction ( tr ( "&About..." ), this, SLOT ( OnHelpAbout() ) );
}
@@ -935,35 +965,41 @@ CVector& CInstPictures::GetTable()
// instrument picture data base initialization
// NOTE: Do not change the order of any instrument in the future!
// NOTE: The very first entry is the "not used" element per definition.
- vecDataBase.Add ( CInstPictProps ( "None", ":/png/instr/res/instruments/instrnone.png", IC_OTHER_INSTRUMENT ) ); // special first element
- vecDataBase.Add ( CInstPictProps ( "Drum Set", ":/png/instr/res/instruments/instrdrumset.png", IC_PERCUSSION_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "Djembe", ":/png/instr/res/instruments/instrdjembe.png", IC_PERCUSSION_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "Electric Guitar", ":/png/instr/res/instruments/instreguitar.png", IC_PLUCKING_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "Acoustic Guitar", ":/png/instr/res/instruments/instraguitar.png", IC_PLUCKING_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "Bass Guitar", ":/png/instr/res/instruments/instrbassguitar.png", IC_PLUCKING_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "Keyboard", ":/png/instr/res/instruments/instrkeyboard.png", IC_KEYBOARD_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "Synthesizer", ":/png/instr/res/instruments/instrsynthesizer.png", IC_KEYBOARD_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "Grand Piano", ":/png/instr/res/instruments/instrgrandpiano.png", IC_KEYBOARD_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "Accordion", ":/png/instr/res/instruments/instraccordeon.png", IC_KEYBOARD_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "Vocal", ":/png/instr/res/instruments/instrvocal.png", IC_OTHER_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "Microphone", ":/png/instr/res/instruments/instrmicrophone.png", IC_OTHER_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "Harmonica", ":/png/instr/res/instruments/instrharmonica.png", IC_WIND_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "Trumpet", ":/png/instr/res/instruments/instrtrumpet.png", IC_WIND_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "Trombone", ":/png/instr/res/instruments/instrtrombone.png", IC_WIND_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "French Horn", ":/png/instr/res/instruments/instrfrenchhorn.png", IC_WIND_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "Tuba", ":/png/instr/res/instruments/instrtuba.png", IC_WIND_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "Saxophone", ":/png/instr/res/instruments/instrsaxophone.png", IC_WIND_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "Clarinet", ":/png/instr/res/instruments/instrclarinet.png", IC_WIND_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "Flute", ":/png/instr/res/instruments/instrflute.png", IC_WIND_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "Violin", ":/png/instr/res/instruments/instrviolin.png", IC_STRING_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "Cello", ":/png/instr/res/instruments/instrcello.png", IC_STRING_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "Double Bass", ":/png/instr/res/instruments/instrdoublebass.png", IC_STRING_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "Recorder", ":/png/instr/res/instruments/instrrecorder.png", IC_OTHER_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "Streamer", ":/png/instr/res/instruments/instrstreamer.png", IC_OTHER_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "Listener", ":/png/instr/res/instruments/instrlistener.png", IC_OTHER_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "Guitar+Vocal", ":/png/instr/res/instruments/instrguitarvocal.png", IC_MULTIPLE_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "Keyboard+Vocal", ":/png/instr/res/instruments/instrkeyboardvocal.png", IC_MULTIPLE_INSTRUMENT ) );
- vecDataBase.Add ( CInstPictProps ( "Bodhran", ":/png/instr/res/instruments/bodhran.png", IC_PERCUSSION_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "None" ), ":/png/instr/res/instruments/instrnone.png", IC_OTHER_INSTRUMENT ) ); // special first element
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Drum Set" ), ":/png/instr/res/instruments/instrdrumset.png", IC_PERCUSSION_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Djembe" ), ":/png/instr/res/instruments/instrdjembe.png", IC_PERCUSSION_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Electric Guitar" ), ":/png/instr/res/instruments/instreguitar.png", IC_PLUCKING_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Acoustic Guitar" ), ":/png/instr/res/instruments/instraguitar.png", IC_PLUCKING_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Bass Guitar" ), ":/png/instr/res/instruments/instrbassguitar.png", IC_PLUCKING_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Keyboard" ), ":/png/instr/res/instruments/instrkeyboard.png", IC_KEYBOARD_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Synthesizer" ), ":/png/instr/res/instruments/instrsynthesizer.png", IC_KEYBOARD_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Grand Piano" ), ":/png/instr/res/instruments/instrgrandpiano.png", IC_KEYBOARD_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Accordion" ), ":/png/instr/res/instruments/instraccordeon.png", IC_KEYBOARD_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Vocal" ), ":/png/instr/res/instruments/instrvocal.png", IC_OTHER_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Microphone" ), ":/png/instr/res/instruments/instrmicrophone.png", IC_OTHER_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Harmonica" ), ":/png/instr/res/instruments/instrharmonica.png", IC_WIND_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Trumpet" ), ":/png/instr/res/instruments/instrtrumpet.png", IC_WIND_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Trombone" ), ":/png/instr/res/instruments/instrtrombone.png", IC_WIND_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "French Horn" ), ":/png/instr/res/instruments/instrfrenchhorn.png", IC_WIND_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Tuba" ), ":/png/instr/res/instruments/instrtuba.png", IC_WIND_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Saxophone" ), ":/png/instr/res/instruments/instrsaxophone.png", IC_WIND_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Clarinet" ), ":/png/instr/res/instruments/instrclarinet.png", IC_WIND_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Flute" ), ":/png/instr/res/instruments/instrflute.png", IC_WIND_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Violin" ), ":/png/instr/res/instruments/instrviolin.png", IC_STRING_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Cello" ), ":/png/instr/res/instruments/instrcello.png", IC_STRING_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Double Bass" ), ":/png/instr/res/instruments/instrdoublebass.png", IC_STRING_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Recorder" ), ":/png/instr/res/instruments/instrrecorder.png", IC_OTHER_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Streamer" ), ":/png/instr/res/instruments/instrstreamer.png", IC_OTHER_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Listener" ), ":/png/instr/res/instruments/instrlistener.png", IC_OTHER_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Guitar+Vocal" ), ":/png/instr/res/instruments/instrguitarvocal.png", IC_MULTIPLE_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Keyboard+Vocal" ), ":/png/instr/res/instruments/instrkeyboardvocal.png", IC_MULTIPLE_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Bodhran" ), ":/png/instr/res/instruments/bodhran.png", IC_PERCUSSION_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Bassoon" ), ":/png/instr/res/instruments/bassoon.png", IC_WIND_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Oboe" ), ":/png/instr/res/instruments/oboe.png", IC_WIND_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Harp" ), ":/png/instr/res/instruments/harp.png", IC_STRING_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Viola" ), ":/png/instr/res/instruments/viola.png", IC_STRING_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Congas" ), ":/png/instr/res/instruments/congas.png", IC_PERCUSSION_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Bongo" ), ":/png/instr/res/instruments/bongo.png", IC_PERCUSSION_INSTRUMENT ) );
// now the table is initialized
TableIsInitialized = true;
@@ -1006,6 +1042,20 @@ QString CInstPictures::GetName ( const int iInstrument )
}
}
+CInstPictures::EInstCategory CInstPictures::GetCategory ( const int iInstrument )
+{
+ // range check
+ if ( IsInstIndexInRange ( iInstrument ) )
+ {
+ // return the name of the instrument
+ return GetTable()[iInstrument].eInstCategory;
+ }
+ else
+ {
+ return IC_OTHER_INSTRUMENT;
+ }
+}
+
// Locale management class -----------------------------------------------------
QString CLocale::GetCountryFlagIconsResourceReference ( const QLocale::Country eCountry )
diff --git a/src/util.h b/src/util.h
index 99fff348..3c688f59 100755
--- a/src/util.h
+++ b/src/util.h
@@ -473,16 +473,17 @@ class CHelpMenu : public QMenu
Q_OBJECT
public:
- CHelpMenu ( QWidget* parent = nullptr );
+ CHelpMenu ( const bool bIsClient, QWidget* parent = nullptr );
protected:
CAboutDlg AboutDlg;
public slots:
- void OnHelpWhatsThis() { QWhatsThis::enterWhatsThisMode(); }
- void OnHelpAbout() { AboutDlg.exec(); }
- void OnHelpDownloadLink()
- { QDesktopServices::openUrl ( QUrl ( SOFTWARE_DOWNLOAD_URL ) ); }
+ void OnHelpWhatsThis() { QWhatsThis::enterWhatsThisMode(); }
+ void OnHelpAbout() { AboutDlg.exec(); }
+ void OnHelpClientGetStarted() { QDesktopServices::openUrl ( QUrl ( CLIENT_GETTING_STARTED_URL ) ); }
+ void OnHelpServerGetStarted() { QDesktopServices::openUrl ( QUrl ( SERVER_GETTING_STARTED_URL ) ); }
+ void OnHelpSoftwareMan() { QDesktopServices::openUrl ( QUrl ( SOFTWARE_MANUAL_URL ) ); }
};
@@ -589,28 +590,28 @@ inline QString svrRegStatusToString ( ESvrRegStatus eSvrRegStatus )
switch ( eSvrRegStatus )
{
case SRS_UNREGISTERED:
- return "Unregistered";
+ return QCoreApplication::translate ( "CServerDlg", "Unregistered" );
case SRS_BAD_ADDRESS:
- return "Bad address";
+ return QCoreApplication::translate ( "CServerDlg", "Bad address" );
case SRS_REQUESTED:
- return "Registration requested";
+ return QCoreApplication::translate ( "CServerDlg", "Registration requested" );
case SRS_TIME_OUT:
- return "Registration failed";
+ return QCoreApplication::translate ( "CServerDlg", "Registration failed" );
case SRS_UNKNOWN_RESP:
- return "Check server version";
+ return QCoreApplication::translate ( "CServerDlg", "Check server version" );
case SRS_REGISTERED:
- return "Registered";
+ return QCoreApplication::translate ( "CServerDlg", "Registered" );
case SRS_CENTRAL_SVR_FULL:
- return "Central Server full";
+ return QCoreApplication::translate ( "CServerDlg", "Central Server full" );
}
- return QString ( "Unknown value " ).append ( eSvrRegStatus );
+ return QString ( QCoreApplication::translate ( "CServerDlg", "Unknown value " ) ).append ( eSvrRegStatus );
}
@@ -657,7 +658,7 @@ public:
void Update ( const CVector& vecsAudio );
double MicLeveldBLeft() { return CalcLogResult ( dCurLevelL ); }
double MicLeveldBRight() { return CalcLogResult ( dCurLevelR ); }
- static double CalcLogResult ( const double& dLinearLevel );
+ static double CalcLogResult ( const double& dLinearLevel );
void Reset()
{
@@ -761,9 +762,10 @@ public:
static int GetNotUsedInstrument() { return 0; }
static bool IsNotUsedInstrument ( const int iInstrument ) { return iInstrument == 0; }
- static int GetNumAvailableInst() { return GetTable().Size(); }
- static QString GetResourceReference ( const int iInstrument );
- static QString GetName ( const int iInstrument );
+ static int GetNumAvailableInst() { return GetTable().Size(); }
+ static QString GetResourceReference ( const int iInstrument );
+ static QString GetName ( const int iInstrument );
+ static EInstCategory GetCategory ( const int iInstrument );
// TODO make use of instrument category (not yet implemented)
diff --git a/windows/sound.cpp b/windows/sound.cpp
index 65e9006f..19b44360 100755
--- a/windows/sound.cpp
+++ b/windows/sound.cpp
@@ -483,11 +483,12 @@ void CSound::Stop()
}
}
-CSound::CSound ( void (*fpNewCallback) ( CVector& psData, void* arg ),
- void* arg,
- const int iCtrlMIDIChannel,
- const bool bNoAutoJackConnect) :
- CSoundBase ( "ASIO", true, fpNewCallback, arg, iCtrlMIDIChannel, bNoAutoJackConnect ),
+CSound::CSound ( void (*fpNewCallback) ( CVector& psData, void* arg ),
+ void* arg,
+ const int iCtrlMIDIChannel,
+ const bool ,
+ const QString& ) :
+ CSoundBase ( "ASIO", true, fpNewCallback, arg, iCtrlMIDIChannel ),
lNumInChan ( 0 ),
lNumInChanPlusAddChan ( 0 ),
lNumOutChan ( 0 ),
@@ -514,9 +515,9 @@ CSound::CSound ( void (*fpNewCallback) ( CVector& psData, void* a
// in case we do not have a driver available, throw error
if ( lNumDevs == 0 )
{
- throw CGenErr ( tr ( "No ASIO audio device (driver) found.
"
- "The " ) + APP_NAME + tr ( " software requires the low latency audio "
- "interface ASIO to work properly. This is no standard "
+ throw CGenErr ( "" + tr ( "No ASIO audio device (driver) found." ) + "
" +
+ tr ( "The " ) + APP_NAME + tr ( " software requires the low latency audio "
+ "interface ASIO to work properly. This is no standard "
"Windows audio interface and therefore a special audio driver is "
"required. Either your sound card has a native ASIO driver (which "
"is recommended) or you might want to use alternative drivers like "
diff --git a/windows/sound.h b/windows/sound.h
index 5f6d96a7..46e078e7 100755
--- a/windows/sound.h
+++ b/windows/sound.h
@@ -46,10 +46,12 @@
class CSound : public CSoundBase
{
public:
- CSound ( void (*fpNewCallback) ( CVector& psData, void* arg ),
- void* arg,
- const int iCtrlMIDIChannel,
- const bool bNoAutoJackConnect );
+ CSound ( void (*fpNewCallback) ( CVector& psData, void* arg ),
+ void* arg,
+ const int iCtrlMIDIChannel,
+ const bool ,
+ const QString& );
+
virtual ~CSound() { UnloadCurrentDriver(); }
virtual int Init ( const int iNewPrefMonoBufferSize );
@@ -85,28 +87,6 @@ protected:
bool CheckSampleTypeSupportedForCHMixing ( const ASIOSampleType SamType );
void ResetChannelMapping();
- static void GetSelCHAndAddCH ( const int iSelCH, const int iNumInChan,
- int& iSelCHOut, int& iSelAddCHOut )
- {
- // we have a mixed channel setup
- // definitions:
- // - mixed channel setup only for 4 physical inputs:
- // SelCH == 4: Ch 0 + Ch 2
- // SelCh == 5: Ch 0 + Ch 3
- // SelCh == 6: Ch 1 + Ch 2
- // SelCh == 7: Ch 1 + Ch 3
- if ( iSelCH >= iNumInChan )
- {
- iSelAddCHOut = ( ( iSelCH - iNumInChan ) % 2 ) + 2;
- iSelCHOut = ( iSelCH - iNumInChan ) / 2;
- }
- else
- {
- iSelAddCHOut = -1;
- iSelCHOut = iSelCH;
- }
- }
-
int iASIOBufferSizeMono;
int iASIOBufferSizeStereo;