diff options
| -rw-r--r-- | src/tagcloud/resourcetaggingwidget.cpp | 14 | ||||
| -rw-r--r-- | src/tagcloud/tagcloud.cpp | 3 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/tagcloud/resourcetaggingwidget.cpp b/src/tagcloud/resourcetaggingwidget.cpp index e7d6dfa78..b67e8f47d 100644 --- a/src/tagcloud/resourcetaggingwidget.cpp +++ b/src/tagcloud/resourcetaggingwidget.cpp @@ -24,7 +24,7 @@ #include <QtGui/QVBoxLayout> #include <QtGui/QContextMenuEvent> #include <QtGui/QCursor> -#include <QtGui/QAction> +#include <QtGui/QLabel> #include <KLocale> @@ -39,8 +39,6 @@ public: QList<Tag> resourceTags; - QAction* changeTagsAction; - void showTaggingPopup( const QPoint& ); void _k_slotShowTaggingPopup(); }; @@ -74,9 +72,10 @@ Nepomuk::ResourceTaggingWidget::ResourceTaggingWidget( QWidget* parent ) layout->setMargin( 0 ); d->resourceTagCloud = new TagCloud( this ); layout->addWidget( d->resourceTagCloud ); - - d->changeTagsAction = new QAction( i18n( "Change tags..." ), this ); - d->resourceTagCloud->setCustomNewTagAction( d->changeTagsAction ); + QLabel* changeTagsLabel = new QLabel( "<p align=center><a style=\"font-size:small;\" href=\"dummy\">" + i18n( "Change tags..." ) + "</a>", this ); + connect( changeTagsLabel, SIGNAL( linkActivated( const QString ) ), + this, SLOT( _k_slotShowTaggingPopup() ) ); + layout->addWidget( changeTagsLabel ); // the popup tag cloud d->popup = new TaggingPopup; @@ -88,9 +87,6 @@ Nepomuk::ResourceTaggingWidget::ResourceTaggingWidget( QWidget* parent ) connect( d->popup, SIGNAL( tagAdded( const Nepomuk::Tag& ) ), this, SLOT( slotTagAdded( const Nepomuk::Tag& ) ) ); - connect( d->changeTagsAction, SIGNAL( activated() ), - this, SLOT( _k_slotShowTaggingPopup() ) ); - connect( d->resourceTagCloud, SIGNAL( tagClicked( const Nepomuk::Tag& ) ), this, SIGNAL( tagClicked( const Nepomuk::Tag& ) ) ); } diff --git a/src/tagcloud/tagcloud.cpp b/src/tagcloud/tagcloud.cpp index 8fe5cba89..f22a39aa2 100644 --- a/src/tagcloud/tagcloud.cpp +++ b/src/tagcloud/tagcloud.cpp @@ -732,6 +732,7 @@ QSize Nepomuk::TagCloud::sizeHint() const QSize Nepomuk::TagCloud::minimumSizeHint() const { + return QFrame::minimumSizeHint(); // If we have tags d->rebuildCloud() has been called at least once, // thus, we have proper rects (i.e. needed sizes) if ( d->nodes.isEmpty() && !d->newTagButtonEnabled ) { @@ -760,6 +761,8 @@ int Nepomuk::TagCloud::heightForWidth( int contentsWidth ) const // If we have tags d->rebuildCloud() has been called at least once, // thus, we have proper rects (i.e. needed sizes) + // FIXME: add zoom here + if ( d->cachedHfwWidth != contentsWidth ) { // have to keep in mind the frame contentsWidth -= frameWidth()*2; |