diff options
| author | rootavish <[email protected]> | 2014-07-07 18:36:55 +0530 |
|---|---|---|
| committer | rootavish <[email protected]> | 2014-07-07 18:36:55 +0530 |
| commit | df43418e209ae9c98844185f789c63769ae9b3a2 (patch) | |
| tree | 40b713aaa4b1596c1d6ccddbe89486983d093881 /libdocument | |
| parent | 6f41c201422edd6b4dbf9f9f41b5dc29530d21c6 (diff) | |
| download | atril-df43418e209ae9c98844185f789c63769ae9b3a2.tar.bz2 atril-df43418e209ae9c98844185f789c63769ae9b3a2.tar.xz | |
Refactored code, created a new EvWebView type
Earlier my approach was to replace the atril view directly with a webview. However as it turned out it was extremely difficult to accomplish much tasks without the document-model. So I created an Extension of the WebKitWebView class, EvWebView so that now we can manipulate the webview as desired. Also having a separate file really helps in terms of clarity.
Please note that there are many empty functions and TODO tags right now, I shall aim to fill these up once the display part is done, probably in this week.
I also added some code on the backend to draw thumbnails when with GTK+-3.0, although I have never tested a GTK+-3.0 build.With GTK+-2.0 you won't get any build errors, however epub backend won't work right now.
That being said, this commit is mostly because there was a lot of code that was lying in the local repository, and it was best to back it up as a failsafe.
I modified ev-window to accomodate this new data structure, and having an equivalent ev_web_view function for every ev_view function, I can achieve most functionality by filling those functions with Webkit modules.
Other than that on the backend
Other than that there were some minor changes to the code.
Although I did the above, currently I am not able to instantiate the EvWebView because of some class and object type definition errors, due to which I can't display the document.
Diffstat (limited to 'libdocument')
| -rw-r--r-- | libdocument/ev-document.c | 7 | ||||
| -rw-r--r-- | libdocument/ev-document.h | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/libdocument/ev-document.c b/libdocument/ev-document.c index fee64ed1..a242bdf6 100644 --- a/libdocument/ev-document.c +++ b/libdocument/ev-document.c @@ -621,13 +621,6 @@ ev_document_render (EvDocument *document, return klass->render (document, rc); } -/*gchar* -ev_web_document_render(EvDocument *document) -{ - Layout engine takes care of the rendering, so what we are essentially doing is serving pages to the webview - EvDocumentClass *klass = EV_DOCUMENT_GET_CLASS (document); - klass->webkit_render(document); -}*/ const gchar * ev_document_get_uri (EvDocument *document) { diff --git a/libdocument/ev-document.h b/libdocument/ev-document.h index 578b0937..fe2fd628 100644 --- a/libdocument/ev-document.h +++ b/libdocument/ev-document.h @@ -85,7 +85,7 @@ struct _EvDocument GObject base; EvDocumentPrivate *priv; - /* + /* * Since we can only access the members of this structure from the window frontend, * we need a flag to detemine whether to replace the atril-view with a web-view. */ |