office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-07-05 00:58:46 +00:00
Code Issues Projects Releases Wiki Activity

* observer API cleanup

Browse Source 
* removed NotifyRequest, that looked more like a hack than a solution
  (see comment in ghostscript generator)

svn path=/trunk/playground/graphics/okular/; revision=608235
This commit is contained in:
Tobias Koenig 2006-11-27 08:12:39 +00:00
parent d45d7b31b1
commit 9969547b0c
4 changed files with 35 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/document.cpp
View File

@ -403,30 +403,6 @@ void Document::addObserver( DocumentObserver * pObserver )
}
}
void Document::notifyObservers (NotifyRequest * request)
{
switch (request->type)
{
case DocumentObserver::Setup:
foreachObserver( notifySetup( pages_vector, request->toggle ) );
break;
case DocumentObserver::Viewport:
foreachObserver( notifyViewportChanged( request->toggle ) );
break;
case DocumentObserver::Page:
foreachObserver( notifyPageChanged( request->page, request->flags ) );
break;
case DocumentObserver::Contents:
foreachObserver( notifyContentsCleared( request->flags ) );
break;
case DocumentObserver::VisibleAreas:
qDeleteAll(page_rects);
page_rects = request->rects;
foreachObserver( notifyVisibleRectsChanged() );
break;
}
}
void Document::removeObserver( DocumentObserver * pObserver )
{
// remove observer from the map. it won't receive notifications anymore

2
core/document.h
View File

@ -41,7 +41,6 @@ class EmbeddedFile;
class ExportFormat;
class Generator;
class Link;
class NotifyRequest;
class Page;
class PixmapRequest;
class SourceReference;
@ -86,7 +85,6 @@ class OKULAR_EXPORT Document : public QObject
// observer stuff
void addObserver( DocumentObserver * pObserver );
void removeObserver( DocumentObserver * pObserver );
void notifyObservers (NotifyRequest * request);
void reparseConfig();
// enum definitions

53
core/observer.h
View File

@ -29,6 +29,7 @@ namespace Okular {
// the biggest id, useful for ignoring wrong id request
#define MAX_OBSERVER_ID 10
/** PRIORITIES for requests. Globally defined here. **/
#define PAGEVIEW_PRIO 1
#define PAGEVIEW_PRELOAD_PRIO 3
@ -37,7 +38,6 @@ namespace Okular {
#define PRESENTATION_PRIO 0
class Page;
class VisiblePageRect;
/**
* @short Base class for objects being notified when something changes.
@ -48,15 +48,41 @@ class VisiblePageRect;
class DocumentObserver
{
public:
/**
* Destroys the document observer.
*/
virtual ~DocumentObserver() {};
// you must give each observer a unique ID (used for notifications)
/**
* Must return an unique ID for each observer (used for notifications).
*/
virtual uint observerId() const = 0;
// commands from the Document to all observers
enum ChangedFlags { Pixmap = 1, Bookmark = 2, Highlights = 4, TextSelection = 8, Annotations = 16 };
enum NotifyType { Setup = 1, Viewport = 2, Page = 4, Contents = 8, VisibleAreas = 16 };
virtual void notifySetup( const QVector< Okular::Page * > & /*pages*/, bool /*documentChanged*/ ) {};
/**
* Flags that can be sent from the document to all observers to
* inform them about the type of object that has been changed.
*/
enum ChangedFlags {
Pixmap = 1, ///< Pixmaps has been changed
Bookmark = 2, ///< Bookmarks has been changed
Highlights = 4, ///< Highlighting information has been changed
TextSelection = 8, ///< Text selection has been changed
Annotations = 16 ///< Annotations has been changed
};
/**
* Flags that can be sent from the document to all observers to
* inform them about area that has been changed.
*/
enum NotifyType {
Setup = 1, ///< The page is setup the first time
Viewport = 2, ///< The viewport has changed
Page = 4, ///< The page format (properties) has been changed
Contents = 8, ///< The page content has been changed
VisibleAreas = 16 ///< The visible are changed
};
virtual void notifySetup( const QVector< Okular::Page * > &/*pages*/, bool /*documentChanged*/ ) {};
virtual void notifyViewportChanged( bool /*smoothMove*/ ) {};
virtual void notifyPageChanged( int /*pageNumber*/, int /*changedFlags*/ ) {};
virtual void notifyContentsCleared( int /*changedFlags*/ ) {};
@ -66,21 +92,6 @@ class DocumentObserver
virtual bool canUnloadPixmap( int /*pageNum*/ ) const { return true; }
};
struct NotifyRequest
{
DocumentObserver::NotifyType type;
bool toggle;
int page;
int flags;
QVector<VisiblePageRect*> rects;
NotifyRequest (DocumentObserver::NotifyType t, bool to=false)
: type(t), toggle(to), page(-1), flags(0) { ; };
NotifyRequest (DocumentObserver::NotifyType t, int p, int f)
: type(t), toggle(false), page(p), flags (f) { ; };
NotifyRequest (DocumentObserver::NotifyType t, int p)
: type(t), toggle(false), page(p), flags(0) { ; };
};
}
#endif

4
generators/ghostview/generator_ghostview.cpp
View File

@ -260,9 +260,11 @@ void GSGenerator::setPaperSize( QVector<Okular::Page*> & pagesVector, int newsiz
{
internalDoc->setMedia(paperSizes().at(newsize));
loadPages(pagesVector);
// FIXME: is it needed to notify the observers? doesn't the document do that already?
/**
FIXME: is it needed to notify the observers? doesn't the document do that already?
Okular::NotifyRequest r(Okular::DocumentObserver::Setup, false);
document()->notifyObservers( &r );
*/
}
void GSGenerator::setupGUI(KActionCollection * ac , QToolBox * tBox )