projects/qtd: demos/browser/history.d comparison

comparison demos/browser/history.d @ 73:7bfd46c330dc

more porting

author	mandel
date	Fri, 22 May 2009 10:59:00 +0000
parents	b149ef2cb18b
children	37caa90ce503

comparison

equal deleted inserted replaced

-:b149ef2cb18b
+:7bfd46c330dc
 import qt.core.QHash;
 import qt.core.QObject;
 import qt.core.QTimer;
 import qt.core.QUrl;
-import QtWebKit.QWebHistoryInterface;
+import qt.webkit.QWebHistoryInterface;
-import QtWebKit.QWebSettings;
+import qtWebkit.QWebSettings;
 import QWebHistoryInterface;
 import autosaver
 import browserapplication;
 }
 class HistoryManager : public QWebHistoryInterface
 {
-	//Q_PROPERTY(int historyLimit READ historyLimit WRITE setHistoryLimit)
 	mixin Signal!("historyReset");
 	mixin Signal!("entryAdded", HistoryItem item);
 	mixin Signal!("entryRemoved", HistoryItem item);
 	mixin Signal!("entryUpdated", int offset);
 		// QWebHistoryInterface will delete the history manager
 		QWebHistoryInterface.setDefaultInterface(this);
 	}
 	~this()
 	{
 		m_saveTimer.saveIfNeccessary();
 	}
 	bool historyContains(QString &url)
 	{
 		return m_historyFilterModel.historyContains(url);
 	}
 	int historyLimit()
 	{
 		return m_historyLimit;
 	}
 	void setHistoryLimit(int limit)
 	{
 		if (m_historyLimit == limit)
 			return;
 		m_historyLimit = limit;
 		checkForExpired();
 		m_saveTimer.changeOccurred();
 	}
 	QList<HistoryItem> history()
 	{
 		return m_history;
 	}
 	void setHistory(QList<HistoryItem> &history, bool loadedAndSorted = false);
 	{
 		m_history = history;
 			m_saveTimer.changeOccurred();
 		}
 		emit historyReset();
 	}
 	// History manager keeps around these models for use by the completer and other classes
 	HistoryModel historyModel();
 	{
 		return m_historyModel;
 	}
 	HistoryFilterModel historyFilterModel()
 	{
 		return m_historyFilterModel;
 	}
 	HistoryTreeModel historyTreeModel()
 	{
 		return m_historyTreeModel;
 	}
