┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt6
-rw-r--r--cmake/DbusInterfaceMacros.cmake4
-rw-r--r--doc/index.docbook15
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/dolphinmainwindow.cpp2
-rw-r--r--src/kitemviews/private/kitemlistsmoothscroller.cpp24
-rw-r--r--src/panels/places/placesitem.cpp2
-rw-r--r--src/tests/kitemlistcontrollertest.cpp10
-rw-r--r--src/tests/kitemlistselectionmanagertest.cpp12
-rw-r--r--src/tests/kitemrangetest.cpp4
-rw-r--r--src/views/dolphinview.cpp2
-rw-r--r--src/views/versioncontrol/kversioncontrolplugin.h4
12 files changed, 49 insertions, 40 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1db40d13b..a5580e9e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,13 +29,13 @@ ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX DOLPHIN
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/src/dolphin_version.h"
)
-ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX DOLPHINVCS
+ecm_setup_version("5.0.0" VARIABLE_PREFIX DOLPHINVCS
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/dolphinvcs_version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/DolphinVcsConfigVersion.cmake"
SOVERSION 5
)
-ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX DOLPHINPRIVATE
+ecm_setup_version("5.0.0" VARIABLE_PREFIX DOLPHINPRIVATE
SOVERSION 5
)
@@ -62,7 +62,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
Solid
IconThemes
Completion
- TextEditor
+ TextWidgets
WindowSystem
Notifications
)
diff --git a/cmake/DbusInterfaceMacros.cmake b/cmake/DbusInterfaceMacros.cmake
index 0fd2f4c1f..71ad9067d 100644
--- a/cmake/DbusInterfaceMacros.cmake
+++ b/cmake/DbusInterfaceMacros.cmake
@@ -4,7 +4,7 @@ macro (generate_and_install_dbus_interface main_project_target header_file outpu
${output_xml_file}
)
add_custom_target(
- ${output_xml_file}
+ ${output_xml_file}_target
SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${output_xml_file}
)
install(
@@ -13,6 +13,6 @@ macro (generate_and_install_dbus_interface main_project_target header_file outpu
)
add_dependencies(
${main_project_target}
- ${output_xml_file}
+ ${output_xml_file}_target
)
endmacro ()
diff --git a/doc/index.docbook b/doc/index.docbook
index fe3357c2f..3749831ab 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -2,7 +2,6 @@
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
<!ENTITY dolphin "<application>Dolphin</application>">
<!ENTITY kappname "&dolphin;">
- <!ENTITY package "kde-baseapps">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE"><!-- change language only here -->
]>
@@ -73,8 +72,8 @@
<legalnotice>&FDLNotice;</legalnotice>
-<date>2013-06-28</date>
-<releaseinfo>4.11 (&kde; 4.11)</releaseinfo>
+<date>2015-08-02</date>
+<releaseinfo>Applications 15.08</releaseinfo>
<abstract>
<para>
@@ -2070,8 +2069,9 @@ tracking system. The &kde; bug tracker can be found at
&dolphin;
</para>
<para>
-Program copyright 2006&ndash;2013 Peter Penz <email>[email protected]</email> and
-Frank Reininghaus <email>[email protected]</email></para>
+Program copyright 2006&ndash;2014 Peter Penz <email>[email protected]</email>,
+Frank Reininghaus <email>[email protected]</email> and Emmanuel Pescosta
+<email>[email protected]</email> </para>
<para>
Contributors:
<itemizedlist>
@@ -2104,8 +2104,8 @@ Documentation copyright 2009 Frank Reininghaus <email>[email protected]</
<appendix id="installation">
<title>How to get &dolphin;</title>
-<para>&dolphin; is part of the &package; package which is an essential part of
-&kde;.</para>
+
+&install.intro.documentation;
<para>For instructions on acquiring &kde; please see <ulink
url="http://www.kde.org">http://www.kde.org</ulink> or read the chapter
@@ -2113,7 +2113,6 @@ url="http://www.kde.org">http://www.kde.org</ulink> or read the chapter
in the &kde; Fundamentals.</para>
<para>For further information about &dolphin; you might want to visit
-<ulink url="http://dolphin.kde.org">http://dolphin.kde.org</ulink> or
<ulink url="http://userbase.kde.org/Dolphin">http://userbase.kde.org/Dolphin</ulink>.</para>
</appendix>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2a5e5a688..e0f91deed 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,7 +29,6 @@ generate_export_header(dolphinvcs BASE_NAME dolphin)
target_link_libraries(
dolphinvcs PUBLIC
Qt5::Widgets
- KF5::KIOCore
)
set_target_properties(dolphinvcs PROPERTIES
@@ -143,10 +142,11 @@ target_link_libraries(
KF5::KIOWidgets
KF5::KIOFileWidgets
KF5::Completion
- KF5::TextEditor
+ KF5::TextWidgets
KF5::WindowSystem
KF5::ConfigCore
KF5::NewStuff
+ KF5::Parts
)
if(HAVE_BALOO)
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index f7a761307..5a731512b 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1335,7 +1335,7 @@ void DolphinMainWindow::createControlButton()
Q_ASSERT(!m_controlButton);
m_controlButton = new QToolButton(this);
- m_controlButton->setIcon(QIcon::fromTheme("applications-system"));
+ m_controlButton->setIcon(QIcon::fromTheme("application-menu"));
m_controlButton->setText(i18nc("@action", "Control"));
m_controlButton->setPopupMode(QToolButton::InstantPopup);
m_controlButton->setToolButtonStyle(toolBar()->toolButtonStyle());
diff --git a/src/kitemviews/private/kitemlistsmoothscroller.cpp b/src/kitemviews/private/kitemlistsmoothscroller.cpp
index e70f47890..2bd467aa5 100644
--- a/src/kitemviews/private/kitemlistsmoothscroller.cpp
+++ b/src/kitemviews/private/kitemlistsmoothscroller.cpp
@@ -172,7 +172,7 @@ bool KItemListSmoothScroller::eventFilter(QObject* obj, QEvent* event)
case QEvent::Wheel:
handleWheelEvent(static_cast<QWheelEvent*>(event));
- break;
+ return true; // eat event so that QScrollBar does not scroll one step more by itself
default:
break;
@@ -192,15 +192,25 @@ void KItemListSmoothScroller::slotAnimationStateChanged(QAbstractAnimation::Stat
void KItemListSmoothScroller::handleWheelEvent(QWheelEvent* event)
{
- const int numDegrees = event->delta() / 8;
- const int numSteps = numDegrees / 15;
-
const bool previous = m_smoothScrolling;
m_smoothScrolling = true;
- const int value = m_scrollBar->value();
- const int pageStep = m_scrollBar->pageStep();
- m_scrollBar->setValue(value - numSteps * pageStep);
+ int numPixels;
+ if (!event->pixelDelta().isNull()) {
+ numPixels = event->pixelDelta().y();
+ } else {
+ const int numDegrees = event->angleDelta().y() / 8;
+ const int numSteps = numDegrees / 15;
+ numPixels = numSteps * m_scrollBar->pageStep() / 4;
+ }
+ int value = m_scrollBar->value();
+ if (event->modifiers().testFlag(Qt::ShiftModifier)) {
+ const int scrollingDirection = numPixels > 0 ? 1 : -1;
+ value -= m_scrollBar->pageStep() * scrollingDirection;
+ } else {
+ value -= numPixels;
+ }
+ m_scrollBar->setValue(value);
m_smoothScrolling = previous;
diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp
index fad8c7fa5..2a9c88e4e 100644
--- a/src/panels/places/placesitem.cpp
+++ b/src/panels/places/placesitem.cpp
@@ -144,7 +144,7 @@ void PlacesItem::setBookmark(const KBookmark& bookmark)
if (icon().isEmpty()) {
switch (type) {
case RecentlySavedType: setIcon("chronometer"); break;
- case SearchForType: setIcon("nepomuk"); break;
+ case SearchForType: setIcon("system-search"); break;
case PlacesType:
default: setIcon("folder");
}
diff --git a/src/tests/kitemlistcontrollertest.cpp b/src/tests/kitemlistcontrollertest.cpp
index e34731fa4..e170e7b5b 100644
--- a/src/tests/kitemlistcontrollertest.cpp
+++ b/src/tests/kitemlistcontrollertest.cpp
@@ -71,10 +71,10 @@ private:
bool m_activateItemOnSingleClick;
};
-Q_DECLARE_METATYPE(KFileItemListView::ItemLayout);
-Q_DECLARE_METATYPE(Qt::Orientation);
-Q_DECLARE_METATYPE(KItemListController::SelectionBehavior);
-Q_DECLARE_METATYPE(KItemSet);
+Q_DECLARE_METATYPE(KFileItemListView::ItemLayout)
+Q_DECLARE_METATYPE(Qt::Orientation)
+Q_DECLARE_METATYPE(KItemListController::SelectionBehavior)
+Q_DECLARE_METATYPE(KItemSet)
class KItemListControllerTest : public QObject
{
@@ -209,7 +209,7 @@ struct ViewState {
// We have to define a typedef for the pair in order to make the test compile.
typedef QPair<KeyPress, ViewState> keyPressViewStatePair;
-Q_DECLARE_METATYPE(QList<keyPressViewStatePair>);
+Q_DECLARE_METATYPE(QList<keyPressViewStatePair>)
/**
* This function provides the data for the actual test function
diff --git a/src/tests/kitemlistselectionmanagertest.cpp b/src/tests/kitemlistselectionmanagertest.cpp
index 7cf60df42..b183de302 100644
--- a/src/tests/kitemlistselectionmanagertest.cpp
+++ b/src/tests/kitemlistselectionmanagertest.cpp
@@ -322,12 +322,12 @@ namespace {
};
}
-Q_DECLARE_METATYPE(KItemSet);
-Q_DECLARE_METATYPE(ChangeType);
-Q_DECLARE_METATYPE(KItemRange);
-Q_DECLARE_METATYPE(KItemRangeList);
-Q_DECLARE_METATYPE(KItemListSelectionManager::SelectionMode);
-Q_DECLARE_METATYPE(QList<int>);
+Q_DECLARE_METATYPE(KItemSet)
+Q_DECLARE_METATYPE(ChangeType)
+Q_DECLARE_METATYPE(KItemRange)
+Q_DECLARE_METATYPE(KItemRangeList)
+Q_DECLARE_METATYPE(KItemListSelectionManager::SelectionMode)
+Q_DECLARE_METATYPE(QList<int>)
/**
* The following function provides a generic way to test the selection functionality.
diff --git a/src/tests/kitemrangetest.cpp b/src/tests/kitemrangetest.cpp
index ce7b48012..5e4ea653f 100644
--- a/src/tests/kitemrangetest.cpp
+++ b/src/tests/kitemrangetest.cpp
@@ -22,8 +22,8 @@
#include <QTest>
#include <QVector>
-Q_DECLARE_METATYPE(QVector<int>);
-Q_DECLARE_METATYPE(KItemRangeList);
+Q_DECLARE_METATYPE(QVector<int>)
+Q_DECLARE_METATYPE(KItemRangeList)
class KItemRangeTest : public QObject
{
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 07b40dceb..5023859df 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -77,7 +77,7 @@
namespace {
const int MaxModeEnum = DolphinView::CompactView;
-};
+}
DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
QWidget(parent),
diff --git a/src/views/versioncontrol/kversioncontrolplugin.h b/src/views/versioncontrol/kversioncontrolplugin.h
index e5a267848..85835e062 100644
--- a/src/views/versioncontrol/kversioncontrolplugin.h
+++ b/src/views/versioncontrol/kversioncontrolplugin.h
@@ -23,9 +23,9 @@
#include <dolphin_export.h>
#include <QObject>
-#include <KFileItem>
#include <QAction>
-
+class KFileItemList;
+class KFileItem;
/**
* @brief Base class for version control plugins.
*
generated by cgit v1.3.1 (git 2.54.0) at 2026-06-02 23:04:02 +0000