← Back to branch summary

~osomon/oxide/ensure-files-exist

« back to all changes in this revision

Viewing changes to qt/quick/api/oxideqquickwebview_p.h

  • Committer: Olivier Tilloy
  • Date: 2014-09-25 16:27:09 UTC
  • mfrom: (677.1.95 oxide)
  • Revision ID: olivier.tilloy@canonical.com-20140925162709-h8bai0f1nfaf7cfy
Merge the latest changes from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
qt/quick/api/oxideqquickwebview_p.h
32
32
 
33
33
QT_USE_NAMESPACE
34
34
 
 
35
class OxideQCertificateError;
35
36
class OxideQGeolocationPermissionRequest;
36
37
class OxideQLoadEvent;
37
38
class OxideQNavigationRequest;
44
45
class OxideQQuickWebView;
45
46
class OxideQQuickWebViewPrivate;
46
47
class OxideQDownloadRequest;
 
48
class OxideQSecurityStatus;
47
49
 
48
50
class OxideQQuickWebViewAttached : public QObject {
49
51
  Q_OBJECT
63
65
class OxideQQuickWebView : public QQuickItem {
64
66
  Q_OBJECT
65
67
 
 
68
  Q_FLAGS(ContentType)
66
69
  Q_ENUMS(LogMessageSeverityLevel);
67
70
 
68
71
  Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged)
71
74
  Q_PROPERTY(bool canGoBack READ canGoBack NOTIFY navigationHistoryChanged)
72
75
  Q_PROPERTY(bool canGoForward READ canGoForward NOTIFY navigationHistoryChanged)
73
76
  Q_PROPERTY(bool incognito READ incognito WRITE setIncognito NOTIFY incognitoChanged)
74
 
  Q_PROPERTY(bool loading READ loading NOTIFY loadingChanged)
 
77
  Q_PROPERTY(bool loading READ loading NOTIFY loadingStateChanged)
75
78
  Q_PROPERTY(bool fullscreen READ fullscreen WRITE setFullscreen NOTIFY fullscreenChanged)
76
79
  Q_PROPERTY(int loadProgress READ loadProgress NOTIFY loadProgressChanged)
77
80
  Q_PROPERTY(OxideQQuickWebFrame* rootFrame READ rootFrame NOTIFY rootFrameChanged)
97
100
  Q_PROPERTY(OxideQWebPreferences* preferences READ preferences WRITE setPreferences NOTIFY preferencesChanged)
98
101
 
99
102
  Q_PROPERTY(OxideQQuickNavigationHistory* navigationHistory READ navigationHistory CONSTANT)
 
103
  Q_PROPERTY(OxideQSecurityStatus* securityStatus READ securityStatus CONSTANT)
 
104
 
 
105
  Q_PROPERTY(ContentType blockedContent READ blockedContent NOTIFY blockedContentChanged)
100
106
 
101
107
  Q_PROPERTY(OxideQNewViewRequest* request READ request WRITE setRequest)
102
108
 
115
121
    LogSeverityFatal
116
122
  };
117
123
 
 
124
  // This will be expanded to include other types
 
125
  // (eg, storage, geo, media, popups etc etc...)
 
126
  enum ContentTypeFlags {
 
127
    ContentTypeNone = 0,
 
128
    ContentTypeMixedDisplay = 1 << 0,
 
129
    ContentTypeMixedScript = 1 << 1
 
130
  };
 
131
  Q_DECLARE_FLAGS(ContentType, ContentTypeFlags)
 
132
 
118
133
  void componentComplete();
119
134
 
120
135
  QUrl url() const;
175
190
  void setPreferences(OxideQWebPreferences* prefs);
176
191
 
177
192
  OxideQQuickNavigationHistory* navigationHistory();
 
193
  OxideQSecurityStatus* securityStatus();
 
194
 
 
195
  ContentType blockedContent() const;
178
196
 
179
197
  OxideQNewViewRequest* request() const;
180
198
  void setRequest(OxideQNewViewRequest* request);
188
206
  void reload();
189
207
  void loadHtml(const QString& html, const QUrl& baseUrl = QUrl());
190
208
 
 
209
  void setCanTemporarilyDisplayInsecureContent(bool allow);
 
210
  void setCanTemporarilyRunInsecureContent(bool allow);
 
211
 
191
212
 Q_SIGNALS:
192
213
  void urlChanged();
193
214
  void titleChanged();
194
215
  void iconChanged();
195
216
  void navigationHistoryChanged();
196
217
  void incognitoChanged();
197
 
  void loadingChanged(OxideQLoadEvent* loadEvent);
 
218
  void loadingStateChanged();
 
219
  void loadEvent(OxideQLoadEvent* event);
198
220
  void fullscreenChanged();
199
221
  void loadProgressChanged();
200
222
  void rootFrameChanged();
216
238
  void contentXChanged();
217
239
  void contentYChanged();
218
240
  void fullscreenRequested(bool fullscreen);
219
 
  void navigationRequested(OxideQNavigationRequest *request);
 
241
  void navigationRequested(OxideQNavigationRequest* request);
220
242
  void newViewRequested(OxideQNewViewRequest* request);
221
 
  void geolocationPermissionRequested(
222
 
      OxideQGeolocationPermissionRequest* request);
 
243
  void geolocationPermissionRequested(const QJSValue& request);
223
244
  void javaScriptConsoleMessage(LogMessageSeverityLevel level,
224
245
                                const QString& message,
225
246
                                int lineNumber,
226
247
                                const QString& sourceId);
227
248
  void downloadRequested(OxideQDownloadRequest* request);
 
249
  void certificateError(const QJSValue& error);
 
250
  void blockedContentChanged();
 
251
 
 
252
  // Deprecated since 1.3
 
253
  void loadingChanged(OxideQLoadEvent* loadEvent);
228
254
 
229
255
 private:
230
256
  Q_PRIVATE_SLOT(d_func(), void contextConstructed());