mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-17 15:31:20 +00:00
Merge branch 'Applications/17.04'
This commit is contained in:
commit
0c8ef2977e
|
@ -1453,6 +1453,8 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container)
|
||||||
this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::goBack));
|
this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::goBack));
|
||||||
connect(view, &DolphinView::goForwardRequested,
|
connect(view, &DolphinView::goForwardRequested,
|
||||||
this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::goForward));
|
this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::goForward));
|
||||||
|
connect(view, &DolphinView::urlActivated,
|
||||||
|
this, &DolphinMainWindow::handleUrl);
|
||||||
|
|
||||||
const KUrlNavigator* navigator = container->urlNavigator();
|
const KUrlNavigator* navigator = container->urlNavigator();
|
||||||
connect(navigator, &KUrlNavigator::urlChanged,
|
connect(navigator, &KUrlNavigator::urlChanged,
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
|
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
|
||||||
<kpartgui name="dolphinpart" version="11" translationDomain="dolphin">
|
<kpartgui name="dolphinpart" version="12" translationDomain="dolphin">
|
||||||
<MenuBar>
|
<MenuBar>
|
||||||
<Menu name="edit"><text>&Edit</text>
|
<Menu name="edit"><text>&Edit</text>
|
||||||
<Action name="new_menu"/>
|
<Action name="new_menu"/>
|
||||||
<Separator/>
|
<Separator/>
|
||||||
<Action name="rename"/>
|
<Action name="rename"/>
|
||||||
<Action name="move_to_trash" />
|
<Action name="move_to_trash" />
|
||||||
<Action name="delete"/>
|
<Action name="deletefile"/>
|
||||||
<Action name="editMimeType"/>
|
<Action name="editMimeType"/>
|
||||||
<Action name="properties"/>
|
<Action name="properties"/>
|
||||||
<Separator/>
|
<Separator/>
|
||||||
|
@ -53,14 +53,14 @@
|
||||||
<State name="has_selection" >
|
<State name="has_selection" >
|
||||||
<enable>
|
<enable>
|
||||||
<Action name="move_to_trash" />
|
<Action name="move_to_trash" />
|
||||||
<Action name="delete" />
|
<Action name="deletefile" />
|
||||||
</enable>
|
</enable>
|
||||||
</State>
|
</State>
|
||||||
<State name="has_no_selection" >
|
<State name="has_no_selection" >
|
||||||
<disable>
|
<disable>
|
||||||
<Action name="rename" />
|
<Action name="rename" />
|
||||||
<Action name="move_to_trash" />
|
<Action name="move_to_trash" />
|
||||||
<Action name="delete" />
|
<Action name="deletefile" />
|
||||||
</disable>
|
</disable>
|
||||||
</State>
|
</State>
|
||||||
</kpartgui>
|
</kpartgui>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
|
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
|
||||||
<kpartgui name="dolphin" version="14">
|
<kpartgui name="dolphin" version="15">
|
||||||
<MenuBar>
|
<MenuBar>
|
||||||
<Menu name="file">
|
<Menu name="file">
|
||||||
<Action name="new_menu" />
|
<Action name="new_menu" />
|
||||||
|
@ -10,7 +10,7 @@
|
||||||
<Separator/>
|
<Separator/>
|
||||||
<Action name="rename" />
|
<Action name="rename" />
|
||||||
<Action name="move_to_trash" />
|
<Action name="move_to_trash" />
|
||||||
<Action name="delete" />
|
<Action name="deletefile" />
|
||||||
<Separator/>
|
<Separator/>
|
||||||
<Action name="properties" />
|
<Action name="properties" />
|
||||||
</Menu>
|
</Menu>
|
||||||
|
@ -58,7 +58,7 @@
|
||||||
<Action name="edit_copy" />
|
<Action name="edit_copy" />
|
||||||
<Action name="rename" />
|
<Action name="rename" />
|
||||||
<Action name="move_to_trash" />
|
<Action name="move_to_trash" />
|
||||||
<Action name="delete" />
|
<Action name="deletefile" />
|
||||||
<Action name="invert_selection" />
|
<Action name="invert_selection" />
|
||||||
<Separator/>
|
<Separator/>
|
||||||
<Action name="go_back" />
|
<Action name="go_back" />
|
||||||
|
@ -71,7 +71,7 @@
|
||||||
<Action name="edit_copy" />
|
<Action name="edit_copy" />
|
||||||
<Action name="rename" />
|
<Action name="rename" />
|
||||||
<Action name="move_to_trash" />
|
<Action name="move_to_trash" />
|
||||||
<Action name="delete" />
|
<Action name="deletefile" />
|
||||||
<Action name="invert_selection" />
|
<Action name="invert_selection" />
|
||||||
</enable>
|
</enable>
|
||||||
</State>
|
</State>
|
||||||
|
@ -81,7 +81,7 @@
|
||||||
<Action name="edit_copy" />
|
<Action name="edit_copy" />
|
||||||
<Action name="rename" />
|
<Action name="rename" />
|
||||||
<Action name="move_to_trash" />
|
<Action name="move_to_trash" />
|
||||||
<Action name="delete" />
|
<Action name="deletefile" />
|
||||||
<Action name="delete_shortcut" />
|
<Action name="delete_shortcut" />
|
||||||
<Action name="invert_selection" />
|
<Action name="invert_selection" />
|
||||||
</disable>
|
</disable>
|
||||||
|
|
|
@ -29,6 +29,7 @@
|
||||||
|
|
||||||
#include <QTime>
|
#include <QTime>
|
||||||
#include <QMap>
|
#include <QMap>
|
||||||
|
#include <QCollator>
|
||||||
|
|
||||||
struct KBalooRolesProviderSingleton
|
struct KBalooRolesProviderSingleton
|
||||||
{
|
{
|
||||||
|
@ -159,7 +160,11 @@ KBalooRolesProvider::KBalooRolesProvider() :
|
||||||
|
|
||||||
QString KBalooRolesProvider::tagsFromValues(const QStringList& values) const
|
QString KBalooRolesProvider::tagsFromValues(const QStringList& values) const
|
||||||
{
|
{
|
||||||
return values.join(QStringLiteral(", "));
|
QStringList alphabeticalOrderTags = values;
|
||||||
|
QCollator coll;
|
||||||
|
coll.setNumericMode(true);
|
||||||
|
std::sort(alphabeticalOrderTags.begin(), alphabeticalOrderTags.end(), [&](const QString& s1, const QString& s2){ return coll.compare(s1, s2) < 0; });
|
||||||
|
return alphabeticalOrderTags.join(QStringLiteral(", "));
|
||||||
}
|
}
|
||||||
|
|
||||||
QString KBalooRolesProvider::orientationFromValue(int value) const
|
QString KBalooRolesProvider::orientationFromValue(int value) const
|
||||||
|
|
|
@ -62,6 +62,7 @@ protected:
|
||||||
private:
|
private:
|
||||||
/**
|
/**
|
||||||
* @return User visible string for the given tag-values.
|
* @return User visible string for the given tag-values.
|
||||||
|
* The tag-values are sorted in alphabetical order.
|
||||||
*/
|
*/
|
||||||
QString tagsFromValues(const QStringList& values) const;
|
QString tagsFromValues(const QStringList& values) const;
|
||||||
|
|
||||||
|
|
|
@ -182,6 +182,7 @@ DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
|
||||||
this, &DolphinView::slotSelectionChanged);
|
this, &DolphinView::slotSelectionChanged);
|
||||||
|
|
||||||
m_toolTipManager = new ToolTipManager(this);
|
m_toolTipManager = new ToolTipManager(this);
|
||||||
|
connect(m_toolTipManager, &ToolTipManager::urlActivated, this, &DolphinView::urlActivated);
|
||||||
|
|
||||||
m_versionControlObserver = new VersionControlObserver(this);
|
m_versionControlObserver = new VersionControlObserver(this);
|
||||||
m_versionControlObserver->setModel(m_model);
|
m_versionControlObserver->setModel(m_model);
|
||||||
|
|
|
@ -544,6 +544,12 @@ signals:
|
||||||
*/
|
*/
|
||||||
void toggleActiveViewRequested();
|
void toggleActiveViewRequested();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Is emitted when the user clicks a tag or a link
|
||||||
|
* in the metadata widget of a tooltip.
|
||||||
|
*/
|
||||||
|
void urlActivated(const QUrl& url);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/** Changes the zoom level if Control is pressed during a wheel event. */
|
/** Changes the zoom level if Control is pressed during a wheel event. */
|
||||||
virtual void wheelEvent(QWheelEvent* event) Q_DECL_OVERRIDE;
|
virtual void wheelEvent(QWheelEvent* event) Q_DECL_OVERRIDE;
|
||||||
|
|
|
@ -67,10 +67,14 @@ DolphinFileMetaDataWidget::DolphinFileMetaDataWidget(QWidget* parent) :
|
||||||
m_fileMetaDataWidget = new KFileMetaDataWidget(this);
|
m_fileMetaDataWidget = new KFileMetaDataWidget(this);
|
||||||
connect(m_fileMetaDataWidget, &KFileMetaDataWidget::metaDataRequestFinished,
|
connect(m_fileMetaDataWidget, &KFileMetaDataWidget::metaDataRequestFinished,
|
||||||
this, &DolphinFileMetaDataWidget::metaDataRequestFinished);
|
this, &DolphinFileMetaDataWidget::metaDataRequestFinished);
|
||||||
|
connect(m_fileMetaDataWidget, &KFileMetaDataWidget::urlActivated,
|
||||||
|
this, &DolphinFileMetaDataWidget::urlActivated);
|
||||||
#else
|
#else
|
||||||
m_fileMetaDataWidget = new Baloo::FileMetaDataWidget(this);
|
m_fileMetaDataWidget = new Baloo::FileMetaDataWidget(this);
|
||||||
connect(m_fileMetaDataWidget, &Baloo::FileMetaDataWidget::metaDataRequestFinished,
|
connect(m_fileMetaDataWidget, &Baloo::FileMetaDataWidget::metaDataRequestFinished,
|
||||||
this, &DolphinFileMetaDataWidget::metaDataRequestFinished);
|
this, &DolphinFileMetaDataWidget::metaDataRequestFinished);
|
||||||
|
connect(m_fileMetaDataWidget, &Baloo::FileMetaDataWidget::urlActivated,
|
||||||
|
this, &DolphinFileMetaDataWidget::urlActivated);
|
||||||
#endif
|
#endif
|
||||||
m_fileMetaDataWidget->setForegroundRole(QPalette::ToolTipText);
|
m_fileMetaDataWidget->setForegroundRole(QPalette::ToolTipText);
|
||||||
m_fileMetaDataWidget->setReadOnly(true);
|
m_fileMetaDataWidget->setReadOnly(true);
|
||||||
|
|
|
@ -69,6 +69,12 @@ signals:
|
||||||
*/
|
*/
|
||||||
void metaDataRequestFinished(const KFileItemList& items);
|
void metaDataRequestFinished(const KFileItemList& items);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Is emitted when the user clicks a tag or a link
|
||||||
|
* in the metadata widget.
|
||||||
|
*/
|
||||||
|
void urlActivated(const QUrl& url);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QLabel* m_preview;
|
QLabel* m_preview;
|
||||||
QLabel* m_name;
|
QLabel* m_name;
|
||||||
|
|
|
@ -86,6 +86,8 @@ void ToolTipManager::showToolTip(const KFileItem& item, const QRectF& itemRect,
|
||||||
m_fileMetaDataWidget = new DolphinFileMetaDataWidget();
|
m_fileMetaDataWidget = new DolphinFileMetaDataWidget();
|
||||||
connect(m_fileMetaDataWidget, &DolphinFileMetaDataWidget::metaDataRequestFinished,
|
connect(m_fileMetaDataWidget, &DolphinFileMetaDataWidget::metaDataRequestFinished,
|
||||||
this, &ToolTipManager::slotMetaDataRequestFinished);
|
this, &ToolTipManager::slotMetaDataRequestFinished);
|
||||||
|
connect(m_fileMetaDataWidget, &DolphinFileMetaDataWidget::urlActivated,
|
||||||
|
this, &ToolTipManager::urlActivated);
|
||||||
|
|
||||||
m_contentRetrievalTimer->start();
|
m_contentRetrievalTimer->start();
|
||||||
m_showToolTipTimer->start();
|
m_showToolTipTimer->start();
|
||||||
|
|
|
@ -58,6 +58,13 @@ public:
|
||||||
*/
|
*/
|
||||||
void hideToolTip();
|
void hideToolTip();
|
||||||
|
|
||||||
|
signals:
|
||||||
|
/**
|
||||||
|
* Is emitted when the user clicks a tag or a link
|
||||||
|
* in the metadata widget.
|
||||||
|
*/
|
||||||
|
void urlActivated(const QUrl& url);
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void startContentRetrieval();
|
void startContentRetrieval();
|
||||||
void setPreviewPix(const KFileItem& item, const QPixmap& pix);
|
void setPreviewPix(const KFileItem& item, const QPixmap& pix);
|
||||||
|
|
Loading…
Reference in a new issue