Display Unicode URLs in Punycode. https://redmine.stoutner.com/issues/1108

[PrivacyBrowserPC.git] / src / windows / BrowserWindow.cpp

diff --git a/src/windows/BrowserWindow.cpp b/src/windows/BrowserWindow.cpp
index 8f8a0b0d78bfaec352cf3b2a44d2fbf9b0de3cbb..8382e0085806359ba141d0e34cc0d8dba820cddf 100644 (file)
--- a/src/windows/BrowserWindow.cpp
+++ b/src/windows/BrowserWindow.cpp
@@ -226,7 +226,7 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer)
     searchEngineCustomActionPointer->setIcon(QIcon::fromTheme(QLatin1String("edit-find")));
     zoomFactorActionPointer->setIcon(QIcon::fromTheme(QLatin1String("zoom-fit-best")));
     editBookmarksActionPointer->setIcon(QIcon::fromTheme(QLatin1String("bookmark-edit"), QIcon::fromTheme(QLatin1String("bookmark-new"))));
-    viewBookmarksToolBarActionPointer->setIcon(QIcon::fromTheme(QLatin1String("bookmarks")));
+    viewBookmarksToolBarActionPointer->setIcon(QIcon::fromTheme(QLatin1String("bookmarks"), QIcon::fromTheme(QLatin1String("bookmark-new"))));
     domainSettingsActionPointer->setIcon(QIcon::fromTheme(QLatin1String("settings-configure"), QIcon::fromTheme(QLatin1String("preferences-desktop"))));
     cookiesActionPointer->setIcon(QIcon::fromTheme(QLatin1String("preferences-web-browser-cookies"), QIcon::fromTheme(QLatin1String("appointment-new"))));
     findCaseSensitiveActionPointer->setIcon(QIcon::fromTheme(QLatin1String("format-text-lowercase"), QIcon::fromTheme(QLatin1String("/usr/share/icons/gnome/32x32/apps/fonts.png"))));
@@ -1968,8 +1968,8 @@ void BrowserWindow::updateSearchEngineLabel(const QString &searchEngineString) c
 
 void BrowserWindow::updateUrlLineEdit(const QUrl &newUrl)
 {
-    // Get the new URL string.
-    QString newUrlString = newUrl.toString();
+    // Get the new URL string in encoded form, which displays punycode.
+    QString newUrlString = newUrl.toEncoded();
 
     // Update the view source actions.
     if (newUrlString.startsWith(QLatin1String("view-source:")))  // The source is currently being viewed.