diff --git a/qt-ui/preferences.cpp b/qt-ui/preferences.cpp index 5f7825c98..7f288ab1f 100644 --- a/qt-ui/preferences.cpp +++ b/qt-ui/preferences.cpp @@ -7,6 +7,7 @@ #include #include #include +#include PreferencesDialog *PreferencesDialog::instance() { @@ -25,6 +26,14 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Qt::WindowFlags f) : QDial ui.proxyType->addItem(tr("HTTP proxy"), QNetworkProxy::HttpProxy); ui.proxyType->addItem(tr("SOCKS proxy"), QNetworkProxy::Socks5Proxy); ui.proxyType->setCurrentIndex(-1); + + // Facebook stuff: + QUrl urlLogin("https://www.facebook.com/dialog/oauth?" + "client_id=427722490709000" + "&redirect_uri=http://www.facebook.com/connect/login_success.html"); + + ui.facebookWebView->setUrl(urlLogin); + connect(ui.proxyType, SIGNAL(currentIndexChanged(int)), this, SLOT(proxyType_changed(int))); connect(ui.buttonBox, SIGNAL(clicked(QAbstractButton *)), this, SLOT(buttonClicked(QAbstractButton *))); connect(ui.gflow, SIGNAL(valueChanged(int)), this, SLOT(gflowChanged(int))); diff --git a/qt-ui/preferences.ui b/qt-ui/preferences.ui index c021ae872..9611b49d9 100644 --- a/qt-ui/preferences.ui +++ b/qt-ui/preferences.ui @@ -6,6 +6,8 @@ 0 0 + 562 + 718 @@ -128,6 +130,11 @@ + + + Facebook + + @@ -139,7 +146,7 @@ - 0 + 5 @@ -964,6 +971,19 @@ + + + + + + + about:blank + + + + + + @@ -980,6 +1000,13 @@ + + + QWebView + QWidget +
QtWebKit/QWebView
+
+
@@ -1320,12 +1347,12 @@ + -