From fe1e3f240a09c18c721f78713e3c359666c42fed Mon Sep 17 00:00:00 2001 From: Michael Jansen Date: Sun, 30 Dec 2012 20:56:59 +0100 Subject: Fix crash when browsing bluetooth device. When trying to browse a N900 it crashed here because pathA was empty. Which lead to index = maxIndex beeing -1 and pathA.at(index) crashing. Reorder the while condition to prevent that courtesy of tsdgeos. (cherry picked from commit f0c90a47de3f59e4a98932ae6f0499921d9aa899) --- src/kitemviews/kfileitemmodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index 231bfe077..6c015db37 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -1499,7 +1499,7 @@ int KFileItemModel::expandedParentsCountCompare(const ItemData* a, const ItemDat if (index > maxIndex) { index = maxIndex; } - while ((pathA.at(index) != QLatin1Char('/') || pathB.at(index) != QLatin1Char('/')) && index > 0) { + while (index > 0 && (pathA.at(index) != QLatin1Char('/') || pathB.at(index) != QLatin1Char('/'))) { --index; } -- cgit v1.3 From 863a80dbd085aa7212b897f124226816bf683c85 Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Fri, 4 Jan 2013 07:40:18 +0100 Subject: SVN_SILENT made messages (.desktop file) --- src/settings/kcm/kcmdolphinnavigation.desktop | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index 26721b11c..69b6d6ed9 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -192,6 +192,7 @@ Name[lv]=Navigācija Name[mai]=नेविगेशन Name[mk]=Навигација Name[ml]=നാവിഗേഷന്‍ +Name[mr]=संचारण पटल Name[ms]=Navigasi Name[nb]=Navigasjon Name[nds]=Navigeren -- cgit v1.3 From 24c9bc6ce7f9d2dbef9f386befcdeed76622ef18 Mon Sep 17 00:00:00 2001 From: Vishesh Handa Date: Mon, 7 Jan 2013 14:24:47 +0530 Subject: Dolphin: Make Nepomuk Support Optional Use the KFileMetadataWidget if Nepomuk is not present. REVIEW: 108236 --- src/CMakeLists.txt | 8 ++++++-- src/panels/information/informationpanelcontent.cpp | 8 ++++++++ src/panels/information/informationpanelcontent.h | 9 +++++++++ src/views/tooltips/filemetadatatooltip.cpp | 8 ++++++++ src/views/tooltips/filemetadatatooltip.h | 9 +++++++++ 5 files changed, 40 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b7aa5b385..13392b830 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,8 +1,12 @@ macro_optional_find_package(Soprano) macro_optional_find_package(NepomukCore) macro_optional_find_package(NepomukWidgets) -macro_log_feature(NepomukCore_FOUND "Nepomuk" "Nepomuk" "http://www.kde.org" FALSE "" "For adding desktop-wide tagging support to dolphin") -macro_bool_to_01(NepomukCore_FOUND HAVE_NEPOMUK) +macro_log_feature(NepomukCore_FOUND "Nepomuk Core" "Nepomuk Core functionality" "http://www.kde.org" FALSE "" "For fetching additional file metadata in dolphin") +macro_log_feature(NepomukWidgets_FOUND "Nepomuk Widgets" "Nepomuk Widgets" "http://www.kde.org" FALSE "" "For adding desktop-wide tagging support to dolphin") +if( DEFINED NepomukCore_FOUND AND DEFINED NepomukWidgets_FOUND ) + set(HAVE_NEPOMUK TRUE) +endif() + configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h ) macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER) diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp index 355a57196..85571befd 100644 --- a/src/panels/information/informationpanelcontent.cpp +++ b/src/panels/information/informationpanelcontent.cpp @@ -31,7 +31,11 @@ #include #include +#ifndef HAVE_NEPOMUK +#include +#else #include +#endif #include #include @@ -107,7 +111,11 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) : const bool previewsShown = InformationPanelSettings::previewsShown(); m_preview->setVisible(previewsShown); +#ifndef HAVE_NEPOMUK + m_metaDataWidget = new KFileMetaDataWidget(parent); +#else m_metaDataWidget = new Nepomuk2::FileMetaDataWidget(parent); +#endif m_metaDataWidget->setFont(KGlobalSettings::smallestReadableFont()); m_metaDataWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum); connect(m_metaDataWidget, SIGNAL(urlActivated(KUrl)), this, SIGNAL(urlActivated(KUrl))); diff --git a/src/panels/information/informationpanelcontent.h b/src/panels/information/informationpanelcontent.h index 2a369bbbc..ed9200aef 100644 --- a/src/panels/information/informationpanelcontent.h +++ b/src/panels/information/informationpanelcontent.h @@ -20,6 +20,7 @@ #ifndef INFORMATIONPANELCONTENT_H #define INFORMATIONPANELCONTENT_H +#include "config-nepomuk.h" #include #include #include @@ -34,9 +35,13 @@ class QString; class QLabel; class QScrollArea; +#ifndef HAVE_NEPOMUK +class KFileMetaDataWidget; +#else namespace Nepomuk2 { class FileMetaDataWidget; } +#endif /** * @brief Manages the widgets that display the meta information @@ -136,7 +141,11 @@ private: PixmapViewer* m_preview; PhononWidget* m_phononWidget; QLabel* m_nameLabel; +#ifndef HAVE_NEPOMUK + KFileMetaDataWidget* m_metaDataWidget; +#else Nepomuk2::FileMetaDataWidget* m_metaDataWidget; +#endif QScrollArea* m_metaDataArea; PlacesItemModel* m_placesItemModel; diff --git a/src/views/tooltips/filemetadatatooltip.cpp b/src/views/tooltips/filemetadatatooltip.cpp index d0cba741e..77a07e268 100644 --- a/src/views/tooltips/filemetadatatooltip.cpp +++ b/src/views/tooltips/filemetadatatooltip.cpp @@ -30,7 +30,11 @@ #include #include +#ifndef HAVE_NEPOMUK +#include +#else #include +#endif // For the blurred tooltip background #include @@ -56,7 +60,11 @@ FileMetaDataToolTip::FileMetaDataToolTip(QWidget* parent) : m_name->setFont(font); // Create widget for the meta data +#ifndef HAVE_NEPOMUK + m_fileMetaDataWidget = new KFileMetaDataWidget(this); +#else m_fileMetaDataWidget = new Nepomuk2::FileMetaDataWidget(this); +#endif m_fileMetaDataWidget->setForegroundRole(QPalette::ToolTipText); m_fileMetaDataWidget->setReadOnly(true); connect(m_fileMetaDataWidget, SIGNAL(metaDataRequestFinished(KFileItemList)), diff --git a/src/views/tooltips/filemetadatatooltip.h b/src/views/tooltips/filemetadatatooltip.h index aa7ce63ed..e7cb3f039 100644 --- a/src/views/tooltips/filemetadatatooltip.h +++ b/src/views/tooltips/filemetadatatooltip.h @@ -23,13 +23,18 @@ #define FILEMETADATATOOLTIP_H #include +#include "config-nepomuk.h" class KFileItemList; class QLabel; +#ifndef HAVE_NEPOMUK +class KFileMetaDataWidget; +#else namespace Nepomuk2 { class FileMetaDataWidget; } +#endif /** * @brief Tooltip, that shows the meta information and a preview of one @@ -71,7 +76,11 @@ protected: private: QLabel* m_preview; QLabel* m_name; +#ifndef HAVE_NEPOMUK + KFileMetaDataWidget* m_fileMetaDataWidget; +#else Nepomuk2::FileMetaDataWidget* m_fileMetaDataWidget; +#endif }; #endif -- cgit v1.3 From 6b351820a3405a1ce60916132a277435efabd685 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 7 Jan 2013 18:11:07 +0100 Subject: Fix build if one of the missing Nepomuk dependencies is missing --- src/CMakeLists.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 13392b830..41efa3589 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,7 +3,7 @@ macro_optional_find_package(NepomukCore) macro_optional_find_package(NepomukWidgets) macro_log_feature(NepomukCore_FOUND "Nepomuk Core" "Nepomuk Core functionality" "http://www.kde.org" FALSE "" "For fetching additional file metadata in dolphin") macro_log_feature(NepomukWidgets_FOUND "Nepomuk Widgets" "Nepomuk Widgets" "http://www.kde.org" FALSE "" "For adding desktop-wide tagging support to dolphin") -if( DEFINED NepomukCore_FOUND AND DEFINED NepomukWidgets_FOUND ) +if(NepomukCore_FOUND AND NepomukWidgets_FOUND) set(HAVE_NEPOMUK TRUE) endif() @@ -14,10 +14,10 @@ configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h ) include_directories( ${KACTIVITIES_INCLUDE_DIRS} ) -if (NepomukCore_FOUND) +if(HAVE_NEPOMUK) # Yes, Soprano includes is what we need here include_directories( ${SOPRANO_INCLUDE_DIR} ${NEPOMUK_CORE_INCLUDE_DIR} ${NEPOMUK_WIDGETS_INCLUDE_DIR} ) -endif (NepomukCore_FOUND) +endif() add_subdirectory(tests) @@ -79,12 +79,12 @@ set(dolphinprivate_LIB_SRCS views/zoomlevelinfo.cpp ) -if (NepomukCore_FOUND) +if(HAVE_NEPOMUK) set(dolphinprivate_LIB_SRCS ${dolphinprivate_LIB_SRCS} kitemviews/private/knepomukrolesprovider.cpp ) -endif (NepomukCore_FOUND) +endif() kde4_add_kcfg_files(dolphinprivate_LIB_SRCS settings/dolphin_compactmodesettings.kcfgc @@ -104,14 +104,14 @@ target_link_libraries( ${KDE4_KNEWSTUFF3_LIBS} ) -if (NepomukCore_FOUND) +if(HAVE_NEPOMUK) target_link_libraries( dolphinprivate ${NEPOMUK_CORE_LIBRARY} ${NEPOMUK_WIDGETS_LIBRARY} ${SOPRANO_LIBRARIES} ) -endif (NepomukCore_FOUND) +endif() if(X11_Xrender_FOUND) target_link_libraries(dolphinprivate ${X11_Xrender_LIB}) @@ -231,13 +231,13 @@ target_link_libraries(kdeinit_dolphin ${KDE4_PHONON_LIBS} ) -if (NepomukCore_FOUND) +if(HAVE_NEPOMUK) target_link_libraries(kdeinit_dolphin ${NEPOMUK_CORE_LIBRARY} ${NEPOMUK_WIDGETS_LIBRARY} ${SOPRANO_LIBRARIES} ) -endif (NepomukCore_FOUND) +endif() if (KActivities_FOUND) target_link_libraries( @@ -308,12 +308,12 @@ target_link_libraries(kcm_dolphinviewmodes ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS target_link_libraries(kcm_dolphinnavigation ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} dolphinprivate) target_link_libraries(kcm_dolphinservices ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF3_LIBRARY} dolphinprivate) target_link_libraries(kcm_dolphingeneral ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} dolphinprivate) -if (NepomukCore_FOUND) +if(HAVE_NEPOMUK) target_link_libraries(kcm_dolphinviewmodes ${NEPOMUK_CORE_LIBRARY} ${NEPOMUK_WIDGETS_LIBRARY}) target_link_libraries(kcm_dolphinnavigation ${NEPOMUK_CORE_LIBRARY} ${NEPOMUK_WIDGETS_LIBRARY}) target_link_libraries(kcm_dolphinservices ${NEPOMUK_CORE_LIBRARY} ${NEPOMUK_WIDGETS_LIBRARY}) target_link_libraries(kcm_dolphingeneral ${NEPOMUK_CORE_LIBRARY} ${NEPOMUK_WIDGETS_LIBRARY}) -endif (NepomukCore_FOUND) +endif() install(TARGETS kcm_dolphinviewmodes DESTINATION ${PLUGIN_INSTALL_DIR} ) install(TARGETS kcm_dolphinnavigation DESTINATION ${PLUGIN_INSTALL_DIR} ) -- cgit v1.3