Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Unmaintained
KDE Base Apps
Commits
55c9e277
Commit
55c9e277
authored
Nov 20, 2011
by
Aaron J. Seigo
Browse files
update the past action only when showing it
BUG:243041
parent
88eeb941
Changes
2
Hide whitespace changes
Inline
Side-by-side
plasma/applets/folderview/folderview.cpp
View file @
55c9e277
...
...
@@ -414,7 +414,10 @@ void FolderView::init()
}
}
/*
TODO Mark the cut icons as cut
connect(QApplication::clipboard(), SIGNAL(dataChanged()), SLOT(clipboardDataChanged()));
*/
}
void
FolderView
::
configChanged
()
...
...
@@ -1187,28 +1190,17 @@ void FolderView::networkStatusChanged(Solid::Networking::Status status)
}
}
/*
// TODO Mark the cut icons as cut, but test performance!
void FolderView::clipboardDataChanged()
{
const QMimeData *mimeData = QApplication::clipboard()->mimeData();
if (KonqMimeData::decodeIsCutSelection(mimeData)) {
KUrl::List urls = KUrl::List::fromMimeData(mimeData);
// TODO Mark the cut icons as cut
}
// Update the paste action
if
(
QAction
*
action
=
m_actionCollection
.
action
(
"paste"
))
{
const
QString
actionText
=
KIO
::
pasteActionText
();
if
(
!
actionText
.
isEmpty
())
{
action
->
setText
(
actionText
);
action
->
setEnabled
(
true
);
}
else
{
action
->
setText
(
i18n
(
"&Paste"
));
action
->
setEnabled
(
false
);
}
.. marking items as cut code would go here ..
}
}
*/
void
FolderView
::
saveIconPositions
()
const
{
...
...
@@ -1584,7 +1576,7 @@ void FolderView::createActions()
// Create the new menu
m_newMenu
=
new
KNewFileMenu
(
&
m_actionCollection
,
"new_menu"
,
QApplication
::
desktop
());
m_newMenu
->
setModal
(
false
);
connect
(
m_newMenu
->
menu
(),
SIGNAL
(
aboutToShow
()),
this
,
SLOT
(
aboutToShowCreateNew
()));
m_actionCollection
.
addAction
(
"lock_icons"
,
lockIcons
);
...
...
@@ -1599,6 +1591,20 @@ void FolderView::createActions()
}
}
void
FolderView
::
updatePasteAction
()
{
if
(
QAction
*
paste
=
m_actionCollection
.
action
(
"paste"
))
{
const
QString
pasteText
=
KIO
::
pasteActionText
();
if
(
pasteText
.
isEmpty
())
{
paste
->
setText
(
i18n
(
"&Paste"
));
paste
->
setEnabled
(
false
);
}
else
{
paste
->
setText
(
pasteText
);
paste
->
setEnabled
(
true
);
}
}
}
QList
<
QAction
*>
FolderView
::
contextualActions
()
{
QList
<
QAction
*>
actions
;
...
...
@@ -1614,7 +1620,10 @@ QList<QAction*> FolderView::contextualActions()
}
actions
.
append
(
m_actionCollection
.
action
(
"undo"
));
actions
.
append
(
m_actionCollection
.
action
(
"paste"
));
if
(
QAction
*
paste
=
m_actionCollection
.
action
(
"paste"
))
{
updatePasteAction
();
actions
.
append
(
paste
);
}
QAction
*
separator
=
new
QAction
(
this
);
separator
->
setSeparator
(
true
);
...
...
@@ -1916,8 +1925,11 @@ void FolderView::showContextMenu(QWidget *widget, const QPoint &pos, const QMode
QAction
*
pasteTo
=
m_actionCollection
.
action
(
"pasteto"
);
if
(
pasteTo
)
{
pasteTo
->
setEnabled
(
m_actionCollection
.
action
(
"paste"
)
->
isEnabled
());
pasteTo
->
setText
(
m_actionCollection
.
action
(
"paste"
)
->
text
());
if
(
QAction
*
paste
=
m_actionCollection
.
action
(
"paste"
))
{
updatePasteAction
();
pasteTo
->
setEnabled
(
paste
->
isEnabled
());
pasteTo
->
setText
(
paste
->
text
());
}
}
QList
<
QAction
*>
editActions
;
...
...
plasma/applets/folderview/folderview.h
View file @
55c9e277
...
...
@@ -139,7 +139,7 @@ protected slots:
void
iconSettingsChanged
(
int
group
);
void
themeChanged
();
void
networkStatusChanged
(
Solid
::
Networking
::
Status
status
);
void
clipboardDataChanged
();
//
void clipboardDataChanged();
void
updateScreenRegion
();
void
showPreviewConfigDialog
();
...
...
@@ -147,6 +147,7 @@ private slots:
void
setTitleText
();
private:
void
updatePasteAction
();
void
addActions
(
AbstractItemView
*
view
);
QColor
textColor
()
const
;
void
setupIconView
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment