kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-04 17:30:55 +00:00
Code Issues Projects Releases Wiki Activity

- compile with trunk kdelibs

Browse Source 
svn path=/trunk/playground/utils/dolphin/; revision=610667
This commit is contained in:
Simon Hausmann 2006-12-04 21:51:17 +00:00
parent d27b30a66a
commit d567bc3aea
3 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/dolphincontextmenu.cpp
View File

@ -84,18 +84,18 @@ void DolphinContextMenu::openViewportContextMenu()
// setup 'Create New' menu
KMenu* createNewMenu = new KMenu();
KAction* createFolderAction = dolphin->actionCollection()->action("create_folder");
QAction* createFolderAction = dolphin->actionCollection()->action("create_folder");
if (createFolderAction != 0) {
createFolderAction->plug(createNewMenu);
createNewMenu->addAction(createFolderAction);
}
createNewMenu->insertSeparator();
KAction* action = 0;
QAction* action = 0;
Q3PtrListIterator<KAction> fileGrouptIt(dolphin->fileGroupActions());
while ((action = fileGrouptIt.current()) != 0) {
action->plug(createNewMenu);
createNewMenu->addAction(action);
++fileGrouptIt;
}
@ -122,20 +122,20 @@ void DolphinContextMenu::openViewportContextMenu()
popup->insertItem(SmallIcon("filenew"), i18n("Create New"), createNewMenu);
popup->insertSeparator();
KAction* pasteAction = dolphin->actionCollection()->action(KStdAction::stdName(KStdAction::Paste));
pasteAction->plug(popup);
QAction* pasteAction = dolphin->actionCollection()->action(KStdAction::stdName(KStdAction::Paste));
popup->addAction(pasteAction);
// setup 'View Mode' menu
KMenu* viewModeMenu = new KMenu();
KAction* iconsMode = dolphin->actionCollection()->action("icons");
iconsMode->plug(viewModeMenu);
QAction* iconsMode = dolphin->actionCollection()->action("icons");
viewModeMenu->addAction(iconsMode);
KAction* detailsMode = dolphin->actionCollection()->action("details");
detailsMode->plug(viewModeMenu);
QAction* detailsMode = dolphin->actionCollection()->action("details");
viewModeMenu->addAction(detailsMode);
KAction* previewsMode = dolphin->actionCollection()->action("previews");
previewsMode->plug(viewModeMenu);
QAction* previewsMode = dolphin->actionCollection()->action("previews");
viewModeMenu->addAction(previewsMode);
popup->insertItem(i18n("View Mode"), viewModeMenu);
popup->insertSeparator();
@ -183,26 +183,25 @@ void DolphinContextMenu::openItemContextMenu()
const KStdAction::StdAction actionNames[] = { KStdAction::Cut, KStdAction::Copy, KStdAction::Paste };
const int count = sizeof(actionNames) / sizeof(KStdAction::StdAction);
for (int i = 0; i < count; ++i) {
KAction* action = dolphin->actionCollection()->action(KStdAction::stdName(actionNames[i]));
if (action != 0) {
action->plug(popup);
}
QAction* action = dolphin->actionCollection()->action(KStdAction::stdName(actionNames[i]));
if (action)
popup->addAction(action);
}
popup->insertSeparator();
// insert 'Rename'
KAction* renameAction = dolphin->actionCollection()->action("rename");
renameAction->plug(popup);
QAction* renameAction = dolphin->actionCollection()->action("rename");
popup->addAction(renameAction);
// insert 'Move to Trash' for local Urls, otherwise insert 'Delete'
const KUrl& url = dolphin->activeView()->url();
if (url.isLocalFile()) {
KAction* moveToTrashAction = dolphin->actionCollection()->action("move_to_trash");
moveToTrashAction->plug(popup);
QAction* moveToTrashAction = dolphin->actionCollection()->action("move_to_trash");
popup->addAction(moveToTrashAction);
}
else {
KAction* deleteAction = dolphin->actionCollection()->action("delete");
deleteAction->plug(popup);
QAction* deleteAction = dolphin->actionCollection()->action("delete");
popup->addAction(deleteAction);
}
// insert 'Bookmark this folder...' entry
@ -225,8 +224,8 @@ void DolphinContextMenu::openItemContextMenu()
// insert 'Properties...' entry
popup->insertSeparator();
KAction* propertiesAction = dolphin->actionCollection()->action("properties");
propertiesAction->plug(popup);
QAction* propertiesAction = dolphin->actionCollection()->action("properties");
popup->addAction(propertiesAction);
QAction *activatedAction = popup->exec(m_pos);

30
src/dolphinmainwindow.cpp
View File

