mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Merge remote-tracking branch 'origin/KDE/4.10'
This commit is contained in:
commit
e8c3df5f60
|
@ -642,10 +642,10 @@ void KStandardItemListWidget::editedRoleChanged(const QByteArray& current, const
|
|||
if (m_roleEditor) {
|
||||
emit roleEditingCanceled(index(), current, data().value(current));
|
||||
|
||||
disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)),
|
||||
this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
|
||||
disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
|
||||
this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
|
||||
disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(QByteArray,QVariant)),
|
||||
this, SLOT(slotRoleEditingCanceled(QByteArray,QVariant)));
|
||||
disconnect(m_roleEditor, SIGNAL(roleEditingFinished(QByteArray,QVariant)),
|
||||
this, SLOT(slotRoleEditingFinished(QByteArray,QVariant)));
|
||||
m_oldRoleEditor = m_roleEditor;
|
||||
m_roleEditor->hide();
|
||||
m_roleEditor = 0;
|
||||
|
@ -663,7 +663,6 @@ void KStandardItemListWidget::editedRoleChanged(const QByteArray& current, const
|
|||
const TextInfo* textInfo = m_textInfo.value("text");
|
||||
|
||||
m_roleEditor = new KItemListRoleEditor(parent);
|
||||
m_roleEditor->setIndex(index());
|
||||
m_roleEditor->setRole(current);
|
||||
m_roleEditor->setFont(styleOption().font);
|
||||
|
||||
|
@ -682,10 +681,10 @@ void KStandardItemListWidget::editedRoleChanged(const QByteArray& current, const
|
|||
m_roleEditor->setTextCursor(cursor);
|
||||
}
|
||||
|
||||
connect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)),
|
||||
this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
|
||||
connect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
|
||||
this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
|
||||
connect(m_roleEditor, SIGNAL(roleEditingCanceled(QByteArray,QVariant)),
|
||||
this, SLOT(slotRoleEditingCanceled(QByteArray,QVariant)));
|
||||
connect(m_roleEditor, SIGNAL(roleEditingFinished(QByteArray,QVariant)),
|
||||
this, SLOT(slotRoleEditingFinished(QByteArray,QVariant)));
|
||||
|
||||
// Adjust the geometry of the editor
|
||||
QRectF rect = roleEditingRect(current);
|
||||
|
@ -746,21 +745,19 @@ void KStandardItemListWidget::slotCutItemsChanged()
|
|||
}
|
||||
}
|
||||
|
||||
void KStandardItemListWidget::slotRoleEditingCanceled(int index,
|
||||
const QByteArray& role,
|
||||
void KStandardItemListWidget::slotRoleEditingCanceled(const QByteArray& role,
|
||||
const QVariant& value)
|
||||
{
|
||||
closeRoleEditor();
|
||||
emit roleEditingCanceled(index, role, value);
|
||||
emit roleEditingCanceled(index(), role, value);
|
||||
setEditedRole(QByteArray());
|
||||
}
|
||||
|
||||
void KStandardItemListWidget::slotRoleEditingFinished(int index,
|
||||
const QByteArray& role,
|
||||
void KStandardItemListWidget::slotRoleEditingFinished(const QByteArray& role,
|
||||
const QVariant& value)
|
||||
{
|
||||
closeRoleEditor();
|
||||
emit roleEditingFinished(index, role, value);
|
||||
emit roleEditingFinished(index(), role, value);
|
||||
setEditedRole(QByteArray());
|
||||
}
|
||||
|
||||
|
@ -1307,10 +1304,10 @@ QRectF KStandardItemListWidget::roleEditingRect(const QByteArray& role) const
|
|||
|
||||
void KStandardItemListWidget::closeRoleEditor()
|
||||
{
|
||||
disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)),
|
||||
this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
|
||||
disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
|
||||
this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
|
||||
disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(QByteArray,QVariant)),
|
||||
this, SLOT(slotRoleEditingCanceled(QByteArray,QVariant)));
|
||||
disconnect(m_roleEditor, SIGNAL(roleEditingFinished(QByteArray,QVariant)),
|
||||
this, SLOT(slotRoleEditingFinished(QByteArray,QVariant)));
|
||||
|
||||
if (m_roleEditor->hasFocus()) {
|
||||
// If the editing was not ended by a FocusOut event, we have
|
||||
|
|
|
@ -160,8 +160,8 @@ protected:
|
|||
|
||||
private slots:
|
||||
void slotCutItemsChanged();
|
||||
void slotRoleEditingCanceled(int index, const QByteArray& role, const QVariant& value);
|
||||
void slotRoleEditingFinished(int index, const QByteArray& role, const QVariant& value);
|
||||
void slotRoleEditingCanceled(const QByteArray& role, const QVariant& value);
|
||||
void slotRoleEditingFinished(const QByteArray& role, const QVariant& value);
|
||||
|
||||
private:
|
||||
void triggerCacheRefreshing();
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
|
||||
KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) :
|
||||
KTextEdit(parent),
|
||||
m_index(0),
|
||||
m_role(),
|
||||
m_blockFinishedSignal(false)
|
||||
{
|
||||
|
@ -46,16 +45,6 @@ KItemListRoleEditor::~KItemListRoleEditor()
|
|||
{
|
||||
}
|
||||
|
||||
void KItemListRoleEditor::setIndex(int index)
|
||||
{
|
||||
m_index = index;
|
||||
}
|
||||
|
||||
int KItemListRoleEditor::index() const
|
||||
{
|
||||
return m_index;
|
||||
}
|
||||
|
||||
void KItemListRoleEditor::setRole(const QByteArray& role)
|
||||
{
|
||||
m_role = role;
|
||||
|
@ -95,7 +84,7 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
|
|||
// a roleEditingFinished signal (see KItemListRoleEditor::event),
|
||||
// which is not wanted in this case.
|
||||
m_blockFinishedSignal = true;
|
||||
emit roleEditingCanceled(m_index, m_role, KIO::encodeFileName(toPlainText()));
|
||||
emit roleEditingCanceled(m_role, KIO::encodeFileName(toPlainText()));
|
||||
m_blockFinishedSignal = false;
|
||||
event->accept();
|
||||
return;
|
||||
|
@ -139,7 +128,7 @@ void KItemListRoleEditor::autoAdjustSize()
|
|||
void KItemListRoleEditor::emitRoleEditingFinished()
|
||||
{
|
||||
if (!m_blockFinishedSignal) {
|
||||
emit roleEditingFinished(m_index, m_role, KIO::encodeFileName(toPlainText()));
|
||||
emit roleEditingFinished(m_role, KIO::encodeFileName(toPlainText()));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -41,17 +41,14 @@ public:
|
|||
explicit KItemListRoleEditor(QWidget* parent);
|
||||
virtual ~KItemListRoleEditor();
|
||||
|
||||
void setIndex(int index);
|
||||
int index() const;
|
||||
|
||||
void setRole(const QByteArray& role);
|
||||
QByteArray role() const;
|
||||
|
||||
virtual bool eventFilter(QObject* watched, QEvent* event);
|
||||
|
||||
signals:
|
||||
void roleEditingFinished(int index, const QByteArray& role, const QVariant& value);
|
||||
void roleEditingCanceled(int index, const QByteArray& role, const QVariant& value);
|
||||
void roleEditingFinished(const QByteArray& role, const QVariant& value);
|
||||
void roleEditingCanceled(const QByteArray& role, const QVariant& value);
|
||||
|
||||
protected:
|
||||
virtual bool event(QEvent* event);
|
||||
|
@ -72,7 +69,6 @@ private:
|
|||
void emitRoleEditingFinished();
|
||||
|
||||
private:
|
||||
int m_index;
|
||||
QByteArray m_role;
|
||||
bool m_blockFinishedSignal;
|
||||
};
|
||||
|
|
|
@ -177,8 +177,8 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
|
|||
this, SLOT(slotSortRoleChangedByHeader(QByteArray,QByteArray)));
|
||||
connect(m_view, SIGNAL(visibleRolesChanged(QList<QByteArray>,QList<QByteArray>)),
|
||||
this, SLOT(slotVisibleRolesChangedByHeader(QList<QByteArray>,QList<QByteArray>)));
|
||||
connect(m_view, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
|
||||
this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
|
||||
connect(m_view, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)),
|
||||
this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
|
||||
connect(m_view->header(), SIGNAL(columnWidthChanged(QByteArray,qreal,qreal)),
|
||||
this, SLOT(slotHeaderColumnWidthChanged(QByteArray,qreal,qreal)));
|
||||
|
||||
|
@ -612,6 +612,9 @@ void DolphinView::setUrl(const KUrl& url)
|
|||
|
||||
hideToolTip();
|
||||
|
||||
disconnect(m_view, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
|
||||
this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
|
||||
|
||||
// It is important to clear the items from the model before
|
||||
// applying the view properties, otherwise expensive operations
|
||||
// might be done on the existing items although they get cleared
|
||||
|
@ -651,6 +654,9 @@ void DolphinView::renameSelectedItems()
|
|||
if (items.count() == 1 && GeneralSettings::renameInline()) {
|
||||
const int index = m_model->index(items.first());
|
||||
m_view->editRole(index, "text");
|
||||
|
||||
connect(m_view, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
|
||||
this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
|
||||
} else {
|
||||
RenameDialog* dialog = new RenameDialog(this, items);
|
||||
dialog->setAttribute(Qt::WA_DeleteOnClose);
|
||||
|
@ -1439,8 +1445,17 @@ void DolphinView::slotVisibleRolesChangedByHeader(const QList<QByteArray>& curre
|
|||
emit visibleRolesChanged(m_visibleRoles, previousVisibleRoles);
|
||||
}
|
||||
|
||||
void DolphinView::slotRoleEditingCanceled(int index, const QByteArray& role, const QVariant& value)
|
||||
{
|
||||
disconnect(m_view, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
|
||||
this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
|
||||
}
|
||||
|
||||
void DolphinView::slotRoleEditingFinished(int index, const QByteArray& role, const QVariant& value)
|
||||
{
|
||||
disconnect(m_view, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
|
||||
this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
|
||||
|
||||
if (index < 0 || index >= m_model->count()) {
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -670,6 +670,7 @@ private slots:
|
|||
void slotVisibleRolesChangedByHeader(const QList<QByteArray>& current,
|
||||
const QList<QByteArray>& previous);
|
||||
|
||||
void slotRoleEditingCanceled(int index, const QByteArray& role, const QVariant& value);
|
||||
void slotRoleEditingFinished(int index, const QByteArray& role, const QVariant& value);
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue