* Added new symbols * Removed build dependencies: - cmake - liblxqt0-dev - libqt5xdg-dev - pkg-config - qttools5-dev - qttools5-dev-tools * Added build dependency lxqt-build-tools * Added build dependency libfm-dev to libfm-qt-dev * Removed models.patch, applied upstreamubuntu/cosmic debian/0.11.2-1
Alf Gaida
8 years ago
parent
057bb75ee9
commit
da03a71631
@ -1,10 +0,0 @@
|
||||
build*/
|
||||
src/translations/libfm-qt
|
||||
|
||||
# Vim.gitignore
|
||||
[._]*.s[a-w][a-z]
|
||||
[._]s[a-w][a-z]
|
||||
*.un~
|
||||
Session.vim
|
||||
.netrwhist
|
||||
*~
|
||||
@ -1,53 +0,0 @@
|
||||
#.rst:
|
||||
# FindXCB
|
||||
# -------
|
||||
#
|
||||
# Find XCB libraries
|
||||
#
|
||||
# Tries to find xcb libraries on unix systems.
|
||||
#
|
||||
# - Be sure to set the COMPONENTS to the components you want to link to
|
||||
# - The XCB_LIBRARIES variable is set ONLY to your COMPONENTS list
|
||||
# - To use only a specific component check the XCB_LIBRARIES_${COMPONENT} variable
|
||||
#
|
||||
# The following values are defined
|
||||
#
|
||||
# ::
|
||||
#
|
||||
# XCB_FOUND - True if xcb is available
|
||||
# XCB_INCLUDE_DIRS - Include directories for xcb
|
||||
# XCB_LIBRARIES - List of libraries for xcb
|
||||
# XCB_DEFINITIONS - List of definitions for xcb
|
||||
#
|
||||
#=============================================================================
|
||||
# Copyright (c) 2015 Jari Vetoniemi
|
||||
#
|
||||
# Distributed under the OSI-approved BSD License (the "License");
|
||||
#
|
||||
# This software is distributed WITHOUT ANY WARRANTY; without even the
|
||||
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
# See the License for more information.
|
||||
#=============================================================================
|
||||
|
||||
include(FeatureSummary)
|
||||
set_package_properties(XCB PROPERTIES
|
||||
URL "http://xcb.freedesktop.org/"
|
||||
DESCRIPTION "X protocol C-language Binding")
|
||||
|
||||
find_package(PkgConfig)
|
||||
pkg_check_modules(PC_XCB QUIET xcb ${XCB_FIND_COMPONENTS})
|
||||
|
||||
find_library(XCB_LIBRARIES xcb HINTS ${PC_XCB_LIBRARY_DIRS})
|
||||
find_path(XCB_INCLUDE_DIRS xcb/xcb.h PATH_SUFFIXES xcb HINTS ${PC_XCB_INCLUDE_DIRS})
|
||||
|
||||
foreach(COMPONENT ${XCB_FIND_COMPONENTS})
|
||||
find_library(XCB_LIBRARIES_${COMPONENT} ${COMPONENT} HINTS ${PC_XCB_LIBRARY_DIRS})
|
||||
list(APPEND XCB_LIBRARIES ${XCB_LIBRARIES_${COMPONENT}})
|
||||
mark_as_advanced(XCB_LIBRARIES_${COMPONENT})
|
||||
endforeach(COMPONENT ${XCB_FIND_COMPONENTS})
|
||||
|
||||
set(XCB_DEFINITIONS ${PC_XCB_CFLAGS_OTHER})
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(XCB DEFAULT_MSG XCB_LIBRARIES XCB_INCLUDE_DIRS)
|
||||
mark_as_advanced(XCB_INCLUDE_DIRS XCB_LIBRARIES XCB_DEFINITIONS)
|
||||
@ -1,344 +0,0 @@
|
||||
Description: Fixed behaviour with icon emblems
|
||||
Backported a upstream fix for Icon Emblem Support. Only applies to
|
||||
pcmanfm-qt - no changes in released version needed.
|
||||
Author: Alf Gaida <agaida@siduction.org>
|
||||
|
||||
Last-Update: 2016-10-20
|
||||
|
||||
--- libfm-qt-0.11.1.orig/src/folderitemdelegate.cpp
|
||||
+++ libfm-qt-0.11.1/src/folderitemdelegate.cpp
|
||||
@@ -35,7 +35,9 @@ namespace Fm {
|
||||
FolderItemDelegate::FolderItemDelegate(QAbstractItemView* view, QObject* parent):
|
||||
QStyledItemDelegate(parent ? parent : view),
|
||||
view_(view),
|
||||
- symlinkIcon_(QIcon::fromTheme("emblem-symbolic-link")) {
|
||||
+ symlinkIcon_(QIcon::fromTheme("emblem-symbolic-link")),
|
||||
+ fileInfoRole_(Fm::FolderModel::FileInfoRole),
|
||||
+ fmIconRole_(-1) {
|
||||
}
|
||||
|
||||
FolderItemDelegate::~FolderItemDelegate() {
|
||||
@@ -78,9 +80,13 @@ QIcon::Mode FolderItemDelegate::iconMode
|
||||
// special thanks to Razor-qt developer Alec Moskvin(amoskvin) for providing the fix!
|
||||
void FolderItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const {
|
||||
Q_ASSERT(index.isValid());
|
||||
- FmFileInfo* file = static_cast<FmFileInfo*>(index.data(FolderModel::FileInfoRole).value<void*>());
|
||||
+ FmFileInfo* file = static_cast<FmFileInfo*>(index.data(fileInfoRole_).value<void*>());
|
||||
+ FmIcon* fmicon = static_cast<FmIcon*>(index.data(fmIconRole_).value<void*>());
|
||||
+ if(fmicon == nullptr && file != nullptr) {
|
||||
+ fmicon = fm_file_info_get_icon(file);
|
||||
+ }
|
||||
+ QList<Icon> emblems = fmicon != nullptr ? IconTheme::emblems(fmicon) : QList<Icon>();
|
||||
bool isSymlink = file && fm_file_info_is_symlink(file);
|
||||
-
|
||||
if(option.decorationPosition == QStyleOptionViewItem::Top ||
|
||||
option.decorationPosition == QStyleOptionViewItem::Bottom) {
|
||||
painter->save();
|
||||
@@ -100,9 +106,13 @@ void FolderItemDelegate::paint(QPainter*
|
||||
painter->drawPixmap(iconPos + QPoint(margin.width(), margin.height()), pixmap);
|
||||
|
||||
// draw some emblems for the item if needed
|
||||
- // we only support symlink emblem at the moment
|
||||
if(isSymlink)
|
||||
painter->drawPixmap(iconPos, symlinkIcon_.pixmap(option.decorationSize / 2, iconMode));
|
||||
+ if(!emblems.isEmpty()) {
|
||||
+ QPoint emblemPos(opt.rect.x() + opt.rect.width() / 2, opt.rect.y() + option.decorationSize.height() / 2);
|
||||
+ QIcon emblem = IconTheme::icon(emblems.first().dataPtr());
|
||||
+ painter->drawPixmap(emblemPos, emblem.pixmap(option.decorationSize / 2, iconMode));
|
||||
+ }
|
||||
|
||||
// draw the text
|
||||
// The text rect dimensions should be exactly as they were in sizeHint()
|
||||
@@ -118,14 +128,20 @@ void FolderItemDelegate::paint(QPainter*
|
||||
QStyledItemDelegate::paint(painter, option, index);
|
||||
|
||||
// draw emblems if needed
|
||||
- if(isSymlink) {
|
||||
+ if(isSymlink || !emblems.isEmpty()) {
|
||||
QStyleOptionViewItem opt = option;
|
||||
initStyleOption(&opt, index);
|
||||
QIcon::Mode iconMode = iconModeFromState(opt.state);
|
||||
- QPoint iconPos(opt.rect.x(), opt.rect.y() + (opt.rect.height() - option.decorationSize.height()) / 2);
|
||||
// draw some emblems for the item if needed
|
||||
- // we only support symlink emblem at the moment
|
||||
- painter->drawPixmap(iconPos, symlinkIcon_.pixmap(option.decorationSize / 2, iconMode));
|
||||
+ if(isSymlink) {
|
||||
+ QPoint iconPos(opt.rect.x(), opt.rect.y() + (opt.rect.height() - option.decorationSize.height()) / 2);
|
||||
+ painter->drawPixmap(iconPos, symlinkIcon_.pixmap(option.decorationSize / 2, iconMode));
|
||||
+ }
|
||||
+ else {
|
||||
+ QPoint iconPos(opt.rect.x() + option.decorationSize.width() / 2, opt.rect.y() + opt.rect.height() / 2);
|
||||
+ QIcon emblem = IconTheme::icon(emblems.first().dataPtr());
|
||||
+ painter->drawPixmap(iconPos, emblem.pixmap(option.decorationSize / 2, iconMode));
|
||||
+ }
|
||||
}
|
||||
}
|
||||
}
|
||||
--- libfm-qt-0.11.1.orig/src/folderitemdelegate.h
|
||||
+++ libfm-qt-0.11.1/src/folderitemdelegate.h
|
||||
@@ -41,6 +41,22 @@ public:
|
||||
return gridSize_;
|
||||
}
|
||||
|
||||
+ int fileInfoRole() {
|
||||
+ return fileInfoRole_;
|
||||
+ }
|
||||
+
|
||||
+ void setFileInfoRole(int role) {
|
||||
+ fileInfoRole_ = role;
|
||||
+ }
|
||||
+
|
||||
+ int fmIconRole() {
|
||||
+ return fmIconRole_;
|
||||
+ }
|
||||
+
|
||||
+ void setFmIconRole(int role) {
|
||||
+ fmIconRole_ = role;
|
||||
+ }
|
||||
+
|
||||
virtual QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const;
|
||||
virtual void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const;
|
||||
|
||||
@@ -52,6 +68,8 @@ private:
|
||||
QAbstractItemView* view_;
|
||||
QIcon symlinkIcon_;
|
||||
QSize gridSize_;
|
||||
+ int fileInfoRole_;
|
||||
+ int fmIconRole_;
|
||||
};
|
||||
|
||||
}
|
||||
--- libfm-qt-0.11.1.orig/src/icontheme.cpp
|
||||
+++ libfm-qt-0.11.1/src/icontheme.cpp
|
||||
@@ -28,12 +28,18 @@
|
||||
|
||||
namespace Fm {
|
||||
|
||||
+class IconCacheData {
|
||||
+public:
|
||||
+ QIcon qicon;
|
||||
+ QList<Icon> emblems;
|
||||
+};
|
||||
+
|
||||
static IconTheme* theIconTheme = NULL; // the global single instance of IconTheme.
|
||||
static const char* fallbackNames[] = {"unknown", "application-octet-stream", NULL};
|
||||
|
||||
-static void fmIconDataDestroy(gpointer data) {
|
||||
- QIcon* picon = reinterpret_cast<QIcon*>(data);
|
||||
- delete picon;
|
||||
+static void fmIconDataDestroy(gpointer user_data) {
|
||||
+ IconCacheData* data = reinterpret_cast<IconCacheData*>(user_data);
|
||||
+ delete data;
|
||||
}
|
||||
|
||||
IconTheme::IconTheme():
|
||||
@@ -88,7 +94,7 @@ QIcon IconTheme::iconFromNames(const cha
|
||||
return QIcon();
|
||||
}
|
||||
|
||||
-QIcon IconTheme::convertFromGIcon(GIcon* gicon) {
|
||||
+QIcon IconTheme::convertFromGIconWithoutEmblems(GIcon* gicon) {
|
||||
if(G_IS_THEMED_ICON(gicon)) {
|
||||
const gchar * const * names = g_themed_icon_get_names(G_THEMED_ICON(gicon));
|
||||
QIcon icon = iconFromNames(names);
|
||||
@@ -106,20 +112,36 @@ QIcon IconTheme::convertFromGIcon(GIcon*
|
||||
}
|
||||
|
||||
|
||||
+// static
|
||||
+IconCacheData* IconTheme::ensureCacheData(FmIcon* fmicon) {
|
||||
+ IconCacheData* data = reinterpret_cast<IconCacheData*>(fm_icon_get_user_data(fmicon));
|
||||
+ if(!data) { // we don't have a cache yet
|
||||
+ data = new IconCacheData();
|
||||
+ GIcon* gicon = G_ICON(fmicon);
|
||||
+ if(G_IS_EMBLEMED_ICON(gicon)) { // special handling for emblemed icon
|
||||
+ GList* emblems = g_emblemed_icon_get_emblems(G_EMBLEMED_ICON(gicon));
|
||||
+ for(GList* l = emblems; l; l = l->next) {
|
||||
+ GIcon* emblem_gicon = g_emblem_get_icon(G_EMBLEM(l->data));
|
||||
+ data->emblems.append(Icon::fromGicon(emblem_gicon));
|
||||
+ }
|
||||
+ gicon = g_emblemed_icon_get_icon(G_EMBLEMED_ICON(gicon)); // get an emblemless GIcon
|
||||
+ }
|
||||
+ data->qicon = convertFromGIconWithoutEmblems(gicon);
|
||||
+ fm_icon_set_user_data(fmicon, data); // store it in FmIcon
|
||||
+ }
|
||||
+ return data;
|
||||
+}
|
||||
+
|
||||
//static
|
||||
QIcon IconTheme::icon(FmIcon* fmicon) {
|
||||
- // check if we have a cached version
|
||||
- QIcon* picon = reinterpret_cast<QIcon*>(fm_icon_get_user_data(fmicon));
|
||||
- if(!picon) { // we don't have a cache yet
|
||||
- picon = new QIcon(); // what a waste!
|
||||
- *picon = convertFromGIcon(G_ICON(fmicon));
|
||||
- fm_icon_set_user_data(fmicon, picon); // store it in FmIcon
|
||||
- }
|
||||
- return *picon;
|
||||
+ IconCacheData* data = ensureCacheData(fmicon);
|
||||
+ return data->qicon;
|
||||
}
|
||||
|
||||
//static
|
||||
QIcon IconTheme::icon(GIcon* gicon) {
|
||||
+ if(G_IS_EMBLEMED_ICON(gicon)) // get an emblemless GIcon
|
||||
+ gicon = g_emblemed_icon_get_icon(G_EMBLEMED_ICON(gicon));
|
||||
if(G_IS_THEMED_ICON(gicon)) {
|
||||
FmIcon* fmicon = fm_icon_from_gicon(gicon);
|
||||
QIcon qicon = icon(fmicon);
|
||||
@@ -128,11 +150,26 @@ QIcon IconTheme::icon(GIcon* gicon) {
|
||||
}
|
||||
else if(G_IS_FILE_ICON(gicon)) {
|
||||
// we do not map GFileIcon to FmIcon deliberately.
|
||||
- return convertFromGIcon(gicon);
|
||||
+ return convertFromGIconWithoutEmblems(gicon);
|
||||
}
|
||||
return theIconTheme->fallbackIcon_;
|
||||
}
|
||||
|
||||
+// static
|
||||
+QList<Icon> IconTheme::emblems(FmIcon* fmicon) {
|
||||
+ IconCacheData* data = ensureCacheData(fmicon);
|
||||
+ return data->emblems;
|
||||
+}
|
||||
+
|
||||
+//static
|
||||
+QList<Icon> IconTheme::emblems(GIcon* gicon) {
|
||||
+ if(G_IS_EMBLEMED_ICON(gicon)) { // if this gicon contains emblems
|
||||
+ Icon fmicon = Icon::fromGicon(gicon);
|
||||
+ return emblems(fmicon.dataPtr());
|
||||
+ }
|
||||
+ return QList<Icon>();
|
||||
+}
|
||||
+
|
||||
// this method is called whenever there is an event on the QDesktopWidget object.
|
||||
bool IconTheme::eventFilter(QObject* obj, QEvent* event) {
|
||||
// we're only interested in the StyleChange event.
|
||||
--- libfm-qt-0.11.1.orig/src/icontheme.h
|
||||
+++ libfm-qt-0.11.1/src/icontheme.h
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <QIcon>
|
||||
#include <QString>
|
||||
#include "libfm/fm.h"
|
||||
+#include "icon.h"
|
||||
|
||||
namespace Fm {
|
||||
|
||||
@@ -40,6 +41,8 @@ namespace Fm {
|
||||
|
||||
// Nice article about QPixmap from KDE: http://techbase.kde.org/Development/Tutorials/Graphics/Performance
|
||||
|
||||
+class IconCacheData;
|
||||
+
|
||||
class LIBFM_QT_API IconTheme: public QObject {
|
||||
Q_OBJECT
|
||||
public:
|
||||
@@ -49,6 +52,8 @@ public:
|
||||
static IconTheme* instance();
|
||||
static QIcon icon(FmIcon* fmicon);
|
||||
static QIcon icon(GIcon* gicon);
|
||||
+ static QList<Icon> emblems(FmIcon* fmicon);
|
||||
+ static QList<Icon> emblems(GIcon* gicon);
|
||||
|
||||
static void checkChanged(); // check if current icon theme name is changed
|
||||
Q_SIGNALS:
|
||||
@@ -56,8 +61,9 @@ Q_SIGNALS:
|
||||
|
||||
protected:
|
||||
bool eventFilter(QObject *obj, QEvent *event);
|
||||
- static QIcon convertFromGIcon(GIcon* gicon);
|
||||
+ static QIcon convertFromGIconWithoutEmblems(GIcon* gicon);
|
||||
static QIcon iconFromNames(const char * const * names);
|
||||
+ static IconCacheData* ensureCacheData(FmIcon* fmicon);
|
||||
|
||||
protected:
|
||||
QIcon fallbackIcon_;
|
||||
--- libfm-qt-0.11.1.orig/src/placesmodel.cpp
|
||||
+++ libfm-qt-0.11.1/src/placesmodel.cpp
|
||||
@@ -35,7 +35,6 @@ PlacesModel::PlacesModel(QObject* parent
|
||||
showApplications_(true),
|
||||
showDesktop_(true),
|
||||
ejectIcon_(QIcon::fromTheme("media-eject")) {
|
||||
-
|
||||
setColumnCount(2);
|
||||
|
||||
placesRoot = new QStandardItem(tr("Places"));
|
||||
@@ -504,6 +503,23 @@ Qt::ItemFlags PlacesModel::flags(const Q
|
||||
return QStandardItemModel::flags(index);
|
||||
}
|
||||
|
||||
+
|
||||
+QVariant PlacesModel::data(const QModelIndex &index, int role) const {
|
||||
+ if(index.column() == 0 && index.parent().isValid()) {
|
||||
+ PlacesModelItem* item = static_cast<PlacesModelItem*>(QStandardItemModel::itemFromIndex(index));
|
||||
+ if(item != nullptr) {
|
||||
+ switch(role) {
|
||||
+ case FileInfoRole:
|
||||
+ return QVariant::fromValue<void*>(item->fileInfo());
|
||||
+ case FmIconRole:
|
||||
+ return QVariant::fromValue<void*>(item->icon());
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ return QStandardItemModel::data(index, role);
|
||||
+}
|
||||
+
|
||||
+
|
||||
bool PlacesModel::dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) {
|
||||
QStandardItem* item = itemFromIndex(parent);
|
||||
if(data->hasFormat("application/x-bookmark-row")) { // the data being dopped is a bookmark row
|
||||
--- libfm-qt-0.11.1.orig/src/placesmodel.h
|
||||
+++ libfm-qt-0.11.1/src/placesmodel.h
|
||||
@@ -40,6 +40,11 @@ Q_OBJECT
|
||||
friend class PlacesView;
|
||||
public:
|
||||
|
||||
+ enum {
|
||||
+ FileInfoRole = Qt::UserRole,
|
||||
+ FmIconRole
|
||||
+ };
|
||||
+
|
||||
// QAction used for popup menus
|
||||
class ItemAction : public QAction {
|
||||
public:
|
||||
@@ -74,6 +79,8 @@ public:
|
||||
}
|
||||
void setShowDesktop(bool show);
|
||||
|
||||
+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
|
||||
+
|
||||
public Q_SLOTS:
|
||||
void updateIcons();
|
||||
void updateTrash();
|
||||
--- libfm-qt-0.11.1.orig/src/placesmodelitem.cpp
|
||||
+++ libfm-qt-0.11.1/src/placesmodelitem.cpp
|
||||
@@ -21,6 +21,7 @@
|
||||
#include "placesmodelitem.h"
|
||||
#include "icontheme.h"
|
||||
#include <gio/gio.h>
|
||||
+#include <QPainter>
|
||||
|
||||
namespace Fm {
|
||||
|
||||
--- libfm-qt-0.11.1.orig/src/placesview.cpp
|
||||
+++ libfm-qt-0.11.1/src/placesview.cpp
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <QHeaderView>
|
||||
#include <QDebug>
|
||||
#include <QGuiApplication>
|
||||
+#include "folderitemdelegate.h"
|
||||
|
||||
namespace Fm {
|
||||
|
||||
@@ -43,6 +44,11 @@ PlacesView::PlacesView(QWidget* parent):
|
||||
|
||||
setIconSize(QSize(24, 24));
|
||||
|
||||
+ FolderItemDelegate* delegate = new FolderItemDelegate(this, this);
|
||||
+ delegate->setFileInfoRole(PlacesModel::FileInfoRole);
|
||||
+ delegate->setFmIconRole(PlacesModel::FmIconRole);
|
||||
+ setItemDelegateForColumn(0, delegate);
|
||||
+
|
||||
// FIXME: we may share this model amont all views
|
||||
model_ = new PlacesModel(this);
|
||||
setModel(model_);
|
||||
@ -1 +0,0 @@
|
||||
model-places.patch
|
||||
@ -0,0 +1,295 @@
|
||||
/*
|
||||
* Copyright (C) 2016 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*/
|
||||
|
||||
#include "pathbar.h"
|
||||
#include "pathbar_p.h"
|
||||
#include <QToolButton>
|
||||
#include <QPushButton>
|
||||
#include <QScrollArea>
|
||||
#include <QScrollBar>
|
||||
#include <QHBoxLayout>
|
||||
#include <QResizeEvent>
|
||||
#include <QContextMenuEvent>
|
||||
#include <QMenu>
|
||||
#include <QClipboard>
|
||||
#include <QApplication>
|
||||
#include <QTimer>
|
||||
#include <QDebug>
|
||||
#include "pathedit.h"
|
||||
|
||||
|
||||
namespace Fm {
|
||||
|
||||
PathBar::PathBar(QWidget *parent):
|
||||
QWidget(parent),
|
||||
tempPathEdit_(nullptr) {
|
||||
|
||||
QHBoxLayout* topLayout = new QHBoxLayout(this);
|
||||
topLayout->setContentsMargins(0, 0, 0, 0);
|
||||
topLayout->setSpacing(0);
|
||||
bool rtl(layoutDirection() == Qt::RightToLeft);
|
||||
|
||||
// the arrow button used to scroll to start of the path
|
||||
scrollToStart_ = new QToolButton(this);
|
||||
scrollToStart_->setArrowType(rtl ? Qt::RightArrow : Qt::LeftArrow);
|
||||
scrollToStart_->setAutoRepeat(true);
|
||||
scrollToStart_->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::MinimumExpanding);
|
||||
connect(scrollToStart_, &QToolButton::clicked, this, &PathBar::onScrollButtonClicked);
|
||||
topLayout->addWidget(scrollToStart_);
|
||||
|
||||
// there might be too many buttons when the path is long, so make it scrollable.
|
||||
scrollArea_ = new QScrollArea(this);
|
||||
scrollArea_->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
|
||||
scrollArea_->setFrameShape(QFrame::NoFrame);
|
||||
scrollArea_->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
|
||||
scrollArea_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
|
||||
scrollArea_->setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
|
||||
scrollArea_->verticalScrollBar()->setDisabled(true);
|
||||
connect(scrollArea_->horizontalScrollBar(), &QAbstractSlider::valueChanged, this, &PathBar::setArrowEnabledState);
|
||||
topLayout->addWidget(scrollArea_, 1); // stretch factor=1, make it expandable
|
||||
|
||||
// the arrow button used to scroll to end of the path
|
||||
scrollToEnd_ = new QToolButton(this);
|
||||
scrollToEnd_->setArrowType(rtl ? Qt::LeftArrow : Qt::RightArrow);
|
||||
scrollToEnd_->setAutoRepeat(true);
|
||||
scrollToEnd_->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::MinimumExpanding);
|
||||
connect(scrollToEnd_, &QToolButton::clicked, this, &PathBar::onScrollButtonClicked);
|
||||
topLayout->addWidget(scrollToEnd_);
|
||||
|
||||
// container widget of the path buttons
|
||||
buttonsWidget_ = new QWidget(this);
|
||||
buttonsWidget_->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
|
||||
|
||||
buttonsLayout_ = new QHBoxLayout(buttonsWidget_);
|
||||
buttonsLayout_->setContentsMargins(0, 0, 0, 0);
|
||||
buttonsLayout_->setSpacing(0);
|
||||
buttonsLayout_->setSizeConstraint(QLayout::SetFixedSize); // required when added to scroll area according to QScrollArea doc.
|
||||
scrollArea_->setWidget(buttonsWidget_); // make the buttons widget scrollable if the path is too long
|
||||
}
|
||||
|
||||
void PathBar::resizeEvent(QResizeEvent* event) {
|
||||
QWidget::resizeEvent(event);
|
||||
updateScrollButtonVisibility();
|
||||
}
|
||||
|
||||
void PathBar::wheelEvent(QWheelEvent* event) {
|
||||
QWidget::wheelEvent(event);
|
||||
QAbstractSlider::SliderAction action = QAbstractSlider::SliderNoAction;
|
||||
int vDelta = event->angleDelta().y();
|
||||
if(vDelta > 0) {
|
||||
if(scrollToStart_->isEnabled())
|
||||
action = QAbstractSlider::SliderSingleStepSub;
|
||||
}
|
||||
else if(vDelta < 0) {
|
||||
if(scrollToEnd_->isEnabled())
|
||||
action = QAbstractSlider::SliderSingleStepAdd;
|
||||
}
|
||||
scrollArea_->horizontalScrollBar()->triggerAction(action);
|
||||
}
|
||||
|
||||
void PathBar::mousePressEvent(QMouseEvent *event) {
|
||||
QWidget::mousePressEvent(event);
|
||||
if(event->button() == Qt::LeftButton) {
|
||||
openEditor();
|
||||
}
|
||||
else if(event->button() == Qt::MiddleButton) {
|
||||
PathButton* btn = qobject_cast<PathButton*>(childAt(event->x(), event->y()));
|
||||
if(btn != nullptr) {
|
||||
scrollArea_->ensureWidgetVisible(btn, 0);
|
||||
Q_EMIT middleClickChdir(btn->pathElement().dataPtr());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void PathBar::contextMenuEvent(QContextMenuEvent *event) {
|
||||
QMenu* menu = new QMenu(this);
|
||||
connect(menu, &QMenu::aboutToHide, menu, &QMenu::deleteLater);
|
||||
|
||||
QAction* action = menu->addAction(tr("&Edit Path"));
|
||||
connect(action, &QAction::triggered, this, &PathBar::openEditor);
|
||||
|
||||
action = menu->addAction(tr("&Copy Path"));
|
||||
connect(action, &QAction::triggered, this, &PathBar::copyPath);
|
||||
|
||||
menu->popup(mapToGlobal(event->pos()));
|
||||
}
|
||||
|
||||
void PathBar::updateScrollButtonVisibility() {
|
||||
// Wait for the horizontal scrollbar to be completely shaped.
|
||||
// Without this, the enabled state of arrow buttons might be
|
||||
// wrong when the pathbar is created for the first time.
|
||||
QTimer::singleShot(0, this, SLOT(setScrollButtonVisibility()));
|
||||
}
|
||||
|
||||
void PathBar::setScrollButtonVisibility() {
|
||||
bool showScrollers;
|
||||
if(tempPathEdit_ != nullptr) {
|
||||
showScrollers = false;
|
||||
}
|
||||
else {
|
||||
showScrollers = (buttonsLayout_->sizeHint().width() > width());
|
||||
}
|
||||
scrollToStart_->setVisible(showScrollers);
|
||||
scrollToEnd_->setVisible(showScrollers);
|
||||
if(showScrollers) {
|
||||
QScrollBar* sb = scrollArea_->horizontalScrollBar();
|
||||
int value = sb->value();
|
||||
scrollToStart_->setEnabled(value != sb->minimum());
|
||||
scrollToEnd_->setEnabled(value != sb->maximum());
|
||||
}
|
||||
}
|
||||
|
||||
void PathBar::onButtonToggled(bool checked) {
|
||||
if(checked) {
|
||||
PathButton* btn = static_cast<PathButton*>(sender());
|
||||
scrollArea_->ensureWidgetVisible(btn, 0); // make the button visible
|
||||
|
||||
currentPath_ = btn->pathElement();
|
||||
// qDebug("chdir: %s", currentPath_.displayName(false));
|
||||
Q_EMIT chdir(currentPath_.dataPtr());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void PathBar::onScrollButtonClicked() {
|
||||
QToolButton* btn = static_cast<QToolButton*>(sender());
|
||||
QAbstractSlider::SliderAction action = QAbstractSlider::SliderNoAction;
|
||||
if(btn == scrollToEnd_)
|
||||
action = QAbstractSlider::SliderSingleStepAdd;
|
||||
else if (btn == scrollToStart_)
|
||||
action = QAbstractSlider::SliderSingleStepSub;
|
||||
scrollArea_->horizontalScrollBar()->triggerAction(action);
|
||||
}
|
||||
|
||||
void PathBar::setPath(Path path) {
|
||||
if(!currentPath_.isNull() && !path.isNull() && currentPath_ == path) // same path, do nothing
|
||||
return;
|
||||
|
||||
currentPath_ = path;
|
||||
int buttonCount = buttonsLayout_->count() - 1; // the last item is a spacer
|
||||
// check if we already have a button for this path (FIXME: this loop is inefficient)
|
||||
for(int i = buttonCount - 1; i >= 0; --i) {
|
||||
PathButton* btn = static_cast<PathButton*>(buttonsLayout_->itemAt(i)->widget());
|
||||
if(btn->pathElement() == path) { // we have a button for this path
|
||||
btn->setChecked(true); // toggle the button
|
||||
/* we don't need to emit chdir signal here since later
|
||||
* toggled signal will be triggered on the button, which
|
||||
* in turns emit chdir. */
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
/* FIXME: if the new path is the subdir of our full path, actually
|
||||
* we can append several new buttons rather than re-create
|
||||
* all of the buttons. */
|
||||
|
||||
setUpdatesEnabled(false);
|
||||
// we do not have the path in the buttons list
|
||||
// destroy existing path element buttons and the spacer
|
||||
QLayoutItem* item;
|
||||
while((item = buttonsLayout_->takeAt(0)) != nullptr) {
|
||||
delete item->widget();
|
||||
delete item;
|
||||
}
|
||||
|
||||
Path pathElement = path;
|
||||
// create new buttons for the new path
|
||||
while(!pathElement.isNull()) {
|
||||
// qDebug("%s", pathElement.displayName(false));
|
||||
PathButton* btn = new PathButton(pathElement, buttonsWidget_);
|
||||
btn->show();
|
||||
connect(btn, &QPushButton::toggled, this, &PathBar::onButtonToggled);
|
||||
pathElement = pathElement.getParent();
|
||||
buttonsLayout_->insertWidget(0, btn);
|
||||
}
|
||||
buttonCount = buttonsLayout_->count();
|
||||
if(buttonCount) {
|
||||
PathButton* lastBtn = static_cast<PathButton*>(buttonsLayout_->itemAt(buttonCount - 1)->widget());
|
||||
// we don't have to emit the chdir signal since the "onButtonToggled()" slot will be triggered by this.
|
||||
lastBtn->setChecked(true);
|
||||
}
|
||||
buttonsLayout_->addStretch(1);
|
||||
|
||||
// we don't want to scroll vertically. make the scroll area fit the height of the buttons
|
||||
// FIXME: this is a little bit hackish :-(
|
||||
scrollArea_->setFixedHeight(buttonsLayout_->sizeHint().height());
|
||||
updateScrollButtonVisibility();
|
||||
setUpdatesEnabled(true);
|
||||
}
|
||||
|
||||
void PathBar::openEditor() {
|
||||
if(tempPathEdit_ == nullptr) {
|
||||
tempPathEdit_ = new PathEdit(this);
|
||||
layout()->replaceWidget(scrollArea_, tempPathEdit_, Qt::FindDirectChildrenOnly);
|
||||
scrollArea_->hide();
|
||||
scrollToStart_->setVisible(false);
|
||||
scrollToEnd_->setVisible(false);
|
||||
char* pathStr = currentPath_.toStr();
|
||||
tempPathEdit_->setText(pathStr);
|
||||
g_free(pathStr);
|
||||
|
||||
connect(tempPathEdit_, &PathEdit::returnPressed, this, &PathBar::onReturnPressed);
|
||||
connect(tempPathEdit_, &PathEdit::editingFinished, this, &PathBar::closeEditor);
|
||||
}
|
||||
tempPathEdit_->setFocus();
|
||||
tempPathEdit_->selectAll();
|
||||
}
|
||||
|
||||
void PathBar::closeEditor() {
|
||||
if(tempPathEdit_ == nullptr)
|
||||
return;
|
||||
// If a menu has popped up synchronously (with QMenu::exec), the path buttons may be drawn
|
||||
// but the path-edit may not disappear until the menu is closed. So, we hide it here.
|
||||
tempPathEdit_->setVisible(false);
|
||||
layout()->replaceWidget(tempPathEdit_, scrollArea_, Qt::FindDirectChildrenOnly);
|
||||
scrollArea_->show();
|
||||
if(buttonsLayout_->sizeHint().width() > width()) {
|
||||
scrollToStart_->setVisible(true);
|
||||
scrollToEnd_->setVisible(true);
|
||||
}
|
||||
|
||||
tempPathEdit_->deleteLater();
|
||||
tempPathEdit_ = nullptr;
|
||||
updateScrollButtonVisibility();
|
||||
|
||||
Q_EMIT editingFinished();
|
||||
}
|
||||
|
||||
void PathBar::copyPath() {
|
||||
char* pathStr = currentPath_.toStr();
|
||||
QApplication::clipboard()->setText(pathStr);
|
||||
g_free(pathStr);
|
||||
}
|
||||
|
||||
void PathBar::onReturnPressed() {
|
||||
QByteArray pathStr = tempPathEdit_->text().toLocal8Bit();
|
||||
Path path = Path::newForDisplayName(pathStr.constData());
|
||||
setPath(path);
|
||||
}
|
||||
|
||||
void PathBar::setArrowEnabledState(int value) {
|
||||
if(buttonsLayout_->sizeHint().width() > width()) {
|
||||
QScrollBar* sb = scrollArea_->horizontalScrollBar();
|
||||
scrollToStart_->setEnabled(value != sb->minimum());
|
||||
scrollToEnd_->setEnabled(value != sb->maximum());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
} // namespace Fm
|
||||
@ -0,0 +1,86 @@
|
||||
/*
|
||||
* Copyright (C) 2016 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef FM_PATHBAR_H
|
||||
#define FM_PATHBAR_H
|
||||
|
||||
#include "libfmqtglobals.h"
|
||||
#include <QWidget>
|
||||
#include "path.h"
|
||||
|
||||
class QToolButton;
|
||||
class QScrollArea;
|
||||
class QPushButton;
|
||||
class QHBoxLayout;
|
||||
|
||||
namespace Fm {
|
||||
|
||||
class PathEdit;
|
||||
|
||||
class LIBFM_QT_API PathBar: public QWidget {
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit PathBar(QWidget *parent = 0);
|
||||
|
||||
Path path() {
|
||||
return currentPath_;
|
||||
}
|
||||
|
||||
void setPath(Path path);
|
||||
|
||||
Q_SIGNALS:
|
||||
void chdir(FmPath* path);
|
||||
void middleClickChdir(FmPath* path);
|
||||
void editingFinished();
|
||||
|
||||
public Q_SLOTS:
|
||||
void openEditor();
|
||||
void closeEditor();
|
||||
void copyPath();
|
||||
|
||||
private Q_SLOTS:
|
||||
void onButtonToggled(bool checked);
|
||||
void onScrollButtonClicked();
|
||||
void onReturnPressed();
|
||||
void setArrowEnabledState(int value);
|
||||
void setScrollButtonVisibility();
|
||||
|
||||
protected:
|
||||
void resizeEvent(QResizeEvent* event);
|
||||
void wheelEvent (QWheelEvent* event);
|
||||
void mousePressEvent(QMouseEvent *event);
|
||||
void contextMenuEvent(QContextMenuEvent *event);
|
||||
|
||||
private:
|
||||
void updateScrollButtonVisibility();
|
||||
|
||||
private:
|
||||
QToolButton* scrollToStart_;
|
||||
QToolButton* scrollToEnd_;
|
||||
QScrollArea* scrollArea_;
|
||||
QWidget* buttonsWidget_;
|
||||
QHBoxLayout* buttonsLayout_;
|
||||
PathEdit* tempPathEdit_;
|
||||
|
||||
Path currentPath_; // currently active path
|
||||
};
|
||||
|
||||
} // namespace Fm
|
||||
|
||||
#endif // FM_PATHBAR_H
|
||||
@ -0,0 +1,78 @@
|
||||
/*
|
||||
* Copyright (C) 2016 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef FM_PATHBAR_P_H
|
||||
#define FM_PATHBAR_P_H
|
||||
|
||||
#include <QToolButton>
|
||||
#include <QStyle>
|
||||
#include <QEvent>
|
||||
#include <QMouseEvent>
|
||||
#include "path.h"
|
||||
|
||||
namespace Fm {
|
||||
|
||||
class PathButton: public QToolButton {
|
||||
Q_OBJECT
|
||||
public:
|
||||
PathButton(Fm::Path pathElement, QWidget* parent = nullptr):
|
||||
QToolButton(parent),
|
||||
pathElement_(pathElement) {
|
||||
|
||||
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::MinimumExpanding);
|
||||
setCheckable(true);
|
||||
setAutoExclusive(true);
|
||||
setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
|
||||
/* respect the toolbar icon size (can be set with some styles) */
|
||||
int icnSize = style()->pixelMetric(QStyle::PM_ToolBarIconSize);
|
||||
setIconSize(QSize(icnSize, icnSize));
|
||||
|
||||
char* label = pathElement.displayBasename();
|
||||
setText(label);
|
||||
g_free(label);
|
||||
|
||||
if(pathElement.getParent().isNull()) { /* this element is root */
|
||||
QIcon icon = QIcon::fromTheme("drive-harddisk");
|
||||
setIcon(icon);
|
||||
}
|
||||
}
|
||||
|
||||
Path pathElement() {
|
||||
return pathElement_;
|
||||
}
|
||||
|
||||
void setPathElement(Path pathElement) {
|
||||
pathElement_ = pathElement;
|
||||
}
|
||||
|
||||
void changeEvent(QEvent* event) override {
|
||||
QToolButton::changeEvent(event);
|
||||
if(event->type() == QEvent::StyleChange) {
|
||||
int icnSize = style()->pixelMetric(QStyle::PM_ToolBarIconSize);
|
||||
setIconSize(QSize(icnSize, icnSize));
|
||||
}
|
||||
}
|
||||
|
||||
private:
|
||||
Path pathElement_;
|
||||
};
|
||||
|
||||
} // namespace Fm
|
||||
|
||||
#endif // FM_PATHBAR_P_H
|
||||
Loading…
Reference in new issue