@ -268,7 +268,7 @@ void DolphinMainWindow::slotShowFilterBarChanged()
void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting)
{
KAction* action = 0;
QAction* action = 0;
switch (sorting) {
case DolphinView::SortByName:
action = actionCollection()->action("by_name");
@ -306,7 +306,7 @@ void DolphinMainWindow::slotSelectionChanged()
selectedUrlsCount += m_view[SecondaryIdx]->selectedUrls().count();
}
KAction* compareFilesAction = actionCollection()->action("compare_files");
QAction* compareFilesAction = actionCollection()->action("compare_files");
compareFilesAction->setEnabled(selectedUrlsCount == 2);
m_activeView->updateStatusBar();
@ -623,7 +623,7 @@ void DolphinMainWindow::slotDeleteFileFinished(KJob* job)
void DolphinMainWindow::slotUndoAvailable(bool available)
{
KAction* undoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Undo));
QAction* undoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Undo));
if (undoAction != 0) {
undoAction->setEnabled(available);
}
@ -631,7 +631,7 @@ void DolphinMainWindow::slotUndoAvailable(bool available)
void DolphinMainWindow::slotUndoTextChanged(const QString& text)
{
KAction* undoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Undo));
QAction* undoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Undo));
if (undoAction != 0) {
undoAction->setText(text);
}
@ -639,7 +639,7 @@ void DolphinMainWindow::slotUndoTextChanged(const QString& text)
void DolphinMainWindow::slotRedoAvailable(bool available)
{
KAction* redoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Redo));
QAction* redoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Redo));
if (redoAction != 0) {
redoAction->setEnabled(available);
}
@ -647,7 +647,7 @@ void DolphinMainWindow::slotRedoAvailable(bool available)
void DolphinMainWindow::slotRedoTextChanged(const QString& text)
{
KAction* redoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Redo));
QAction* redoAction = actionCollection()->action(KStdAction::stdName(KStdAction::Redo));
if (redoAction != 0) {
redoAction->setText(text);
}
@ -718,7 +718,7 @@ void DolphinMainWindow::paste()
void DolphinMainWindow::updatePasteAction()
{
KAction* pasteAction = actionCollection()->action(KStdAction::stdName(KStdAction::Paste));
QAction* pasteAction = actionCollection()->action(KStdAction::stdName(KStdAction::Paste));
if (pasteAction == 0) {
return;
}
@ -1436,12 +1436,12 @@ void DolphinMainWindow::updateHistory()
int index = 0;
const Q3ValueList<UrlNavigator::HistoryElem> list = m_activeView->urlHistory(index);
KAction* backAction = actionCollection()->action("go_back");
QAction* backAction = actionCollection()->action("go_back");
if (backAction != 0) {
backAction->setEnabled(index < static_cast<int>(list.count()) - 1);
}
KAction* forwardAction = actionCollection()->action("go_forward");
QAction* forwardAction = actionCollection()->action("go_forward");
if (forwardAction != 0) {
forwardAction->setEnabled(index > 0);
}
@ -1456,7 +1456,7 @@ void DolphinMainWindow::updateEditActions()
else {
stateChanged("has_selection");
KAction* renameAction = actionCollection()->action("rename");
QAction* renameAction = actionCollection()->action("rename");
if (renameAction != 0) {
renameAction->setEnabled(list.count() >= 1);
}
@ -1475,7 +1475,7 @@ void DolphinMainWindow::updateEditActions()
++it;
}
KAction* moveToTrashAction = actionCollection()->action("move_to_trash");
QAction* moveToTrashAction = actionCollection()->action("move_to_trash");
moveToTrashAction->setEnabled(enableMoveToTrash);
}
updatePasteAction();
@ -1483,17 +1483,17 @@ void DolphinMainWindow::updateEditActions()
void DolphinMainWindow::updateViewActions()
{
KAction* zoomInAction = actionCollection()->action(KStdAction::stdName(KStdAction::ZoomIn));
QAction* zoomInAction = actionCollection()->action(KStdAction::stdName(KStdAction::ZoomIn));
if (zoomInAction != 0) {
zoomInAction->setEnabled(m_activeView->isZoomInPossible());
}
KAction* zoomOutAction = actionCollection()->action(KStdAction::stdName(KStdAction::ZoomOut));
QAction* zoomOutAction = actionCollection()->action(KStdAction::stdName(KStdAction::ZoomOut));
if (zoomOutAction != 0) {
zoomOutAction->setEnabled(m_activeView->isZoomOutPossible());
}
KAction* action = 0;
QAction* action = 0;
switch (m_activeView->mode()) {
case DolphinView::IconsView:
action = actionCollection()->action("icons");
@ -1530,7 +1530,7 @@ void DolphinMainWindow::updateViewActions()
void DolphinMainWindow::updateGoActions()
{
KAction* goUpAction = actionCollection()->action(KStdAction::stdName(KStdAction::Up));
QAction* goUpAction = actionCollection()->action(KStdAction::stdName(KStdAction::Up));
const KUrl& currentUrl = m_activeView->url();
goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
}

2
src/urlnavigator.cpp
View File

@ -470,7 +470,7 @@ void UrlNavigator::updateContent()
m_toggleButton->setToolTip(QString());
QString path(url().pathOrUrl());
const KAction* action = dolphinView()->mainWindow()->actionCollection()->action("editable_location");
const QAction* action = dolphinView()->mainWindow()->actionCollection()->action("editable_location");
// TODO: registry of default shortcuts
QString shortcut = action? action->shortcut().toString() : "Ctrl+L";
if (m_toggleButton->isChecked()) {