[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/base/nepomuk-kde/annotation/lib/gui
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2010-05-25 8:48:59
Message-ID: 20100525084859.598A5AC8BF () svn ! kde ! org
[Download RAW message or body]

SVN commit 1130397 by trueg:

code cleanup

 M  +46 -41    resourceeditor.cpp  
 M  +6 -0      resourceeditor.h  


--- trunk/playground/base/nepomuk-kde/annotation/lib/gui/resourceeditor.cpp \
#1130396:1130397 @@ -80,14 +80,13 @@
 }
 
 
-class Nepomuk::ResourceEditor::Private
+class Nepomuk::ResourceEditor::Private : public Ui::ResourceEditor
 {
 public:
-    ResourceEditor* q;
+    Nepomuk::ResourceEditor* q;
 
     Resource m_resource;
 
-    Ui::ResourceEditor w;
     Nepomuk::ResourceAnnotationModel* m_annotationModel;
     Nepomuk::AnnotationPluginWrapper* m_annotator;
     Nepomuk::AnnotationDelegate* m_annotationDelegate;
@@ -108,40 +107,46 @@
 
 void Nepomuk::ResourceEditor::Private::updateWidgets()
 {
-    w.m_labelEditor->setText( m_resource.label() );
-    w.m_descriptionEditor->setText( m_resource.description() );
-    w.m_ratingWidget->setRating( m_resource.rating() );
-    w.m_titleLabel->setText( QString( "%1 (%2)" ).arg( m_resource.genericLabel(), \
                typesToText( m_resource.types() ) ) );
-    w.m_titleLabel->setUrl( m_resource.resourceUri().toString() );
+    m_labelEditor->setText( m_resource.label() );
+    m_descriptionEditor->setText( m_resource.description() );
+    m_ratingWidget->setRating( m_resource.rating() );
+    m_titleLabel->setText( QString( "%1 (%2)" ).arg( m_resource.genericLabel(), \
typesToText( m_resource.types() ) ) ); +    m_titleLabel->setUrl( \
m_resource.resourceUri().toString() );  }
 
 
 void Nepomuk::ResourceEditor::Private::updateAnnotations()
 {
-    w.m_suggestionWidgetContainer->hide();
+    m_suggestionWidgetContainer->hide();
     m_annotationModel->updateAnnotations();
 }
 
 
 void Nepomuk::ResourceEditor::Private::_k_ratingChanged( int rating )
 {
-    if ( m_resource.isValid() )
+    if ( m_resource.isValid() ) {
         m_resource.setRating( rating );
+        emit q->annotationsChanged();
 }
+}
 
 
 void Nepomuk::ResourceEditor::Private::_k_labelChanged( bool accepted )
 {
-    if ( accepted )
-        m_resource.setLabel( w.m_labelEditor->text() );
+    if ( accepted ) {
+        m_resource.setLabel( m_labelEditor->text() );
+        emit q->annotationsChanged();
 }
+}
 
 
 void Nepomuk::ResourceEditor::Private::_k_descriptionChanged( bool accepted )
 {
-    if ( accepted )
-        m_resource.setDescription( w.m_descriptionEditor->text() );
+    if ( accepted ) {
+        m_resource.setDescription( m_descriptionEditor->text() );
+        emit q->annotationsChanged();
 }
+}
 
 
 void Nepomuk::ResourceEditor::Private::_k_slotDataChanged()
@@ -152,7 +157,7 @@
 
 void Nepomuk::ResourceEditor::Private::_k_annotationSuggestionModelChanged()
 {
-    w.m_suggestionWidgetContainer->show();
+    m_suggestionWidgetContainer->show();
 }
 
 
@@ -160,7 +165,7 @@
 {
     Nepomuk::Thing thing = Resource( res ).pimoThing();
     KDialog dlg( q );
-    ResourceEditor* re = new ResourceEditor( &dlg );
+    Nepomuk::ResourceEditor* re = new Nepomuk::ResourceEditor( &dlg );
     re->setResource( thing );
     dlg.setMainWidget( re );
     dlg.setButtons( KDialog::Close );
@@ -178,9 +183,9 @@
 void Nepomuk::ResourceEditor::Private::_k_annotationWidgetToggled( bool on )
 {
     if ( on )
-        w.m_annotationWidgetStack->setCurrentWidget( w.m_statementEditor );
+        m_annotationWidgetStack->setCurrentWidget( m_statementEditor );
     else
-        w.m_annotationWidgetStack->setCurrentWidget( w.m_annotationWidget );
+        m_annotationWidgetStack->setCurrentWidget( m_annotationWidget );
 }
 
 
@@ -190,25 +195,25 @@
 {
     // setup ui
     d->q = this;
-    d->w.setupUi( this );
+    d->setupUi( this );
 
-    d->m_annotationModel = new Nepomuk::ResourceAnnotationModel( \
d->w.m_suggestionView ); +    d->m_annotationModel = new \
Nepomuk::ResourceAnnotationModel( d->m_suggestionView );  \
                d->m_annotationModel->setAutoUpdate( false );
-    d->m_annotationFilterModel = new Nepomuk::AnnotationRelevanceFilterModel( \
d->w.m_suggestionView ); +    d->m_annotationFilterModel = new \
Nepomuk::AnnotationRelevanceFilterModel( d->m_suggestionView );  \
                d->m_annotationFilterModel->setMinRelevance( 0.01 );
     d->m_annotationFilterModel->setSortRole( Nepomuk::AnnotationModel::RelevanceRole \
);  d->m_annotationFilterModel->setDynamicSortFilter( true );
     d->m_annotationFilterModel->sort( 0, Qt::DescendingOrder );
     d->m_annotationFilterModel->setSourceModel( d->m_annotationModel );
-    d->w.m_suggestionView->setModel( d->m_annotationFilterModel );
-    d->m_annotationDelegate = new Nepomuk::AnnotationDelegate( d->w.m_suggestionView \
                );
-    d->w.m_suggestionView->setItemDelegate( d->m_annotationDelegate );
-    d->w.m_suggestionView->setDragDropMode( QAbstractItemView::DragOnly );
+    d->m_suggestionView->setModel( d->m_annotationFilterModel );
+    d->m_annotationDelegate = new Nepomuk::AnnotationDelegate( d->m_suggestionView \
); +    d->m_suggestionView->setItemDelegate( d->m_annotationDelegate );
+    d->m_suggestionView->setDragDropMode( QAbstractItemView::DragOnly );
 
-    d->w.m_relationsView->installEventFilter( this );
-    d->w.m_relationsView->setAcceptDrops( true );
+    d->m_relationsView->installEventFilter( this );
+    d->m_relationsView->setAcceptDrops( true );
 
-    d->w.m_annotationToggleButton->setIcon( KIcon( "edit-redo" ) );
+    d->m_annotationToggleButton->setIcon( KIcon( "edit-redo" ) );
 
     // connect to data changes
     Soprano::Util::SignalCacheModel* scm = new Soprano::Util::SignalCacheModel( \
ResourceManager::instance()->mainModel() ); @@ -223,23 +228,23 @@
 
 
     // connect the gui
-    connect( d->w.m_ratingWidget, SIGNAL( ratingChanged( int ) ),
+    connect( d->m_ratingWidget, SIGNAL( ratingChanged( int ) ),
              this, SLOT( _k_ratingChanged( int ) ) );
-    connect( d->w.m_labelEditor, SIGNAL( editingFinished( bool ) ),
+    connect( d->m_labelEditor, SIGNAL( editingFinished( bool ) ),
              this, SLOT( _k_labelChanged( bool ) ) );
-    connect( d->w.m_descriptionEditor, SIGNAL( editingFinished( bool ) ),
+    connect( d->m_descriptionEditor, SIGNAL( editingFinished( bool ) ),
              this, SLOT( _k_descriptionChanged( bool ) ) );
     connect( d->m_annotationModel, SIGNAL( rowsInserted(QModelIndex, int, int) ),
              this, SLOT( _k_annotationSuggestionModelChanged() ) );
-    connect( d->w.m_relationsView, SIGNAL( resourceEditRequested( Nepomuk::Resource \
) ), +    connect( d->m_relationsView, SIGNAL( resourceEditRequested( \
                Nepomuk::Resource ) ),
              this, SLOT( _k_resourceEditRequested( Nepomuk::Resource ) ) );
-    connect( d->w.m_titleLabel, SIGNAL( leftClickedUrl() ),
+    connect( d->m_titleLabel, SIGNAL( leftClickedUrl() ),
              this, SLOT( _k_openNepomukBrowser() ) );
-    connect( d->w.m_annotationToggleButton, SIGNAL( toggled( bool ) ),
+    connect( d->m_annotationToggleButton, SIGNAL( toggled( bool ) ),
              this, SLOT( _k_annotationWidgetToggled( bool ) ) );
 
     // FIXME: metadata not implemented yet
-    d->w.m_metadataButton->hide();
+    d->m_metadataButton->hide();
 }
 
 
@@ -264,10 +269,10 @@
     d->m_annotationModel->setContent( content );
     d->m_annotationDelegate->setResource( res );
     d->m_annotationFilterModel->setFilterResource( res );
-    d->w.m_relationsView->setResource( res );
-    d->w.m_tagWidget->setTaggedResource( res );
-    d->w.m_statementEditor->setResource( res );
-    d->w.m_annotationWidget->setResource( res );
+    d->m_relationsView->setResource( res );
+    d->m_tagWidget->setTaggedResource( res );
+    d->m_statementEditor->setResource( res );
+    d->m_annotationWidget->setResource( res );
     d->updateWidgets();
     if ( manualAnnotations.isEmpty() ) {
         d->updateAnnotations();
@@ -288,13 +293,13 @@
 
 void Nepomuk::ResourceEditor::setTitleVisible( bool visible )
 {
-    d->w.m_titleLabel->setVisible( visible );
+    d->m_titleLabel->setVisible( visible );
 }
 
 
 bool Nepomuk::ResourceEditor::eventFilter( QObject* obj, QEvent* event )
 {
-    if ( obj == d->w.m_relationsView ) {
+    if ( obj == d->m_relationsView ) {
         if ( event->type() == QEvent::DragEnter ) {
             QDragEnterEvent* de = static_cast<QDragEnterEvent*>( event );
             event->setAccepted( de->mimeData()->hasFormat( \
                d->m_annotationModel->mimeTypes()[0] ) );
--- trunk/playground/base/nepomuk-kde/annotation/lib/gui/resourceeditor.h \
#1130396:1130397 @@ -46,6 +46,12 @@
 
         bool eventFilter( QObject* obj, QEvent* event );
 
+    Q_SIGNALS:
+        /**
+         * Emitted if any annotation has been added or removed or changed.
+         */
+        void annotationsChanged();
+
     public Q_SLOTS:
         /**
          * The title displaying the resource's generic label \
(Nepomuk::Resource::genericLabel())


[prev in list] [next in list] [prev in thread] [next in thread]