+public:
-public slots:
 	void clear()
 	{
 		m_history.clear();
 		m_lastSavedUrl = QString();
 	HistoryModel m_historyModel;
 	HistoryFilterModel m_historyFilterModel;
 	HistoryTreeModel m_historyTreeModel;
 }
 class HistoryModel : public QAbstractTableModel
 {
 public:
 	void historyReset()
 	enum Roles {
 		DateRole = Qt.UserRole + 1,
 		DateTimeRole = Qt.UserRole + 2,
 		UrlRole = Qt.UserRole + 3,
 		UrlStringRole = Qt.UserRole + 4
-	}
+	};
 	this(HistoryManager history, QObject parent = null)
 	{
 		super(parent);
 		m_history = history;
 			return QModelIndex();
 		return createIndex(realRow, sourceIndex.column(), sourceModel().rowCount() - sourceIndex.row());
 	}
 	QModelIndex mapToSource(QModelIndex proxyIndex)
 	{
 		load();
 		int sourceRow = sourceModel().rowCount() - proxyIndex.internalId();
 		return sourceModel().index(sourceRow, proxyIndex.column());
 	QVariant data(QModelIndex index, int role = Qt.DisplayRole);
 	{
 		return QAbstractProxyModel.data(index, role);
 	}
-private slots:
+private:
 	void sourceReset()
 	{
 		m_loaded = false;
 		reset();
 	}
 	void sourceDataChanged(QModelIndex topLeft, QModelIndex bottomRight)
 	{
 		emit dataChanged(mapFromSource(topLeft), mapFromSource(bottomRight));
 	}
 	{
 		//Q_UNUSED(start);
 		//Q_UNUSED(end);
 		sourceReset();
 	}
 	void sourceRowsInserted(QModelIndex parent, int start, int end)
 	{
 		assert(start == end && start == 0);
 		//Q_UNUSED(end);
 	QList<int> m_sourceRow;
 	QHash<QString, int> m_historyHash;
 	bool m_loaded;
 }
 /*
 The history menu
 - Removes the first twenty entries and puts them as children of the top level.
 - If there are less then twenty entries then the first folder is also removed.
 private:
 	HistoryTreeModel m_treeModel;
 }
 // Menu that is dynamically populated from the history
 class HistoryMenu : public ModelMenu
 {
 	mixin Signal!("openUrl", QUrl url);
 		QAction clearAction = new QAction(tr("Clear History"), this);
 		clearAction.triggered.connect(&m_history.clear);
 		addAction(clearAction);
 	}
-private slots:
+private:
 	void activated(QModelIndex index)
 	{
 		emit openUrl(index.data(HistoryModel.UrlRole).toUrl());
 	}
 	{
 		auto dialog = new HistoryDialog(this);
 		dialog.openUrl(QUrl).connect(&this.openUrl(QUrl));
 		dialog.show();
 	}
 private:
 	HistoryManager m_history;
 	HistoryMenuModel m_historyMenuModel;
 // proxy model for the history model that
 // exposes each url http://www.foo.com and it url starting at the host www.foo.com
 class HistoryCompletionModel : public QAbstractProxyModel
 {
 public:
 	this(QObject parent = null)
 	{
 		super(parent);
 	}
 	QVariant data(QModelIndex index, int role)
 	{
-		if (sourceModel()
+		if (sourceModel() && (role == Qt.EditRole || role == Qt.DisplayRole) && index.isValid()) {
-		&& (role == Qt.EditRole || role == Qt.DisplayRole)
-		&& index.isValid()) {
 			QModelIndex idx = mapToSource(index);
 			idx = idx.sibling(idx.row(), 1);
 			QString urlString = idx.data(HistoryModel.UrlStringRole).toString();
 			if (index.row() % 2) {
 				QUrl url = urlString;
 	void setSourceModel(QAbstractItemModel sourceModel);
 	{
 		if (sourceModel()) {
 			sourceModel.modelReset.disconnect(&this.sourceReset);
-			sourceModel.rowsInserted(QModelIndex , int, int).disconnect(&this.sourceReset);
+			sourceModel.rowsInserted.disconnect(&this.sourceReset);
-			sourceModel.rowsRemoved(QModelIndex , int, int).disconnect(&this.sourceReset);
+			sourceModel.rowsRemoved.disconnect(&this.sourceReset);
 		}
 		QAbstractProxyModel.setSourceModel(newSourceModel);
 		if (newSourceModel) {
 			newSourceModel.modelReset.connect(&this.sourceReset);
-			sourceModel.rowsInserted(QModelIndex , int, int).connect(&this.sourceReset);
+			sourceModel.rowsInserted.connect(&this.sourceReset);
-			sourceModel.rowsRemoved(QModelIndex , int, int).connect(&this.sourceReset);
+			sourceModel.rowsRemoved.connect(&this.sourceReset);
 		}
 		reset();
 	}
-private slots:
+private:
 	void sourceReset()
 	{
 		reset();
 	}
 }
 // proxy model for the history model that converts the list
 // into a tree, one top level node per day.
 // Used in the HistoryDialog.
 class HistoryTreeModel : public QAbstractProxyModel
 			}
 		}
 		return true;
 	}
 	QVariant headerData(int section, Qt.Orientation orientation, int role = Qt.DisplayRole)
 	{
 		return sourceModel().headerData(section, orientation, role);
 	}
 	void setSourceModel(QAbstractItemModel newSourceModel)
 	{
 		if (sourceModel()) {
 			sourceModel.modelReset.disconnect(&this.sourceReset);
 		}
 		reset();
 	}
+private:
-private slots:
 	void sourceReset()
 	{
 		m_sourceRowCache.clear();
 		reset();
 	}
 	void sourceRowsInserted(QModelIndex parent, int start, int end);
 	{
-		Q_UNUSED(parent); // Avoid warnings when compiling release
+		//Q_UNUSED(parent); // Avoid warnings when compiling release
 		assert(!parent.isValid());
 		if (start != 0 || start != end) {
 			m_sourceRowCache.clear();
 			reset();
 			return;
 	}
 	QList<int> m_sourceRowCache;
 }
 // A modified QSortFilterProxyModel that always accepts the root nodes in the tree
 // so filtering is only done on the children.
 // Used in the HistoryDialog
 class TreeProxyModel : public QSortFilterProxyModel
 {
 		if (!source_parent.isValid())
 			return true;
 		return QSortFilterProxyModel.filterAcceptsRow(source_row, source_parent);
 	}
 }
 import ui_history;
 class HistoryDialog : public QDialog, public Ui_HistoryDialog
 {
 		}
 		menu.addAction(tr("Delete"), tree, SLOT(removeOne()));
 		menu.exec(QCursor.pos());
 	}
 	void open()
 	{
 		QModelIndex index = tree.currentIndex();
 		if (!index.parent().isValid())
 			return;

Mercurial > projects > qtd

comparison demos/browser/history.d @ 73:7bfd46c330dc