kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-19 00:11:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue that the "Show Full Location" action is not synchronized with the editable state of the URL navigator (thanks to David Benjamin for the patch).

Browse source 
BUG: 156891

svn path=/trunk/KDE/kdebase/apps/; revision=771918
This commit is contained in:
Peter Penz 2008-02-07 07:27:06 +00:00
parent d38bb6891a
commit 368e7d615a
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/dolphinmainwindow.cpp
View file

@ -259,6 +259,13 @@ void DolphinMainWindow::slotAdditionalInfoChanged()
view->updateAdditionalInfoActions(actionCollection());
}
void DolphinMainWindow::slotEditableStateChanged(bool editable)
{
KToggleAction* editableLocationAction =
static_cast<KToggleAction*>(actionCollection()->action("editable_location"));
editableLocationAction->setChecked(editable);
}
void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection)
{
updateEditActions();
@ -1058,9 +1065,7 @@ void DolphinMainWindow::setupActions()
stop->setIcon(KIcon("process-stop"));
connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading()));
// TODO: the URL navigator must emit a signal if the editable state has been
// changed, so that the corresponding showFullLocation action is updated. Also
// the naming "Show full Location" is currently confusing...
// TODO: the naming "Show full Location" is currently confusing...
KToggleAction* showFullLocation = actionCollection()->add<KToggleAction>("editable_location");
showFullLocation->setText(i18nc("@action:inmenu Navigation Bar", "Show Full Location"));
showFullLocation->setShortcut(Qt::CTRL | Qt::Key_L);
@ -1328,6 +1333,8 @@ void DolphinMainWindow::connectViewSignals(int viewIndex)
this, SLOT(changeUrl(const KUrl&)));
connect(navigator, SIGNAL(historyChanged()),
this, SLOT(slotHistoryChanged()));
connect(navigator, SIGNAL(editableStateChanged(bool)),
this, SLOT(slotEditableStateChanged(bool)));
}
void DolphinMainWindow::updateSplitAction()

5
src/dolphinmainwindow.h
View file

@ -312,7 +312,7 @@ private slots:
void zoomOut();
/**
* Toggles between edit and brose mode of the navigation bar.
* Toggles between edit and browse mode of the navigation bar.
*/
void toggleEditLocation();
@ -376,6 +376,9 @@ private slots:
/** Updates the state of the 'Additional Information' actions. */
void slotAdditionalInfoChanged();
/** Updates the state of the 'Show Full Location' action. */
void slotEditableStateChanged(bool editable);
/**
* Updates the state of the 'Edit' menu actions and emits
* the signal selectionChanged().