Fixed link issue - I'm sorry: I had installed a temporary version of KMetaDataWidget...

svn path=/trunk/KDE/kdebase/apps/; revision=1044545

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2c08a1ef9daa09d89994a0cc7f0ba2316127b9c1..0796e67c1c70536112ef5327b406a4e52f721a1d 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -41,6 +41,8 @@ set(dolphinprivate_LIB_SRCS
     settings/dolphinsettings.cpp
     settings/viewpropertiesdialog.cpp
     settings/viewpropsprogressinfo.cpp
     settings/dolphinsettings.cpp
     settings/viewpropertiesdialog.cpp
     settings/viewpropsprogressinfo.cpp

+    panels/information/kmetadatawidget.cpp
+    panels/information/kmetadataconfigurationdialog.cpp

     tooltips/ktooltip.cpp
     tooltips/ktooltipwindow.cpp
     tooltips/tooltipmanager.cpp
     tooltips/ktooltip.cpp
     tooltips/ktooltipwindow.cpp
     tooltips/tooltipmanager.cpp


@@ -49,6 +51,16 @@ set(dolphinprivate_LIB_SRCS
     viewproperties.cpp
     zoomlevelinfo.cpp
     )
     viewproperties.cpp
     zoomlevelinfo.cpp
     )

+    
+if(Nepomuk_FOUND)
+set(dolphinprivate_LIB_SRCS
+  ${dolphinprivate_LIB_SRCS}
+  panels/information/kcommentwidget.cpp
+  panels/information/kedittagsdialog.cpp
+  panels/information/nepomukmassupdatejob.cpp
+  panels/information/ktaggingwidget.cpp
+)
+endif(Nepomuk_FOUND)

 
 kde4_add_kcfg_files(dolphinprivate_LIB_SRCS
     settings/dolphin_columnmodesettings.kcfgc
 
 kde4_add_kcfg_files(dolphinprivate_LIB_SRCS
     settings/dolphin_columnmodesettings.kcfgc


@@ -159,7 +171,6 @@ set(dolphin_SRCS
   panels/information/nepomukmassupdatejob.cpp
   panels/information/ktaggingwidget.cpp
 )
   panels/information/nepomukmassupdatejob.cpp
   panels/information/ktaggingwidget.cpp
 )

-

 endif(Nepomuk_FOUND)
 
 if(NOT WIN32)
 endif(Nepomuk_FOUND)
 
 if(NOT WIN32)

diff --git a/src/panels/information/kmetadatawidget.cpp b/src/panels/information/kmetadatawidget.cpp
index fd2f237dd2a066f3524f03bb2b97325a913a2fb4..98dc180c8a2995a34a6386a8b3f17a79253e6762 100644 (file)
--- a/src/panels/information/kmetadatawidget.cpp
+++ b/src/panels/information/kmetadatawidget.cpp
@@ -400,6 +400,7 @@ void KMetaDataWidget::Private::slotLoadingFinished()
         m_rows.pop_back();
     }
 #endif
         m_rows.pop_back();
     }
 #endif

+    q->updateGeometry();

 }
 
 void KMetaDataWidget::Private::slotRatingChanged(unsigned int rating)
 }
 
 void KMetaDataWidget::Private::slotRatingChanged(unsigned int rating)

diff --git a/src/tooltips/tooltipmanager.cpp b/src/tooltips/tooltipmanager.cpp
index 9851ece6b30267c23b704c5a4fdd8f66fa85772d..8cf6ec3b564142304ec4fdbc27cd5fc1fe3e6665 100644 (file)
--- a/src/tooltips/tooltipmanager.cpp
+++ b/src/tooltips/tooltipmanager.cpp
@@ -249,7 +249,7 @@ QWidget* ToolTipManager::createTipContent(const QPixmap& pixmap) const
 
     KMetaDataWidget* metaDataWidget = new KMetaDataWidget(tipContent);
     metaDataWidget->setItem(m_item);
 
     KMetaDataWidget* metaDataWidget = new KMetaDataWidget(tipContent);
     metaDataWidget->setItem(m_item);

-    metaDataWidget->setFixedSize(metaDataWidget->sizeHint());
+    metaDataWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Maximum);

 
     QHBoxLayout* tipLayout = new QHBoxLayout(tipContent);
     tipLayout->setMargin(0);
 
     QHBoxLayout* tipLayout = new QHBoxLayout(tipContent);
     tipLayout->setMargin(0);