Make the server list accessible.

Author: chigkim

src/connectdlg.cpp

@@ -24,6 +24,11 @@
 
 #include "connectdlg.h"
 
+#if QT_VERSION >= QT_VERSION_CHECK( 6, 8, 0 )
+#    include <QAccessible>
+#    include <QAccessibleAnnouncementEvent>
+#endif
+
 /* Implementation *************************************************************/
 
 // mapVersionStr - converts a version number to a sortable string
@@ -75,22 +80,22 @@ static QString mapVersionStr ( const QString& versionStr )
 // Subclass of QTreeWidgetItem that allows LVC_VERSION to sort by the UserRole data value
 CMappedTreeWidgetItem::CMappedTreeWidgetItem ( QTreeWidget* owner ) : QTreeWidgetItem ( owner ), owner ( owner ) {}
 
-bool CMappedTreeWidgetItem::operator<( const QTreeWidgetItem& other ) const
+bool CMappedTreeWidgetItem::operator< ( const QTreeWidgetItem& other ) const
 {
     if ( !owner )
-        return QTreeWidgetItem::operator<( other );
+        return QTreeWidgetItem::operator< ( other );
 
     int column = owner->sortColumn();
 
     // we only need this override for comparing server versions
     if ( column != CConnectDlg::LVC_VERSION )
-        return QTreeWidgetItem::operator<( other );
+        return QTreeWidgetItem::operator< ( other );
 
     QVariant lhs = data ( column, Qt::UserRole );
     QVariant rhs = other.data ( column, Qt::UserRole );
 
     if ( !lhs.isValid() || !rhs.isValid() )
-        return QTreeWidgetItem::operator<( other );
+        return QTreeWidgetItem::operator< ( other );
 
     return lhs.toString() < rhs.toString();
 }
@@ -243,6 +248,7 @@ CConnectDlg::CConnectDlg ( CClientSettings* pNSetP, const bool bNewShowCompleteR
 
     // to get default return key behaviour working
     QObject::connect ( lvwServers, &QTreeWidget::activated, this, &CConnectDlg::OnConnectClicked );
+    QObject::connect ( lvwServers, &QTreeWidget::currentItemChanged, this, &CConnectDlg::OnCurrentServerItemChanged );
 
     // line edit
     QObject::connect ( edtFilter, &QLineEdit::textEdited, this, &CConnectDlg::OnFilterTextEdited );
@@ -567,6 +573,7 @@ void CConnectDlg::SetConnClientsList ( const CHostAddress& InetAddr, const CVect
 
             if ( vecChanInfo[i].eCountry != QLocale::AnyCountry )
             {
+                pNewChildListViewItem->setData ( LVC_NAME, Qt::UserRole, QLocale::countryToString ( vecChanInfo[i].eCountry ) );
                 // try to load the country flag icon
                 QPixmap CountryFlagPixmap ( CLocale::GetCountryFlagIconsResourceReference ( vecChanInfo[i].eCountry ) );
 
@@ -1106,3 +1113,30 @@ void CConnectDlg::UpdateDirectoryComboBox()
         }
     }
 }
+
+void CConnectDlg::OnCurrentServerItemChanged ( QTreeWidgetItem* current, QTreeWidgetItem* )
+{
+#if QT_VERSION >= QT_VERSION_CHECK( 6, 8, 0 )
+    if ( !current )
+        return;
+
+    QString announcement;
+    if ( current->parent() )
+    {
+        // It's a client
+        announcement         = current->text ( LVC_NAME );
+        QVariant countryData = current->data ( LVC_NAME, Qt::UserRole );
+        if ( countryData.isValid() )
+        {
+            announcement += ", " + countryData.toString();
+        }
+    }
+    else
+    {
+        // It's a server
+        announcement = current->text ( LVC_NAME ) + ", " + current->text ( LVC_CLIENTS ) + ", " + current->text ( LVC_LOCATION ) + ", " +
+                       tr ( "Ping" ) + " " + current->text ( LVC_PING );
+    }
+    QAccessible::updateAccessibility ( new QAccessibleAnnouncementEvent ( lvwServers, announcement ) );
+#endif
+}

src/connectdlg.h

@@ -51,7 +51,7 @@ class CMappedTreeWidgetItem : public QTreeWidgetItem
 public:
     explicit CMappedTreeWidgetItem ( QTreeWidget* owner = nullptr );
 
-    bool operator<( const QTreeWidgetItem& other ) const override;
+    bool operator< ( const QTreeWidgetItem& other ) const override;
 
 private:
     QTreeWidget* owner = nullptr;
@@ -132,6 +132,7 @@ public slots:
     void OnDeleteServerAddrClicked();
     void OnTimerPing();
     void OnTimerReRequestServList();
+    void OnCurrentServerItemChanged ( QTreeWidgetItem* current, QTreeWidgetItem* previous );
 
 signals:
     void ReqServerListQuery ( CHostAddress InetAddr );