Changeset 56838 in webkit

Timestamp:

Mar 31, 2010 7:26:20 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-31 Diego Gonzalez <​diego.gonzalez@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Custom user agent for user agent switcher
​https://bugs.webkit.org/show_bug.cgi?id=36757

• QtLauncher/main.cpp: (LauncherWindow::showUserAgentDialog):

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• QtLauncher/main.cpp (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-31  Diego Gonzalez  <diego.gonzalez@openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Custom user agent for user agent switcher
+        https://bugs.webkit.org/show_bug.cgi?id=36757
+
+        * QtLauncher/main.cpp:
+        (LauncherWindow::showUserAgentDialog):
+
 2010-03-31  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/QtLauncher/main.cpp

@@ -726 +726 @@
     }
 
+    QSettings settings;
+    QString customUserAgent = settings.value("CustomUserAgent").toString();
+    if (!items.contains(customUserAgent) && !customUserAgent.isEmpty())
+        items << customUserAgent;
+
     QDialog* dialog = new QDialog(this);
     dialog->setWindowTitle("Change User Agent");
@@ -734 +739 @@
     QComboBox* combo = new QComboBox(dialog);
     combo->setMaximumWidth(size().width() * 0.7);
+    combo->setEditable(true);
     combo->insertItems(0, items);
     layout->addWidget(combo);
+
+    int index = combo->findText(page()->userAgentForUrl(QUrl()));
+    combo->setCurrentIndex(index);
 
     QDialogButtonBox* buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok
@@ -743 +752 @@
     layout->addWidget(buttonBox);
 
-    if (dialog->exec() && !combo->currentText().isEmpty())
+    if (dialog->exec() && !combo->currentText().isEmpty()) {
         page()->setUserAgent(combo->currentText());
+        if (!items.contains(combo->currentText()))
+            settings.setValue("CustomUserAgent", combo->currentText());
+    }
 
     delete dialog;