# HG changeset patch
# User mandel
# Date 1244989664 0
# Node ID a8d76a9a85aab8403ddb04af6313504d95a02f7d
# Parent 7bc921c7100a5b6e1d4dbfa5b5e9cad8f92767eb
more porting
diff -r 7bc921c7100a -r a8d76a9a85aa demos/browser/TODO.txt
--- a/demos/browser/TODO.txt Sat Jun 13 16:37:42 2009 +0000
+++ b/demos/browser/TODO.txt Sun Jun 14 14:27:44 2009 +0000
@@ -2,6 +2,5 @@
Todo:
- implement functionality from QList, QString and QStringList
-- resolve multiple inheritance, commented for now
- fix segfaults due to not initialized variables
- ...
\ No newline at end of file
diff -r 7bc921c7100a -r a8d76a9a85aa demos/browser/bookmarks.d
--- a/demos/browser/bookmarks.d Sat Jun 13 16:37:42 2009 +0000
+++ b/demos/browser/bookmarks.d Sun Jun 14 14:27:44 2009 +0000
@@ -918,7 +918,7 @@
AddBookmarkProxyModel m_proxyModel;
}
-import ui_bookmarks;
+import ui_bookmarksdialog;
//class TreeProxyModel;
class BookmarksDialog : public QDialog //, public Ui_BookmarksDialog
diff -r 7bc921c7100a -r a8d76a9a85aa demos/browser/bookmarks.ui
--- a/demos/browser/bookmarks.ui Sat Jun 13 16:37:42 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-
- BookmarksDialog
-
-
-
- 0
- 0
- 758
- 450
-
-
-
- Bookmarks
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 252
- 20
-
-
-
-
- -
-
-
- -
-
-
- -
-
-
-
-
-
- &Remove
-
-
-
- -
-
-
- Add Folder
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- QDialogButtonBox::Ok
-
-
-
-
-
-
-
-
-
- SearchLineEdit
- QLineEdit
-
-
-
- EditTreeView
- QTreeView
-
-
-
-
-
-
- buttonBox
- accepted()
- BookmarksDialog
- accept()
-
-
- 472
- 329
-
-
- 461
- 356
-
-
-
-
-
diff -r 7bc921c7100a -r a8d76a9a85aa demos/browser/bookmarksdialog.ui
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/demos/browser/bookmarksdialog.ui Sun Jun 14 14:27:44 2009 +0000
@@ -0,0 +1,106 @@
+
+ BookmarksDialog
+
+
+
+ 0
+ 0
+ 758
+ 450
+
+
+
+ Bookmarks
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 252
+ 20
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
-
+
+
+ &Remove
+
+
+
+ -
+
+
+ Add Folder
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ QDialogButtonBox::Ok
+
+
+
+
+
+
+
+
+
+ SearchLineEdit
+ QLineEdit
+
+
+
+ EditTreeView
+ QTreeView
+
+
+
+
+
+
+ buttonBox
+ accepted()
+ BookmarksDialog
+ accept()
+
+
+ 472
+ 329
+
+
+ 461
+ 356
+
+
+
+
+
diff -r 7bc921c7100a -r a8d76a9a85aa demos/browser/browserapplication.d
--- a/demos/browser/browserapplication.d Sat Jun 13 16:37:42 2009 +0000
+++ b/demos/browser/browserapplication.d Sun Jun 14 14:27:44 2009 +0000
@@ -130,11 +130,11 @@
version(QT_NO_OPENSSL) {} else {
if (!QSslSocket.supportsSsl()) {
QMessageBox.information(null, "Demo Browser",
- "This system does not support OpenSSL. SSL websites will not be available.");
+ "This system does not support OpenSSL. SSL websites will not be available.");
}
}
- QDesktopServices.setUrlHandler("http", this, "openUrl");
+ QDesktopServices.setUrlHandler("http", &this.openUrl);
string localSysName = QLocale.system().name();
installTranslator("qt_" ~ localSysName);
@@ -169,26 +169,26 @@
void loadSettings()
{
- QSettings settings;
+ QSettings settings = new QSettings;
settings.beginGroup("websettings");
QWebSettings defaultSettings = QWebSettings.globalSettings();
string standardFontFamily = defaultSettings.fontFamily(QWebSettings.StandardFont);
int standardFontSize = defaultSettings.fontSize(QWebSettings.DefaultFontSize);
QFont standardFont = new QFont(standardFontFamily, standardFontSize);
- standardFont = qVariantValue!(QFont)(settings.value("standardFont", standardFont));
+ standardFont = QVariant.fromValue!(QFont)(settings.value("standardFont", standardFont));
defaultSettings.setFontFamily(QWebSettings.StandardFont, standardFont.family());
defaultSettings.setFontSize(QWebSettings.DefaultFontSize, standardFont.pointSize());
string fixedFontFamily = defaultSettings.fontFamily(QWebSettings.FixedFont);
int fixedFontSize = defaultSettings.fontSize(QWebSettings.DefaultFixedFontSize);
- QFont fixedFont = QFont(fixedFontFamily, fixedFontSize);
- fixedFont = qVariantValue!(QFont)(settings.value("fixedFont", fixedFont));
+ QFont fixedFont = new QFont(fixedFontFamily, fixedFontSize);
+ fixedFont = QVariant.fromValue!(QFont)(settings.value("fixedFont", fixedFont));
defaultSettings.setFontFamily(QWebSettings.FixedFont, fixedFont.family());
defaultSettings.setFontSize(QWebSettings.DefaultFixedFontSize, fixedFont.pointSize());
- defaultSettings.setAttribute(QWebSettings.JavascriptEnabled, settings.value("enableJavascript", true).toBool());
- defaultSettings.setAttribute(QWebSettings.PluginsEnabled, settings.value("enablePlugins", true).toBool());
+ defaultSettings.setAttribute(QWebSettings.JavascriptEnabled, settings.value("enableJavascript", new QVariant(true)).toBool());
+ defaultSettings.setAttribute(QWebSettings.PluginsEnabled, settings.value("enablePlugins", new QVariant(true)).toBool());
QUrl url = settings.value("userStyleSheet").toUrl();
defaultSettings.setUserStyleSheetUrl(url);
@@ -198,7 +198,7 @@
bool isTheOnlyBrowser()
{
- return (m_localServer != null);
+ return (m_localServer !is null);
}
BrowserMainWindow mainWindow()
@@ -236,15 +236,15 @@
clean();
- QSettings settings;
+ QSettings settings = new QSettings;
settings.beginGroup("sessions");
- QByteArray data;
+ QByteArray data = new QByteArray;
auto buffer = new QBuffer(&data);
auto stream = new QDataStream(&buffer);
buffer.open(QIODevice.ReadWrite);
- stream << m_mainWindows.length;
+ stream.writeLong(m_mainWindows.length);
for (int i = 0; i < m_mainWindows.length; ++i)
stream << m_mainWindows[i].saveState();
settings.setValue("lastSession", data);
@@ -347,7 +347,7 @@
stream >> windowState;
windows ~= windowState;
}
- for (int i = 0; i < windows.count(); ++i) {
+ for (int i = 0; i < windows.length; ++i) {
BrowserMainWindow newWindow = 0;
if (m_mainWindows.length == 1 && mainWindow().tabWidget().count() == 1
&& mainWindow().currentTab().getUrl() is null) {
@@ -413,7 +413,7 @@
// newMainWindow() needs to be called in main() for this to happen
if (m_mainWindows.length > 0) {
string[] args = QCoreApplication.arguments();
- if (args.count() > 1)
+ if (args.length > 1)
mainWindow().loadPage(args.last());
else
mainWindow().slotHome();
@@ -421,7 +421,7 @@
BrowserApplication.historyManager();
}
- void openUrl( QUrl url)
+ void openUrl(QUrl url)
{
mainWindow().loadPage(url.toString());
}
@@ -432,13 +432,13 @@
if (!socket)
return;
socket.waitForReadyRead(1000);
- QTextStream stream(socket);
+ auto stream = new QTextStream(socket);
string url;
stream >> url;
- if (!url.isEmpty()) {
+ if (url.length) {
QSettings settings;
settings.beginGroup("general");
- int openLinksIn = settings.value("openLinksIn", 0).toInt();
+ int openLinksIn = settings.value("openLinksIn", new QVariant(0)).toInt();
settings.endGroup();
if (openLinksIn == 1)
newMainWindow();
@@ -457,7 +457,7 @@
{
// cleanup any deleted main windows first
for (int i = m_mainWindows.length - 1; i >= 0; --i)
- if (m_mainWindows[i].isNull())
+ if (m_mainWindows[i] is null)
m_mainWindows.removeAt(i);
}
diff -r 7bc921c7100a -r a8d76a9a85aa demos/browser/build
--- a/demos/browser/build Sat Jun 13 16:37:42 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-#! /bin/bash
-
-../../tools/duic/duic bookmarks.ui -o ui_bookmarks.d
-../../tools/duic/duic addbookmarkdialog.ui -o ui_addbookmarkdialog.d
-../../tools/duic/duic cookiesexceptions.ui -o ui_cookiesexceptions.d
-../../tools/duic/duic cookies.ui -o ui_cookies.d
-../../tools/duic/duic downloaditem.ui -o ui_downloaditem.d
-../../tools/duic/duic downloads.ui -o ui_downloads.d
-../../tools/duic/duic history.ui -o ui_history.d
-../../tools/duic/duic passworddialog.ui -o ui_passworddialog.d
-../../tools/duic/duic proxy.ui -o ui_proxy.d
-../../tools/duic/duic settings.ui -o ui_settings.d
-
-ldc *.d -L-L../../lib -L-lqtdgui -L-lqtdcore -I../../ -I../../qt/d1 -L-lQtGui -L-lQtCore -ofbrowser -d-version=QT_NO_UITOOLS
diff -r 7bc921c7100a -r a8d76a9a85aa demos/browser/build.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/demos/browser/build.sh Sun Jun 14 14:27:44 2009 +0000
@@ -0,0 +1,14 @@
+#! /bin/bash
+
+../../tools/duic/duic bookmarksdialog.ui -o ui_bookmarksdialog.d
+../../tools/duic/duic addbookmarkdialog.ui -o ui_addbookmarkdialog.d
+../../tools/duic/duic cookiesexceptionsdialog.ui -o ui_cookiesexceptionsdialog.d
+../../tools/duic/duic cookiesdialog.ui -o ui_cookiesdialog.d
+../../tools/duic/duic downloaditem.ui -o ui_downloaditem.d
+../../tools/duic/duic downloaddialog.ui -o ui_downloaddialog.d
+../../tools/duic/duic historydialog.ui -o ui_historydialog.d
+../../tools/duic/duic passworddialog.ui -o ui_passworddialog.d
+../../tools/duic/duic proxydialog.ui -o ui_proxydialog.d
+../../tools/duic/duic settings.ui -o ui_settings.d
+
+ldc *.d -L-L../../lib -L-lqtdgui -L-lqtdcore -I../../ -I../../qt/d1 -L-lQtGui -L-lQtCore -ofbrowser -d-version=QT_NO_UITOOLS
diff -r 7bc921c7100a -r a8d76a9a85aa demos/browser/cookiejar.d
--- a/demos/browser/cookiejar.d Sat Jun 13 16:37:42 2009 +0000
+++ b/demos/browser/cookiejar.d Sun Jun 14 14:27:44 2009 +0000
@@ -536,8 +536,8 @@
}
-import ui_cookies;
-import ui_cookiesexceptions;
+import ui_cookiesdialog;
+import ui_cookiesexceptionsdialog;
class CookiesDialog : public QDialog //, public Ui_CookiesDialog
diff -r 7bc921c7100a -r a8d76a9a85aa demos/browser/cookies.ui
--- a/demos/browser/cookies.ui Sat Jun 13 16:37:42 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-
- CookiesDialog
-
-
-
- 0
- 0
- 550
- 370
-
-
-
- Cookies
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 252
- 20
-
-
-
-
- -
-
-
- -
-
-
- -
-
-
-
-
-
- &Remove
-
-
-
- -
-
-
- Remove &All Cookies
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- QDialogButtonBox::Ok
-
-
-
-
-
-
-
-
-
- SearchLineEdit
- QLineEdit
-
-
-
- EditTableView
- QTableView
-
-
-
-
-
-
- buttonBox
- accepted()
- CookiesDialog
- accept()
-
-
- 472
- 329
-
-
- 461
- 356
-
-
-
-
-
diff -r 7bc921c7100a -r a8d76a9a85aa demos/browser/cookiesdialog.ui
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/demos/browser/cookiesdialog.ui Sun Jun 14 14:27:44 2009 +0000
@@ -0,0 +1,106 @@
+
+ CookiesDialog
+
+
+
+ 0
+ 0
+ 550
+ 370
+
+
+
+ Cookies
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 252
+ 20
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
-
+
+
+ &Remove
+
+
+
+ -
+
+
+ Remove &All Cookies
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ QDialogButtonBox::Ok
+
+
+
+
+
+
+
+
+
+ SearchLineEdit
+ QLineEdit
+
+
+
+ EditTableView
+ QTableView
+
+
+
+
+
+
+ buttonBox
+ accepted()
+ CookiesDialog
+ accept()
+
+
+ 472
+ 329
+
+
+ 461
+ 356
+
+
+
+
+
diff -r 7bc921c7100a -r a8d76a9a85aa demos/browser/cookiesexceptions.ui
--- a/demos/browser/cookiesexceptions.ui Sat Jun 13 16:37:42 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,184 +0,0 @@
-
- CookiesExceptionsDialog
-
-
-
- 0
- 0
- 466
- 446
-
-
-
- Cookie Exceptions
-
-
- -
-
-
- New Exception
-
-
-
-
-
-
-
-
-
- Domain:
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 81
- 25
-
-
-
-
- -
-
-
- false
-
-
- Block
-
-
-
- -
-
-
- false
-
-
- Allow For Session
-
-
-
- -
-
-
- false
-
-
- Allow
-
-
-
-
-
-
-
-
- -
-
-
- Exceptions
-
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 252
- 20
-
-
-
-
- -
-
-
- -
-
-
- -
-
-
- &Remove
-
-
-
- -
-
-
- Remove &All
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Ok
-
-
-
-
-
-
-
- SearchLineEdit
- QLineEdit
-
-
-
- EditTableView
- QTableView
-
-
-
-
-
-
- buttonBox
- accepted()
- CookiesExceptionsDialog
- accept()
-
-
- 381
- 428
-
-
- 336
- 443
-
-
-
-
-
diff -r 7bc921c7100a -r a8d76a9a85aa demos/browser/cookiesexceptionsdialog.ui
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/demos/browser/cookiesexceptionsdialog.ui Sun Jun 14 14:27:44 2009 +0000
@@ -0,0 +1,184 @@
+
+ CookiesExceptionsDialog
+
+
+
+ 0
+ 0
+ 466
+ 446
+
+
+
+ Cookie Exceptions
+
+
+ -
+
+
+ New Exception
+
+
+
-
+
+
-
+
+
+ Domain:
+
+
+
+ -
+
+
+
+
+ -
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 81
+ 25
+
+
+
+
+ -
+
+
+ false
+
+
+ Block
+
+
+
+ -
+
+
+ false
+
+
+ Allow For Session
+
+
+
+ -
+
+
+ false
+
+
+ Allow
+
+
+
+
+
+
+
+
+ -
+
+
+ Exceptions
+
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 252
+ 20
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ &Remove
+
+
+
+ -
+
+
+ Remove &All
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Ok
+
+
+
+
+
+
+
+ SearchLineEdit
+ QLineEdit
+
+
+
+ EditTableView
+ QTableView
+
+
+
+
+
+
+ buttonBox
+ accepted()
+ CookiesExceptionsDialog
+ accept()
+
+
+ 381
+ 428
+
+
+ 336
+ 443
+
+
+
+
+
diff -r 7bc921c7100a -r a8d76a9a85aa demos/browser/downloaddialog.ui
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/demos/browser/downloaddialog.ui Sun Jun 14 14:27:44 2009 +0000
@@ -0,0 +1,83 @@
+
+ DownloadDialog
+
+
+
+ 0
+ 0
+ 332
+ 252
+
+
+
+ Downloads
+
+
+
+ 0
+
+
+ 0
+
+ -
+
+
+ -
+
+
-
+
+
+ false
+
+
+ Clean up
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 58
+ 24
+
+
+
+
+
+
+ -
+
+
+ 0 Items
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 148
+ 20
+
+
+
+
+
+
+
+
+ EditTableView
+ QTableView
+
+
+
+
+
+
diff -r 7bc921c7100a -r a8d76a9a85aa demos/browser/downloaditem.ui
--- a/demos/browser/downloaditem.ui Sat Jun 13 16:37:42 2009 +0000
+++ b/demos/browser/downloaditem.ui Sun Jun 14 14:27:44 2009 +0000
@@ -126,7 +126,7 @@
SqueezeLabel
QWidget
-
+
diff -r 7bc921c7100a -r a8d76a9a85aa demos/browser/downloadmanager.d
--- a/demos/browser/downloadmanager.d Sat Jun 13 16:37:42 2009 +0000
+++ b/demos/browser/downloadmanager.d Sun Jun 14 14:27:44 2009 +0000
@@ -57,11 +57,10 @@
import tango.text.convert.Format;
-//import math;
import autosaver;
import browserapplication;
import networkaccessmanager;
-import ui_downloads;
+import ui_downloaddialog;
import ui_downloaditem;
diff -r 7bc921c7100a -r a8d76a9a85aa demos/browser/downloads.ui
--- a/demos/browser/downloads.ui Sat Jun 13 16:37:42 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-
- DownloadDialog
-
-
-
- 0
- 0
- 332
- 252
-
-
-
- Downloads
-
-
-
- 0
-
-
- 0
-
- -
-
-
- -
-
-
-
-
-
- false
-
-
- Clean up
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 58
- 24
-
-
-
-
-
-
- -
-
-
- 0 Items
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 148
- 20
-
-
-
-
-
-
-
-
- EditTableView
- QTableView
-
-
-
-
-
-
diff -r 7bc921c7100a -r a8d76a9a85aa demos/browser/edittableview.d
--- a/demos/browser/edittableview.d Sat Jun 13 16:37:42 2009 +0000
+++ b/demos/browser/edittableview.d Sun Jun 14 14:27:44 2009 +0000
@@ -38,7 +38,6 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-
module edittableview;
diff -r 7bc921c7100a -r a8d76a9a85aa demos/browser/history.d
--- a/demos/browser/history.d Sat Jun 13 16:37:42 2009 +0000
+++ b/demos/browser/history.d Sun Jun 14 14:27:44 2009 +0000
@@ -1372,7 +1372,7 @@
}
-import ui_history;
+import ui_historydialog;
class HistoryDialog : public QDialog //, public Ui_HistoryDialog
{
diff -r 7bc921c7100a -r a8d76a9a85aa demos/browser/history.ui
--- a/demos/browser/history.ui Sat Jun 13 16:37:42 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-
- HistoryDialog
-
-
-
- 0
- 0
- 758
- 450
-
-
-
- History
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 252
- 20
-
-
-
-
- -
-
-
- -
-
-
- -
-
-
-
-
-
- &Remove
-
-
-
- -
-
-
- Remove &All
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- QDialogButtonBox::Ok
-
-
-
-
-
-
-
-
-
- SearchLineEdit
- QLineEdit
-
-
-
- EditTreeView
- QTreeView
-
-
-
-
-
-
- buttonBox
- accepted()
- HistoryDialog
- accept()
-
-
- 472
- 329
-
-
- 461
- 356
-
-
-
-
-
diff -r 7bc921c7100a -r a8d76a9a85aa demos/browser/historydialog.ui
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/demos/browser/historydialog.ui Sun Jun 14 14:27:44 2009 +0000
@@ -0,0 +1,106 @@
+
+ HistoryDialog
+
+
+
+ 0
+ 0
+ 758
+ 450
+
+
+
+ History
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 252
+ 20
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
-
+
+
+ &Remove
+
+
+
+ -
+
+
+ Remove &All
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ QDialogButtonBox::Ok
+
+
+
+
+
+
+
+
+
+ SearchLineEdit
+ QLineEdit
+
+
+
+ EditTreeView
+ QTreeView
+
+
+
+
+
+
+ buttonBox
+ accepted()
+ HistoryDialog
+ accept()
+
+
+ 472
+ 329
+
+
+ 461
+ 356
+
+
+
+
+
diff -r 7bc921c7100a -r a8d76a9a85aa demos/browser/networkaccessmanager.d
--- a/demos/browser/networkaccessmanager.d Sat Jun 13 16:37:42 2009 +0000
+++ b/demos/browser/networkaccessmanager.d Sun Jun 14 14:27:44 2009 +0000
@@ -38,20 +38,16 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-
module networkaccessmanager;
-import qt.network.QNetworkAccessManager;
-
import qt.core.QSettings;
-
import qt.gui.QDesktopServices;
import qt.gui.QDialog;
import qt.gui.QMessageBox;
import qt.gui.QStyle;
import qt.gui.QTextDocument;
-
+import qt.network.QNetworkAccessManager;
import qt.network.QAuthenticator;
import qt.network.QNetworkDiskCache;
import qt.network.QNetworkProxy;
@@ -61,7 +57,7 @@
import browserapplication;
import browsermainwindow;
import ui_passworddialog;
-import ui_proxy;
+import ui_proxydialog;
class NetworkAccessManager : public QNetworkAccessManager
diff -r 7bc921c7100a -r a8d76a9a85aa demos/browser/proxy.ui
--- a/demos/browser/proxy.ui Sat Jun 13 16:37:42 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-
- ProxyDialog
-
-
-
- 0
- 0
- 369
- 144
-
-
-
- Proxy Authentication
-
-
- -
-
-
- ICON
-
-
-
- -
-
-
- Connect to proxy
-
-
- true
-
-
-
- -
-
-
- Username:
-
-
-
- -
-
-
- -
-
-
- Password:
-
-
-
- -
-
-
- QLineEdit::Password
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
-
-
-
- buttonBox
- accepted()
- ProxyDialog
- accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- ProxyDialog
- reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
-
-
-
diff -r 7bc921c7100a -r a8d76a9a85aa demos/browser/proxydialog.ui
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/demos/browser/proxydialog.ui Sun Jun 14 14:27:44 2009 +0000
@@ -0,0 +1,104 @@
+
+ ProxyDialog
+
+
+
+ 0
+ 0
+ 369
+ 144
+
+
+
+ Proxy Authentication
+
+
+ -
+
+
+ ICON
+
+
+
+ -
+
+
+ Connect to proxy
+
+
+ true
+
+
+
+ -
+
+
+ Username:
+
+
+
+ -
+
+
+ -
+
+
+ Password:
+
+
+
+ -
+
+
+ QLineEdit::Password
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+
+
+
+
+
+ buttonBox
+ accepted()
+ ProxyDialog
+ accept()
+
+
+ 248
+ 254
+
+
+ 157
+ 274
+
+
+
+
+ buttonBox
+ rejected()
+ ProxyDialog
+ reject()
+
+
+ 316
+ 260
+
+
+ 286
+ 274
+
+
+
+
+