Skip to content

Addded sort by instrument and Edit menu option #356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
corrados merged 5 commits into from
Jun 13, 2020
Merged

Addded sort by instrument and Edit menu option #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0aea018
Addded sort by instrument
Alberstein8 Jun 12, 2020
3dbddc5
Merge branch 'master' into master
Alberstein8 Jun 13, 2020
8de92ed
Sort by instrument, new sortby function with parameter to set order
Alberstein8 Jun 13, 2020
61f25b5
Removed iReceivedInstrument decalration
Alberstein8 Jun 13, 2020
7c73b93
Clean some empty lines to match original code
Alberstein8 Jun 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/clientdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,9 +282,12 @@ CClientDlg::CClientDlg ( CClient* pNCliP,
// Edit menu --------------------------------------------------------------
pEditMenu = new QMenu ( tr ( "&Edit" ), this );

pEditMenu->addAction ( tr ( "&Sort Channel Users by Name" ), this,
pEditMenu->addAction ( tr ( "Sort Channel Users by &Name" ), this,
SLOT ( OnSortChannelsByName() ), QKeySequence ( Qt::CTRL + Qt::Key_N ) );

pEditMenu->addAction ( tr ( "Sort Channel Users by &Instrument" ), this,
SLOT ( OnSortChannelsByInstrument() ), QKeySequence ( Qt::CTRL + Qt::Key_I ) );


// Main menu bar -----------------------------------------------------------
pMenu = new QMenuBar ( this );
Expand Down
1 change: 1 addition & 0 deletions src/clientdlg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ public slots:
void OnOpenChatDialog() { ShowChatWindow(); }
void OnOpenAnalyzerConsole() { ShowAnalyzerConsole(); }
void OnSortChannelsByName() { MainMixerBoard->ChangeFaderOrder ( true, ST_BY_NAME ); }
void OnSortChannelsByInstrument() { MainMixerBoard->ChangeFaderOrder ( true, ST_BY_INSTRUMENT ); }

void OnSettingsStateChanged ( int value );
void OnChatStateChanged ( int value );
Expand Down
Binary file modified src/res/translation/translation_de_DE.qm
View file
Open in desktop
Binary file not shown.
57 changes: 33 additions & 24 deletions src/res/translation/translation_de_DE.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,17 +190,17 @@
<context>
<name>CAudioMixerBoard</name>
<message>
<location filename="../../audiomixerboard.cpp" line="697"/>
<location filename="../../audiomixerboard.cpp" line="700"/>
<source>Server</source>
<translation></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="706"/>
<location filename="../../audiomixerboard.cpp" line="709"/>
<source>T R Y I N G T O C O N N E C T</source>
<translation>V E R B I N D U N G S A U F B A U</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="808"/>
<location filename="../../audiomixerboard.cpp" line="835"/>
<source>Personal Mix at the Server: </source>
<translation>Eigener Mix am Server: </translation>
</message>
Expand Down Expand Up @@ -367,44 +367,44 @@
<translation></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="526"/>
<location filename="../../audiomixerboard.cpp" line="529"/>
<source>Alias/Name</source>
<translation></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="532"/>
<location filename="../../audiomixerboard.cpp" line="535"/>
<source>Instrument</source>
<translation></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="540"/>
<location filename="../../audiomixerboard.cpp" line="543"/>
<source>Location</source>
<translation>Standort</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="562"/>
<location filename="../../audiomixerboard.cpp" line="566"/>
<location filename="../../audiomixerboard.cpp" line="570"/>
<location filename="../../audiomixerboard.cpp" line="565"/>
<location filename="../../audiomixerboard.cpp" line="569"/>
<location filename="../../audiomixerboard.cpp" line="573"/>
<source>Skill Level</source>
<translation>Spielstärke</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="562"/>
<location filename="../../audiomixerboard.cpp" line="565"/>
<source>Beginner</source>
<translation>Anfänger</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="566"/>
<location filename="../../audiomixerboard.cpp" line="569"/>
<source>Intermediate</source>
<translation>Mittlere Spielstärke</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="570"/>
<location filename="../../audiomixerboard.cpp" line="573"/>
<source>Expert</source>
<translation>Experte</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="581"/>
<location filename="../../audiomixerboard.cpp" line="584"/>
<source>Musician Profile</source>
<translation>Profil des Musikers</translation>
</message>
Expand Down Expand Up @@ -715,7 +715,7 @@
</message>
<message>
<location filename="../../clientdlg.cpp" line="203"/>
<location filename="../../clientdlg.cpp" line="1108"/>
<location filename="../../clientdlg.cpp" line="1111"/>
<source>C&amp;onnect</source>
<translation>&amp;Verbinden</translation>
</message>
Expand Down Expand Up @@ -760,28 +760,27 @@
<translation>B&amp;earbeiten</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="285"/>
<source>&amp;Sort Channel Users by Name</source>
<translation>&amp;Sortiere Kanäle nach Namen</translation>
<translation type="vanished">&amp;Sortiere Kanäle nach Namen</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="334"/>
<location filename="../../clientdlg.cpp" line="337"/>
<source>None</source>
<translation>Keine</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="616"/>
<location filename="../../clientdlg.cpp" line="619"/>
<source>Center</source>
<translation>Mitte</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="623"/>
<location filename="../../clientdlg.cpp" line="626"/>
<source>R</source>
<translation></translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="107"/>
<location filename="../../clientdlg.cpp" line="629"/>
<location filename="../../clientdlg.cpp" line="632"/>
<source>L</source>
<translation></translation>
</message>
Expand Down Expand Up @@ -856,22 +855,32 @@
<translation>Die CPU des Computers ist voll ausgelastet.</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="715"/>
<location filename="../../clientdlg.cpp" line="285"/>
<source>Sort Channel Users by &amp;Name</source>
<translation>Sortiere Kanäle nach &amp;Namen</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="288"/>
<source>Sort Channel Users by &amp;Instrument</source>
<translation>Sortiere Kanäle nach &amp;Instrument</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="718"/>
<source>Central Server</source>
<translation>Zentralserver</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="842"/>
<location filename="../../clientdlg.cpp" line="845"/>
<source>user</source>
<translation>Musiker</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="847"/>
<location filename="../../clientdlg.cpp" line="850"/>
<source>users</source>
<translation>Musiker</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="1084"/>
<location filename="../../clientdlg.cpp" line="1087"/>
<source>D&amp;isconnect</source>
<translation>&amp;Trennen</translation>
</message>
Expand Down
Binary file modified src/res/translation/translation_es_ES.qm
View file
Open in desktop
Binary file not shown.
61 changes: 33 additions & 28 deletions src/res/translation/translation_es_ES.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,17 +194,17 @@
<context>
<name>CAudioMixerBoard</name>
<message>
<location filename="../../audiomixerboard.cpp" line="697"/>
<location filename="../../audiomixerboard.cpp" line="700"/>
<source>Server</source>
<translation>Servidor</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="706"/>
<location filename="../../audiomixerboard.cpp" line="709"/>
<source>T R Y I N G T O C O N N E C T</source>
<translation>I N T E N T A N D O C O N E C T A R</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="808"/>
<location filename="../../audiomixerboard.cpp" line="835"/>
<source>Personal Mix at the Server: </source>
<translation>Mezcla Personal en el Servidor: </translation>
</message>
Expand Down Expand Up @@ -371,44 +371,44 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="526"/>
<location filename="../../audiomixerboard.cpp" line="529"/>
<source>Alias/Name</source>
<translation>Alias/Nombre</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="532"/>
<location filename="../../audiomixerboard.cpp" line="535"/>
<source>Instrument</source>
<translation>Instrumento</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="540"/>
<location filename="../../audiomixerboard.cpp" line="543"/>
<source>Location</source>
<translation>Ubicación</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="562"/>
<location filename="../../audiomixerboard.cpp" line="566"/>
<location filename="../../audiomixerboard.cpp" line="570"/>
<location filename="../../audiomixerboard.cpp" line="565"/>
<location filename="../../audiomixerboard.cpp" line="569"/>
<location filename="../../audiomixerboard.cpp" line="573"/>
<source>Skill Level</source>
<translation>Nivel Habilidad</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="562"/>
<location filename="../../audiomixerboard.cpp" line="565"/>
<source>Beginner</source>
<translation>Principiante</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="566"/>
<location filename="../../audiomixerboard.cpp" line="569"/>
<source>Intermediate</source>
<translation>Intermedio</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="570"/>
<location filename="../../audiomixerboard.cpp" line="573"/>
<source>Expert</source>
<translation>Experto</translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="581"/>
<location filename="../../audiomixerboard.cpp" line="584"/>
<source>Musician Profile</source>
<translation>Perfil Músico</translation>
</message>
Expand Down Expand Up @@ -727,7 +727,7 @@
</message>
<message>
<location filename="../../clientdlg.cpp" line="203"/>
<location filename="../../clientdlg.cpp" line="1108"/>
<location filename="../../clientdlg.cpp" line="1111"/>
<source>C&amp;onnect</source>
<translation>C&amp;onectar</translation>
</message>
Expand Down Expand Up @@ -772,28 +772,23 @@
<translation>&amp;Editar</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="285"/>
<source>&amp;Sort Channel Users by Name</source>
<translation>&amp;Ordenar Canales por Nombre</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="334"/>
<location filename="../../clientdlg.cpp" line="337"/>
<source>None</source>
<translation>Ninguno</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="616"/>
<location filename="../../clientdlg.cpp" line="619"/>
<source>Center</source>
<translation>Centro</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="623"/>
<location filename="../../clientdlg.cpp" line="626"/>
<source>R</source>
<translation>R</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="107"/>
<location filename="../../clientdlg.cpp" line="629"/>
<location filename="../../clientdlg.cpp" line="632"/>
<source>L</source>
<translation>L</translation>
</message>
Expand Down Expand Up @@ -868,22 +863,32 @@
<translation>El procesador del cliente o del servidor está al 100%.</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="715"/>
<location filename="../../clientdlg.cpp" line="285"/>
<source>Sort Channel Users by &amp;Name</source>
<translation>Ordenar Canales por &amp;Nombre</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="288"/>
<source>Sort Channel Users by &amp;Instrument</source>
<translation>Ordenar Canales por &amp;Instrumento</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="718"/>
<source>Central Server</source>
<translation>Servidor Central</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="842"/>
<location filename="../../clientdlg.cpp" line="845"/>
<source>user</source>
<translation>usuario</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="847"/>
<location filename="../../clientdlg.cpp" line="850"/>
<source>users</source>
<translation>usuarios</translation>
</message>
<message>
<location filename="../../clientdlg.cpp" line="1084"/>
<location filename="../../clientdlg.cpp" line="1087"/>
<source>D&amp;isconnect</source>
<translation>D&amp;esconectar</translation>
</message>
Expand Down Expand Up @@ -2350,7 +2355,7 @@
<message>
<location filename="../../util.cpp" line="1014"/>
<source>Vocal Bass</source>
<translation>Voz bajo</translation>
<translation>Voz Bajo</translation>
</message>
<message>
<location filename="../../util.cpp" line="1015"/>
Expand Down