v2.16.11

Author: bernerdad

client/common/changelog.txt

@@ -1,3 +1,22 @@
+2.16.11 (18/07/2025)
+MacOS:
+   * Fix installer icon does not display for some screen resolutions/scale factors. #1056
+
+
+2.16.10 (17/07/2025)
+Windows:
+   * Improved installer icon. #1056
+MacOS:
+   * Improved installer icon. #1056
+
+
+2.16.9 (15/07/2025)
+All:
+   * Fixed various issues with the network display on connect screen. #1417
+Windows:
+   * Fixed network may not show up in Network Options. #1417
+
+
 2.16.8 (10/07/2025)
 All:
    * Improved various issues with the new UI (e.g. colors, external config mode, keyboard handling in locations) #1417 #1418 #1421

client/common/utils/network_utils/network_utils_win.cpp

@@ -532,6 +532,12 @@ QVector<types::NetworkInterface> NetworkUtils_win::currentNetworkInterfaces(bool
             networkInterface.networkOrSsid = itRow.interfaceName;
         }
 
+        AdapterAddress aa = tableRowByIndex(getAdapterAddressesTable(), ia.index);
+        if (aa.valid) {
+            networkInterface.interfaceName = aa.friendlyName;
+            networkInterface.friendlyName  = networkInterface.interfaceName;
+        }
+
         IfTable2Row it2Row = tableRowByIndex(getIfTable2(), ia.index);
         if (!it2Row.valid) {
             // Should never happen
@@ -544,6 +550,10 @@ QVector<types::NetworkInterface> NetworkUtils_win::currentNetworkInterfaces(bool
 
         if (networkInterface.interfaceType == NETWORK_INTERFACE_ETH) {
             networkInterface.networkOrSsid = networkNameFromInterfaceGUID(it2Row.interfaceGuid);
+            if (networkInterface.networkOrSsid.isEmpty()) {
+                // Above function could not detect interface, probably virtual.  Set it to the friendly name instead.
+                networkInterface.networkOrSsid = networkInterface.friendlyName;
+            }
         }
 
         IpForwardRow ipfRow = tableRowByIndex(getIpForwardTable(), ia.index);
@@ -553,12 +563,6 @@ QVector<types::NetworkInterface> NetworkUtils_win::currentNetworkInterfaces(bool
             networkInterface.metric = ipfRow.metric;
         }
 
-        AdapterAddress aa = tableRowByIndex(getAdapterAddressesTable(), ia.index);
-        if (aa.valid) {
-            networkInterface.interfaceName = aa.friendlyName;
-            networkInterface.friendlyName  = networkInterface.interfaceName;
-        }
-
         networkInterfaces << networkInterface;
     }
 

client/common/version/windscribe_version.h

@@ -2,10 +2,10 @@
 
 #define WINDSCRIBE_MAJOR_VERSION 2
 #define WINDSCRIBE_MINOR_VERSION 16
-#define WINDSCRIBE_BUILD_VERSION 8
+#define WINDSCRIBE_BUILD_VERSION 11
 
 // only one of these should be enabled; neither -> stable
-#define WINDSCRIBE_IS_BETA
+//#define WINDSCRIBE_IS_BETA
 //#define WINDSCRIBE_IS_GUINEA_PIG
 
 #define STR_HELPER(x) #x

client/gui/connectwindow/connectwindowitem.cpp

@@ -514,9 +514,6 @@ void ConnectWindowItem::updatePositions()
 
 void ConnectWindowItem::updateShortenedText()
 {
-    // Network name: max width is 350 - 16*3 padding (left, between network and IP, and right) - 120 for IP address.
-    networkTrustButton_->setWidth(198*G_SCALE);
-
     // City name
     QString shortenedFirstName;
     QString shortenedSecondName;

client/gui/connectwindow/networktrustbutton.cpp

@@ -91,24 +91,15 @@ void NetworkTrustButton::setNetwork(const types::NetworkInterface &network)
     updatePositions();
 }
 
-void NetworkTrustButton::setWidth(int width)
-{
-    // Use unscaled width
-    prepareGeometryChange();
-    width_ = width;
-
-    updateNetworkText();
-}
-
 void NetworkTrustButton::updateNetworkText()
 {
     // width minus left text offset and space for arrow on the right
-    int textWidth = width_ - 40*G_SCALE - arrow_->boundingRect().width();
+    int availableWidth = kMaxWidth*G_SCALE - 40*G_SCALE - arrow_->boundingRect().width();
 
     QFont networkFont = FontManager::instance().getFont(15, QFont::Normal);
     QFontMetrics fmNetwork(networkFont);
-    if (fmNetwork.horizontalAdvance(network_.friendlyName) > textWidth) {
-        networkText_ = fmNetwork.elidedText(network_.friendlyName, Qt::ElideMiddle, textWidth);
+    if (fmNetwork.horizontalAdvance(network_.friendlyName) > availableWidth) {
+        networkText_ = fmNetwork.elidedText(network_.friendlyName, Qt::ElideMiddle, availableWidth);
         isTextElided_ = true;
     } else {
         networkText_ = network_.friendlyName;
@@ -121,6 +112,7 @@ void NetworkTrustButton::updateNetworkText()
 void NetworkTrustButton::updateScaling()
 {
     ClickableGraphicsObject::updateScaling();
+    updateNetworkText();
     updatePositions();
 }
 
@@ -149,6 +141,10 @@ void NetworkTrustButton::updatePositions()
     int textWidth = fmNetwork.horizontalAdvance(networkText_);
 
     arrow_->setPos(36*G_SCALE + textWidth + arrowShift_*G_SCALE, (boundingRect().height() - arrow_->boundingRect().height())/2);
+
+    prepareGeometryChange();
+    width_ = 40*G_SCALE + arrow_->boundingRect().width() + textWidth;
+
     update();
 }
 

client/gui/connectwindow/networktrustbutton.h

@@ -19,7 +19,6 @@ class NetworkTrustButton : public ClickableGraphicsObject
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override;
 
     void setNetwork(const types::NetworkInterface &network);
-    void setWidth(int width);
     void updateScaling() override;
 
 private slots:
@@ -28,6 +27,8 @@ private slots:
     void onHoverLeave();
 
 private:
+    static const int kMaxWidth = 198;
+
     types::NetworkInterface network_;
     ImageItem *trustIcon_;
     ImageItem *arrow_;

client/gui/mainwindow.cpp

@@ -1427,6 +1427,7 @@ void MainWindow::onExternalConfigWindowNextClick()
     backend_->getPreferencesHelper()->setIsExternalConfigMode(true);
     mainWindowController_->getConnectWindow()->setCustomConfigMode(true);
     backend_->gotoCustomOvpnConfigMode();
+    backend_->updateCurrentNetworkInterface();
 }
 
 void MainWindow::onTwoFactorAuthWindowButtonAddClick(const QString &code2fa)