projects / konrad/DeclarativeWidgets.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch (parent: 620d87f)
Add support for TextBrowser
authorTobias Koenig <tobias.koenig@kdab.com>
Sun, 28 Oct 2012 07:25:32 +0000 (08:25 +0100)
committerTobias Koenig <tobias.koenig@kdab.com>
Sun, 28 Oct 2012 07:25:32 +0000 (08:25 +0100)
declarativeobjects.cpp patch | blob | history
declarativeobjects_p.h patch | blob | history
declarativewidgetdocument.cpp patch | blob | history
gallery.qml patch | blob | history
qwidgets.list patch | blob | history

diff --git a/declarativeobjects.cpp b/declarativeobjects.cpp
index 2b56b7f..29cb0c9 100644 (file)
--- a/declarativeobjects.cpp
+++ b/declarativeobjects.cpp
@@ -1334,6 +1334,14 @@ DeclarativeTabWidgetAttached *DeclarativeTabWidget::qmlAttachedProperties(QObjec
 
 CUSTOM_METAOBJECT(DeclarativeTabWidget, QTabWidget)
 
+// DeclarativeTextBrowser
+DeclarativeTextBrowser::DeclarativeTextBrowser(QObject *parent) : DeclarativeWidgetProxy<QTextBrowser>(parent)
+{
+  connectAllSignals(m_proxiedObject, this);
+}
+
+CUSTOM_METAOBJECT(DeclarativeTextBrowser, QTextBrowser)
+
 // DeclarativeTextEdit
 DeclarativeTextEdit::DeclarativeTextEdit(QObject *parent) : DeclarativeWidgetProxy<TextEdit>(parent)
 {
diff --git a/declarativeobjects_p.h b/declarativeobjects_p.h
index 7c45e11..313ec1a 100644 (file)
--- a/declarativeobjects_p.h
+++ b/declarativeobjects_p.h
@@ -26,6 +26,7 @@
 #include <QtGui/QSlider>
 #include <QtGui/QStatusBar>
 #include <QtGui/QTabWidget>
+#include <QtGui/QTextBrowser>
 #include <QtGui/QToolBar>
 #include <QtGui/QVBoxLayout>
 #include <QtDeclarative/QDeclarativeListProperty>
@@ -779,6 +780,14 @@ class DeclarativeTabWidget : public DeclarativeWidgetProxy<QTabWidget>
 
 QML_DECLARE_TYPEINFO(DeclarativeTabWidget, QML_HAS_ATTACHED_PROPERTIES)
 
+class DeclarativeTextBrowser : public DeclarativeWidgetProxy<QTextBrowser>
+{
+  DECLARATIVE_OBJECT
+
+  public:
+    DeclarativeTextBrowser(QObject *parent = 0);
+};
+
 class DeclarativeTextEdit : public DeclarativeWidgetProxy<TextEdit>
 {
   DECLARATIVE_OBJECT
diff --git a/declarativewidgetdocument.cpp b/declarativewidgetdocument.cpp
index 61d5887..bda2c43 100644 (file)
--- a/declarativewidgetdocument.cpp
+++ b/declarativewidgetdocument.cpp
@@ -72,6 +72,7 @@ DeclarativeWidgetDocument::DeclarativeWidgetDocument(const QUrl &url, QObject *p
   qmlRegisterType<DeclarativeStatusBar>("QtGui", 1, 0, "StatusBar");
   qmlRegisterType<DeclarativeTabWidgetAttached>();
   qmlRegisterType<DeclarativeTabWidget>("QtGui", 1, 0, "TabWidget");
+  qmlRegisterType<DeclarativeTextBrowser>("QtGui", 1, 0, "TextBrowser");
   qmlRegisterType<DeclarativeTextEdit>("QtGui", 1, 0, "TextEdit");
   qmlRegisterType<DeclarativeToolBar>("QtGui", 1, 0, "ToolBar");
   qmlRegisterType<DeclarativeWidget>("QtGui", 1, 0, "Widget");
diff --git a/gallery.qml b/gallery.qml
index 954e4f3..5f13d17 100644 (file)
--- a/gallery.qml
+++ b/gallery.qml
@@ -21,5 +21,9 @@ Widget {
     PlainTextEdit {
       plainText: qsTr("Hello World")
     }
+    TextBrowser {
+      openExternalLinks: true
+      html: "<html><body><a href=\"http://www.kde.org\">Coolest project ever</a></body></html>"
+    }
   }
 }
diff --git a/qwidgets.list b/qwidgets.list
index 26af61d..3dba9bb 100644 (file)
--- a/qwidgets.list
+++ b/qwidgets.list
@@ -39,7 +39,6 @@ qtabbar.h
 qtableview.h
 qtablewidget.h
 qtabwidget.h
-qtextbrowser.h
 qtoolbox.h
 qtoolbutton.h
 qtreeview.h
Unnamed repository; edit this file 'description' to name the repository.