Skip to content

Reorder of serverdlg bits #2177

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
ann0see merged 11 commits into from
Dec 28, 2021
Merged

Reorder of serverdlg bits #2177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c860a95
Correct bSystemTrayIconAvaialbe typo
pljones Oct 29, 2021
7657bac
Move server setWindowTitle
pljones Oct 29, 2021
e32f86c
Add section comments to server dialog ctor
pljones Oct 29, 2021
d9eb796
Move chbStartOnOSStart->setWhatsThis to options tab
pljones Oct 29, 2021
4c2691b
Move recording directory to options tab
pljones Oct 29, 2021
b2abfd9
Add Language help
pljones Oct 29, 2021
6460161
another section comment (and clarification)
pljones Oct 29, 2021
0d61a2a
Changes to lblRegSvrStatus
pljones Oct 29, 2021
80a5929
Move (and rename) CustomDirectory to options tab
pljones Oct 29, 2021
ee2bde8
UI initialisation to UI follow order
pljones Oct 29, 2021
c9b2270
Connect signals in UI order
pljones Oct 29, 2021
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
171 changes: 92 additions & 79 deletions src/serverdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,17 @@ CServerDlg::CServerDlg ( CServer* pNServP, CServerSettings* pNSetP, const bool b
BitmapSystemTrayActive ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDGreenArrow.png" ) )
{
// check if system tray icon can be used
bSystemTrayIconAvaialbe = SystemTrayIcon.isSystemTrayAvailable();
bSystemTrayIconAvailable = SystemTrayIcon.isSystemTrayAvailable();

setupUi ( this );

// set window title
setWindowTitle ( tr ( "%1 Server", "%1 is the name of the main application" ).arg ( APP_NAME ) );

// Add help text to controls -----------------------------------------------

// Tab: Server setup

// client list
lvwClients->setWhatsThis ( "<b>" + tr ( "Client List" ) + ":</b> " +
tr ( "The client list shows all clients which are currently connected to this "
Expand All @@ -46,16 +52,6 @@ CServerDlg::CServerDlg ( CServer* pNServP, CServerSettings* pNSetP, const bool b

lvwClients->setAccessibleName ( tr ( "Connected clients list view" ) );

// start minimized on operating system start
chbStartOnOSStart->setWhatsThis ( "<b>" +
tr ( "Start Minimized on Operating "
"System Start" ) +
":</b> " +
tr ( "If the start minimized on operating system start "
"check box is checked, the server will be "
"started when the operating system starts up and is automatically "
"minimized to a system task bar icon." ) );

// Make My Server Public flag
chbRegisterServer->setWhatsThis ( "<b>" + tr ( "Make My Server Public" ) + ":</b> " +
tr ( "If the Make My Server Public check box is checked, this server registers "
Expand All @@ -65,21 +61,12 @@ CServerDlg::CServerDlg ( CServer* pNServP, CServerSettings* pNSetP, const bool b
"to make sure that all servers in the connect dialog server list are "
"actually available." ) );

// register server status label
// server registration status label
lblRegSvrStatus->setWhatsThis ( "<b>" + tr ( "Register Server Status" ) + ":</b> " +
tr ( "If the Make My Server Public check box is checked, this will show "
tr ( "If the Register Server check box is checked, this will show "
"whether registration with the directory server is successful. If the "
"registration failed, please choose another server list." ) );

// custom directory server address
QString strCustomDirectoryAddress = "<b>" + tr ( "Custom Directory Server Address" ) + ":</b> " +
tr ( "The custom directory server address is the IP address or URL of the directory "
"server at which the server list of the connection dialog is managed." );

lblDirectoryAddress->setWhatsThis ( strCustomDirectoryAddress );
edtDirectoryAddress->setWhatsThis ( strCustomDirectoryAddress );
edtDirectoryAddress->setAccessibleName ( tr ( "Directory server address line edit" ) );

cbxDirectoryType->setWhatsThis ( "<b>" + tr ( "Server List Selection" ) + ":</b> " +
tr ( "Selects the server list (i.e. directory server address) in which your server will be added." ) );
cbxDirectoryType->setAccessibleName ( tr ( "Server list selection combo box" ) );
Expand Down Expand Up @@ -116,25 +103,6 @@ CServerDlg::CServerDlg ( CServer* pNServP, CServerSettings* pNSetP, const bool b

cbxLocationCountry->setAccessibleName ( tr ( "Combo box for location of this server" ) );

// recording directory
pbtRecordingDir->setAccessibleName ( tr ( "Display dialog to select recording directory button" ) );
pbtRecordingDir->setWhatsThis ( "<b>" + tr ( "Main Recording Directory" ) + ":</b> " +
tr ( "Click the button to open the dialog that allows the main recording directory to be selected."
"The chosen value must exist and be writeable (allow creation of sub-directories "
"by the user Jamulus is running as). " ) );

edtRecordingDir->setAccessibleName ( tr ( "Main recording directory text box (read-only)" ) );
edtRecordingDir->setWhatsThis ( "<b>" + tr ( "Main Recording Directory" ) + ":</b> " +
tr ( "The current value of the main recording directory. "
"The chosen value must exist and be writeable (allow creation of sub-directories "
"by the user Jamulus is running as). "
"Click the button to open the dialog that allows the main recording directory to be selected." ) );

tbtClearRecordingDir->setAccessibleName ( tr ( "Clear the recording directory button" ) );
tbtClearRecordingDir->setWhatsThis ( "<b>" + tr ( "Clear Recording Directory" ) + ":</b> " +
tr ( "Click the button to clear the currently selected recording directory. "
"This will prevent recording until a new value is selected." ) );

// enable recorder
chbEnableRecorder->setAccessibleName ( tr ( "Checkbox to turn on or off server recording" ) );
chbEnableRecorder->setWhatsThis ( "<b>" + tr ( "Enable Recorder" ) + ":</b> " +
Expand Down Expand Up @@ -174,8 +142,54 @@ CServerDlg::CServerDlg ( CServer* pNServP, CServerSettings* pNSetP, const bool b
tr ( "A server welcome message text is displayed in the chat window if a "
"musician enters the server. If no message is set, the server welcome is disabled." ) );

// Tab: options

// Interface Language
QString strWTLanguage = "<b>" + tr ( "Language" ) + ":</b> " + tr ( "Select the language to be used for the user interface." );
lblLanguage->setWhatsThis ( strWTLanguage );
cbxLanguage->setWhatsThis ( strWTLanguage );

cbxLanguage->setAccessibleName ( tr ( "Language combo box" ) );
Comment thread
softins marked this conversation as resolved.

// recording directory
pbtRecordingDir->setAccessibleName ( tr ( "Display dialog to select recording directory button" ) );
pbtRecordingDir->setWhatsThis ( "<b>" + tr ( "Main Recording Directory" ) + ":</b> " +
tr ( "Click the button to open the dialog that allows the main recording directory to be selected. "
"The chosen value must exist and be writeable (allow creation of sub-directories "
"by the user Jamulus is running as)." ) );

edtRecordingDir->setAccessibleName ( tr ( "Main recording directory text box (read-only)" ) );
edtRecordingDir->setWhatsThis ( "<b>" + tr ( "Main Recording Directory" ) + ":</b> " +
tr ( "The current value of the main recording directory. "
"The chosen value must exist and be writeable (allow creation of sub-directories "
"by the user Jamulus is running as). "
"Click the button to open the dialog that allows the main recording directory to be selected." ) );

tbtClearRecordingDir->setAccessibleName ( tr ( "Clear the recording directory button" ) );
tbtClearRecordingDir->setWhatsThis ( "<b>" + tr ( "Clear Recording Directory" ) + ":</b> " +
tr ( "Click the button to clear the currently selected recording directory. "
"This will prevent recording until a new value is selected." ) );

// custom directory
QString strCustomDirectory = "<b>" + tr ( "Custom Directory" ) + ":</b> " +
Comment thread
softins marked this conversation as resolved.
tr ( "The custom directory is the IP address or URL of the directory "
"server at which the server list of the connection dialog is managed." );

lblCustomDirectory->setWhatsThis ( strCustomDirectory );
edtCustomDirectory->setWhatsThis ( strCustomDirectory );
edtCustomDirectory->setAccessibleName ( tr ( "Custom Directory line edit" ) );

// start minimized on operating system start
chbStartOnOSStart->setWhatsThis ( "<b>" + tr ( "Start Minimized on Operating System Start" ) + ":</b> " +
tr ( "If the start minimized on operating system start "
"check box is checked, the server will be "
"started when the operating system starts up and is automatically "
"minimized to a system task bar icon." ) );

// Application initialisation

// init system tray icon
if ( bSystemTrayIconAvaialbe )
if ( bSystemTrayIconAvailable )
{
// prepare context menu to be added to the system tray icon
pSystemTrayIconMenu = new QMenu ( this );
Expand All @@ -200,12 +214,14 @@ CServerDlg::CServerDlg ( CServer* pNServP, CServerSettings* pNSetP, const bool b
}

// act on "start minimized" flag (note, this has to be done after setting
// the correct value for the system tray icon availablility)
// and acting on the correct value for the system tray icon availablility)
if ( bStartMinimized )
{
showMinimized();
}

// UI initialisation

// set up list view for connected clients
lvwClients->setColumnWidth ( 0, 170 ); // 170 // IP:port
lvwClients->setColumnWidth ( 1, 200 ); // 200 // Name
Expand Down Expand Up @@ -242,7 +258,7 @@ lvwClients->setMinimumHeight ( 140 );
cbxDirectoryType->setCurrentIndex ( static_cast<int> ( pServer->GetDirectoryType() ) );

// custom directory server address
edtDirectoryAddress->setText ( pServer->GetDirectoryAddress() );
edtCustomDirectory->setText ( pServer->GetDirectoryAddress() );

// update server name line edit
edtServerName->setText ( pServer->GetServerName() );
Expand Down Expand Up @@ -281,6 +297,23 @@ lvwClients->setMinimumHeight ( 140 );
chbRegisterServer->setCheckState ( Qt::Unchecked );
}

// Recorder controls
chbEnableRecorder->setChecked ( pServer->GetRecordingEnabled() );
edtCurrentSessionDir->setText ( "" );
pbtNewRecording->setAutoDefault ( false );

// setup welcome message GUI control
tedWelcomeMessage->setPlaceholderText ( tr ( "Type a message here. If no message is set, the server welcome is disabled." ) );
tedWelcomeMessage->setText ( pServer->GetWelcomeMessage() );

// language combo box (corrects the setting if language not found)
cbxLanguage->Init ( pSettings->strLanguage );

// recorder options
pbtRecordingDir->setAutoDefault ( false );
edtRecordingDir->setText ( pServer->GetRecordingDir() );
tbtClearRecordingDir->setText ( u8"\u232B" );

// update start minimized check box (only available for Windows)
#ifndef _WIN32
chbStartOnOSStart->setVisible ( false );
Expand Down Expand Up @@ -311,24 +344,6 @@ lvwClients->setMinimumHeight ( 140 );
chbEnableDelayPanning->setCheckState ( Qt::Unchecked );
}

// Recorder controls
chbEnableRecorder->setChecked ( pServer->GetRecordingEnabled() );
edtCurrentSessionDir->setText ( "" );
pbtNewRecording->setAutoDefault ( false );
pbtRecordingDir->setAutoDefault ( false );
edtRecordingDir->setText ( pServer->GetRecordingDir() );
tbtClearRecordingDir->setText ( u8"\u232B" );

UpdateRecorderStatus ( QString::null );

// language combo box (corrects the setting if language not found)
cbxLanguage->Init ( pSettings->strLanguage );

// setup welcome message GUI control
tedWelcomeMessage->setPlaceholderText ( tr ( "Type a message here. If no message is set, the server welcome is disabled." ) );

tedWelcomeMessage->setText ( pServer->GetWelcomeMessage() );

// prepare update check info label (invisible by default)
lblUpdateCheck->setOpenExternalLinks ( true ); // enables opening a web browser if one clicks on a html link
lblUpdateCheck->setText ( "<font color=\"red\"><b>" + APP_UPGRADE_AVAILABLE_MSG_TEXT.arg ( APP_NAME ).arg ( VERSION ) + "</b></font>" );
Expand All @@ -337,8 +352,7 @@ lvwClients->setMinimumHeight ( 140 );
// update GUI dependencies
UpdateGUIDependencies();

// set window title
setWindowTitle ( tr ( "%1 Server", "%1 is the name of the main application" ).arg ( APP_NAME ) );
UpdateRecorderStatus ( QString::null );
Comment thread
softins marked this conversation as resolved.

// View menu --------------------------------------------------------------
QMenu* pViewMenu = new QMenu ( tr ( "&Window" ), this );
Expand All @@ -365,38 +379,37 @@ lvwClients->setMinimumHeight ( 140 );
// check boxes
QObject::connect ( chbRegisterServer, &QCheckBox::stateChanged, this, &CServerDlg::OnRegisterServerStateChanged );

QObject::connect ( chbStartOnOSStart, &QCheckBox::stateChanged, this, &CServerDlg::OnStartOnOSStartStateChanged );

QObject::connect ( chbEnableRecorder, &QCheckBox::stateChanged, this, &CServerDlg::OnEnableRecorderStateChanged );

// delay panning
QObject::connect ( chbStartOnOSStart, &QCheckBox::stateChanged, this, &CServerDlg::OnStartOnOSStartStateChanged );

QObject::connect ( chbEnableDelayPanning, &QCheckBox::stateChanged, this, &CServerDlg::OnEnableDelayPanningStateChanged );

// line edits
QObject::connect ( edtDirectoryAddress, &QLineEdit::editingFinished, this, &CServerDlg::OnDirectoryAddressEditingFinished );

QObject::connect ( edtServerName, &QLineEdit::textChanged, this, &CServerDlg::OnServerNameTextChanged );

QObject::connect ( edtLocationCity, &QLineEdit::textChanged, this, &CServerDlg::OnLocationCityTextChanged );

QObject::connect ( edtCustomDirectory, &QLineEdit::editingFinished, this, &CServerDlg::OnCustomDirectoryEditingFinished );

// combo boxes
QObject::connect ( cbxLocationCountry,
QObject::connect ( cbxDirectoryType,
static_cast<void ( QComboBox::* ) ( int )> ( &QComboBox::activated ),
this,
&CServerDlg::OnLocationCountryActivated );
&CServerDlg::OnDirectoryTypeActivated );

QObject::connect ( cbxDirectoryType,
QObject::connect ( cbxLocationCountry,
static_cast<void ( QComboBox::* ) ( int )> ( &QComboBox::activated ),
this,
&CServerDlg::OnDirectoryTypeActivated );
&CServerDlg::OnLocationCountryActivated );

QObject::connect ( cbxLanguage, &CLanguageComboBox::LanguageChanged, this, &CServerDlg::OnLanguageChanged );

// push buttons
QObject::connect ( pbtRecordingDir, &QPushButton::released, this, &CServerDlg::OnRecordingDirClicked );

QObject::connect ( pbtNewRecording, &QPushButton::released, this, &CServerDlg::OnNewRecordingClicked );

QObject::connect ( pbtRecordingDir, &QPushButton::released, this, &CServerDlg::OnRecordingDirClicked );

// tool buttons
QObject::connect ( tbtClearRecordingDir, &QToolButton::released, this, &CServerDlg::OnClearRecordingDirClicked );

Expand Down Expand Up @@ -481,10 +494,10 @@ void CServerDlg::OnRegisterServerStateChanged ( int value )
UpdateGUIDependencies();
}

void CServerDlg::OnDirectoryAddressEditingFinished()
void CServerDlg::OnCustomDirectoryEditingFinished()
{
// apply new setting to the server and update it
pServer->SetDirectoryAddress ( edtDirectoryAddress->text() );
pServer->SetDirectoryAddress ( edtCustomDirectory->text() );

pServer->UpdateServerList();
}
Expand Down Expand Up @@ -702,7 +715,7 @@ void CServerDlg::UpdateGUIDependencies()

void CServerDlg::UpdateSystemTrayIcon ( const bool bIsActive )
{
if ( bSystemTrayIconAvaialbe )
if ( bSystemTrayIconAvailable )
{
if ( bIsActive )
{
Expand Down Expand Up @@ -818,7 +831,7 @@ void CServerDlg::changeEvent ( QEvent* pEvent )
{
// if we have a system tray icon, we make the window invisible if it is
// minimized
if ( bSystemTrayIconAvaialbe && ( pEvent->type() == QEvent::WindowStateChange ) )
if ( bSystemTrayIconAvailable && ( pEvent->type() == QEvent::WindowStateChange ) )
{
if ( isMinimized() )
{
Expand Down
4 changes: 2 additions & 2 deletions src/serverdlg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class CServerDlg : public CBaseDlg, private Ui_CServerDlgBase

QMenuBar* pMenu;

bool bSystemTrayIconAvaialbe;
bool bSystemTrayIconAvailable;
QSystemTrayIcon SystemTrayIcon;
QPixmap BitmapSystemTrayInactive;
QPixmap BitmapSystemTrayActive;
Expand All @@ -98,7 +98,7 @@ public slots:
void OnStartOnOSStartStateChanged ( int value );
void OnEnableRecorderStateChanged ( int value ) { pServer->SetEnableRecording ( Qt::CheckState::Checked == value ); }

void OnDirectoryAddressEditingFinished();
void OnCustomDirectoryEditingFinished();
void OnServerNameTextChanged ( const QString& strNewName );
void OnLocationCityTextChanged ( const QString& strNewCity );
void OnLocationCountryActivated ( int iCntryListItem );
Expand Down
6 changes: 3 additions & 3 deletions src/serverdlgbase.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,14 +252,14 @@
<item>
<layout class="QHBoxLayout">
<item>
<widget class="QLabel" name="lblDirectoryAddress">
<widget class="QLabel" name="lblCustomDirectory">
<property name="text">
<string>Custom Directory Server Address:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="edtDirectoryAddress"/>
<widget class="QLineEdit" name="edtCustomDirectory"/>
</item>
</layout>
</item>
Expand Down Expand Up @@ -326,7 +326,7 @@
<tabstop>pbtRecordingDir</tabstop>
<tabstop>edtRecordingDir</tabstop>
<tabstop>tbtClearRecordingDir</tabstop>
<tabstop>edtDirectoryAddress</tabstop>
<tabstop>edtCustomDirectory</tabstop>
<tabstop>chbStartOnOSStart</tabstop>
</tabstops>
<resources>
Expand Down