Mercurial > projects > qtd
changeset 113:8636c819ce4d
more porting
author | mandel |
---|---|
date | Wed, 03 Jun 2009 14:35:25 +0000 |
parents | e416c5215366 |
children | 547cd31fa12a |
files | demos/browser/bookmarks.d demos/browser/browserapplication.d demos/browser/browsermainwindow.d demos/browser/build demos/browser/cookiejar.d demos/browser/downloadmanager.d demos/browser/history.d demos/browser/settings.d demos/browser/toolbarsearch.d |
diffstat | 9 files changed, 52 insertions(+), 48 deletions(-) [+] |
line wrap: on
line diff
--- a/demos/browser/bookmarks.d Mon Jun 01 23:47:30 2009 +0000 +++ b/demos/browser/bookmarks.d Wed Jun 03 14:35:25 2009 +0000 @@ -57,6 +57,7 @@ import qt.gui.QIcon; import qt.gui.QMessageBox; import qt.gui.QToolButton; +import qt.gui.QTreeView; import qt.xml.QXmlStreamReader; import qt.webkit.QWebSettings; @@ -64,7 +65,6 @@ //import qt.core.QDebug; -import bookmarks; import autosaver; import browserapplication; import history; @@ -540,9 +540,10 @@ break; case Qt_ItemDataRole.DecorationRole: if (index.column() == 0) { + //TODO: is cast(void*) ok? if (bookmarkNode.type() == BookmarkNode.Type.Folder) - return new QVariant(QApplication.style().standardIcon(QStyle.SP_DirIcon)); - return new QVariant(BrowserApplication.instance().icon(bookmarkNode.url)); + return new QVariant(cast(void*) QApplication.style().standardIcon(QStyle.SP_DirIcon)); + return new QVariant(cast(void*) BrowserApplication.instance().icon(new QUrl(bookmarkNode.url))); } } @@ -716,7 +717,7 @@ while (!stream.atEnd()) { auto encodedData = new QByteArray; - stream >> encodedData; + //stream >> encodedData; //TODO auto buffer = new QBuffer(encodedData); buffer.open(QBuffer.ReadOnly); @@ -741,7 +742,7 @@ { if (!parent.isValid()) return true; - const BookmarkNode parentNode = node(parent); + BookmarkNode parentNode = node(parent); return (parentNode.type() == BookmarkNode.Type.Folder); } @@ -780,7 +781,7 @@ { super(parent); m_bookmarksManager = null; - this.activated.connect(&this.activated); + this.activated.connect(&this.activatedIndex); setMaxRows(-1); setHoverRole(BookmarksModel.Roles.UrlStringRole); setSeparatorRole(BookmarksModel.Roles.SeparatorRole); @@ -811,7 +812,7 @@ private: - void activated(QModelIndex index) + void activatedIndex(QModelIndex index) { openUrl.emit(index.data(BookmarksModel.Roles.UrlRole).toUrl()); } @@ -859,7 +860,7 @@ class AddBookmarkDialog : public QDialog //, public Ui_AddBookmarkDialog { - AddBookmarkDialog ui; + mixin Ui_AddBookmarkDialog; public: @@ -872,8 +873,8 @@ setWindowFlags(Qt.Sheet); if (!m_bookmarksManager) m_bookmarksManager = BrowserApplication.bookmarksManager(); - ui.setupUi(this); - QTreeView view = new QTreeView(this); + setupUi(this); + auto view = new QTreeView(this); m_proxyModel = new AddBookmarkProxyModel(this); BookmarksModel model = m_bookmarksManager.bookmarksModel(); m_proxyModel.setSourceModel(model); @@ -903,7 +904,7 @@ if (!index.isValid()) index = m_bookmarksManager.bookmarksModel().index(0, 0); BookmarkNode parent = m_bookmarksManager.bookmarksModel().node(index); - BookmarkNode bookmark = new BookmarkNode(BookmarkNode.Bookmark); + BookmarkNode bookmark = new BookmarkNode(BookmarkNode.Type.Bookmark); bookmark.url = m_url; bookmark.title = name.text(); m_bookmarksManager.addBookmark(parent, bookmark); @@ -922,7 +923,7 @@ //class TreeProxyModel; class BookmarksDialog : public QDialog //, public Ui_BookmarksDialog { - BookmarksDialog ui; + mixin Ui_BookmarksDialog; mixin Signal!("openUrl", QUrl /*url*/); @@ -934,7 +935,7 @@ m_bookmarksManager = manager; if (!m_bookmarksManager) m_bookmarksManager = BrowserApplication.bookmarksManager(); - ui.setupUi(this); + setupUi(this); tree.setUniformRowHeights(true); tree.setSelectionBehavior(QAbstractItemView.SelectRows); @@ -950,7 +951,7 @@ tree.setExpanded(m_proxyModel.index(0, 0), true); tree.setAlternatingRowColors(true); auto fm = new QFontMetrics(font()); - int header = fm.width(QLatin1Char('m')) * 40; + int header = fm.width("m") * 40; tree.header().resizeSection(0, header); tree.header().setStretchLastSection(true); tree.activated.connect(&this.open); @@ -975,10 +976,14 @@ QModelIndex index = tree.indexAt(pos); index = index.sibling(index.row(), 0); if (index.isValid() && !tree.model().hasChildren(index)) { - menu.addAction(tr("Open"), this, SLOT(open())); + auto action = new QAction(tr("Open"), this); + action.triggered.connect(&this.open); + menu.addAction(action); menu.addSeparator(); } - menu.addAction(tr("Delete"), tree, SLOT(removeOne())); + auto action = new QAction(tr("Delete"), this); + action.triggered.connect(&tree.removeOne); + menu.addAction(action); menu.exec(QCursor.pos()); } @@ -1008,7 +1013,7 @@ private: void expandNodes(BookmarkNode node) { - for (int i = 0; i < node.children().count(); ++i) { + for (int i = 0; i < node.children().length; ++i) { BookmarkNode childNode = node.children()[i]; if (childNode.expanded) { QModelIndex idx = m_bookmarksModel.index(childNode); @@ -1049,7 +1054,7 @@ class BookmarksToolBar : public QToolBar { -mixin Signal!("openUrl", QUrl /*url*/); + mixin Signal!("openUrl", QUrl /*url*/); public: @@ -1084,7 +1089,7 @@ QMimeData mimeData = event.mimeData(); if (mimeData.hasUrls()) event.acceptProposedAction(); - QToolBar.dragEnterEvent(event); + super.dragEnterEvent(event); } void dropEvent(QDropEvent event) @@ -1110,7 +1115,7 @@ break; } } - BookmarkNode bookmark = new BookmarkNode(BookmarkNode.Bookmark); + BookmarkNode bookmark = new BookmarkNode(BookmarkNode.Type.Bookmark); bookmark.url = urls[0].toString(); bookmark.title = mimeData.text(); @@ -1127,7 +1132,7 @@ void triggered(QAction action) { QVariant v = action.data(); - if (v.canConvert!(QUrl)()) { + if (v.canConvert(QVariant.Type.Url)) { openUrl.emit(v.toUrl()); } } @@ -1166,5 +1171,5 @@ private: BookmarksModel m_bookmarksModel; - QPersistentModelIndex m_root; + /*TODO: needed? QPersistentModelIndex*/ QModelIndex m_root; }
--- a/demos/browser/browserapplication.d Mon Jun 01 23:47:30 2009 +0000 +++ b/demos/browser/browserapplication.d Wed Jun 03 14:35:25 2009 +0000 @@ -49,6 +49,7 @@ import qt.core.QTextStream; import qt.core.QTranslator; import qt.core.QUrl; +import qt.core.QTimer; //import qt.core.QPointer; import qt.gui.QApplication; @@ -80,9 +81,9 @@ { public: - this(string[] args) + this(string[] arguments) { - super(args); + super(arguments); m_localServer = null; QCoreApplication.setOrganizationName("Trolltech"); QCoreApplication.setApplicationName("demobrowser"); @@ -102,9 +103,9 @@ auto stream = new QTextStream(&socket); string[] args = QCoreApplication.arguments(); if (args.length > 1) - stream << args[$-1]; - else - stream << ""; + stream.writeString(args[$-1]); + //else + // stream << ""; stream.flush(); socket.waitForBytesWritten(); return; @@ -128,7 +129,7 @@ version(QT_NO_OPENSSL) {} else { if (!QSslSocket.supportsSsl()) { - QMessageBox.information(0, "Demo Browser", + QMessageBox.information(null, "Demo Browser", "This system does not support OpenSSL. SSL websites will not be available."); } } @@ -138,7 +139,7 @@ installTranslator("qt_" ~ localSysName); - QSettings settings; + auto settings = new QSettings; settings.beginGroup("sessions"); m_lastSession = settings.value("lastSession").toByteArray(); settings.endGroup(); @@ -174,7 +175,7 @@ QWebSettings defaultSettings = QWebSettings.globalSettings(); string standardFontFamily = defaultSettings.fontFamily(QWebSettings.StandardFont); int standardFontSize = defaultSettings.fontSize(QWebSettings.DefaultFontSize); - QFont standardFont = QFont(standardFontFamily, standardFontSize); + QFont standardFont = new QFont(standardFontFamily, standardFontSize); standardFont = qVariantValue!(QFont)(settings.value("standardFont", standardFont)); defaultSettings.setFontFamily(QWebSettings.StandardFont, standardFont.family()); defaultSettings.setFontSize(QWebSettings.DefaultFontSize, standardFont.pointSize());
--- a/demos/browser/browsermainwindow.d Mon Jun 01 23:47:30 2009 +0000 +++ b/demos/browser/browsermainwindow.d Wed Jun 03 14:35:25 2009 +0000 @@ -704,7 +704,7 @@ { if (QAction action = cast(QAction) signalSender()) { QVariant v = action.data(); - if (v.canConvert!(int)()) { + if (v.canConvert(QVariant.Type.Int)) { int offset = cast(int) v; BrowserMainWindow[] windows = BrowserApplication.instance().mainWindows(); windows[offset].activateWindow();
--- a/demos/browser/build Mon Jun 01 23:47:30 2009 +0000 +++ b/demos/browser/build Wed Jun 03 14:35:25 2009 +0000 @@ -2,7 +2,6 @@ ../../tools/duic/duic bookmarks.ui -o ui_bookmarks.d ../../tools/duic/duic addbookmarkdialog.ui -o ui_addbookmarkdialog.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
--- a/demos/browser/cookiejar.d Mon Jun 01 23:47:30 2009 +0000 +++ b/demos/browser/cookiejar.d Wed Jun 03 14:35:25 2009 +0000 @@ -542,14 +542,14 @@ class CookiesDialog : public QDialog //, public Ui_CookiesDialog { - CookiesDialog ui; - + mixin Ui_CookiesDialog; + public: this(CookieJar cookieJar, QWidget parent = null) { super(parent); - ui.setupUi(this); + setupUi(this); setWindowFlags(Qt.Sheet); CookieModel model = new CookieModel(cookieJar, this); m_proxyModel = new QSortFilterProxyModel(this); @@ -729,7 +729,7 @@ class CookiesExceptionsDialog : public QDialog //, public Ui_CookiesExceptionsDialog { - CookiesExceptionsDialog ui; + mixin Ui_CookiesExceptionsDialog; public: @@ -737,7 +737,7 @@ { super(parent); m_cookieJar = cookieJar; - ui.setupUi(this); + setupUi(this); setWindowFlags(Qt.Sheet); removeButton.clicked.connect(&exceptionTable.removeOne); removeAllButton.clicked.connect(&exceptionTable.removeAll);
--- a/demos/browser/downloadmanager.d Mon Jun 01 23:47:30 2009 +0000 +++ b/demos/browser/downloadmanager.d Wed Jun 03 14:35:25 2009 +0000 @@ -68,7 +68,7 @@ class DownloadItem : public QWidget //, public Ui_DownloadItem { mixin Signal!("statusChanged"); - DownloadItem ui; + mixin Ui_DownloadItem; public: @@ -84,7 +84,7 @@ m_requestFileName = requestFileName; m_bytesReceived = 0; - ui.setupUi(this); + setupUi(this); QPalette p = downloadInfoLabel.palette(); p.setColor(QPalette.Text, Qt.darkGray); downloadInfoLabel.setPalette(p); @@ -355,7 +355,7 @@ class DownloadManager : public QDialog //, public Ui_DownloadDialog { - DownloadDialog ui; + mixin Ui_DownloadDialog; public: @@ -380,7 +380,7 @@ m_iconProvider = 0; m_removePolicy = RemovePolicy.Never; - ui.setupUi(this); + setupUi(this); downloadsView.setShowGrid(false); downloadsView.verticalHeader().hide(); downloadsView.horizontalHeader().hide();
--- a/demos/browser/history.d Mon Jun 01 23:47:30 2009 +0000 +++ b/demos/browser/history.d Wed Jun 03 14:35:25 2009 +0000 @@ -1374,10 +1374,9 @@ import ui_history; -class HistoryDialog : public QDialog//, public Ui_HistoryDialog +class HistoryDialog : public QDialog //, public Ui_HistoryDialog { - HistoryDialog ui; - + mixin Ui_HistoryDialog; mixin Signal!("openUrl", QUrl /*url*/); public: @@ -1388,7 +1387,7 @@ HistoryManager history = setHistory; if (!history) history = BrowserApplication.historyManager(); - ui.setupUi(this); + setupUi(this); tree.setUniformRowHeights(true); tree.setSelectionBehavior(QAbstractItemView.SelectRows); tree.setTextElideMode(Qt_TextElideMode.ElideMiddle);
--- a/demos/browser/settings.d Mon Jun 01 23:47:30 2009 +0000 +++ b/demos/browser/settings.d Wed Jun 03 14:35:25 2009 +0000 @@ -59,14 +59,14 @@ class SettingsDialog : public QDialog //, public Ui_Settings { - Settings ui; + mixin Ui_Settings; public: this(QWidget parent = null) { super(this); - ui.setupUi(this); + setupUi(this); exceptionsButton.clicked.connect(&this.showExceptions); setHomeToCurrentPageButton.clicked.connect(&this.setHomeToCurrentPage); cookiesButton.clicked.connect(&this.showCookies());
--- a/demos/browser/toolbarsearch.d Mon Jun 01 23:47:30 2009 +0000 +++ b/demos/browser/toolbarsearch.d Wed Jun 03 14:35:25 2009 +0000 @@ -157,7 +157,7 @@ void triggeredMenuAction(QAction action) { QVariant v = action.data(); - if (v.canConvert!(string)()) { + if (v.canConvert(QVariant.Type.String)) { string text = v.toString(); lineEdit().setText(text); searchNow();