┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/dolphincontextmenu.cpp14
-rw-r--r--src/dolphinsettings.h7
-rw-r--r--src/dolphinsettingsdialog.h3
-rw-r--r--src/dolphinview.cpp2
-rw-r--r--src/infosidebarpage.cpp6
-rw-r--r--src/infosidebarpage.h8
-rw-r--r--src/treeviewsidebarpage.cpp2
-rw-r--r--src/treeviewsidebarpage.h2
8 files changed, 21 insertions, 23 deletions
diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 8bd67111b..4b46455d7 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -158,10 +158,10 @@ void DolphinContextMenu::openItemContextMenu()
popup->addSeparator();
// insert 'Bookmark This Folder' entry if exactly one item is selected
- QAction* bookmarkAction = 0;
+ QAction* addToPlacesAction = 0;
if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) {
- bookmarkAction = popup->addAction(KIcon("bookmark-folder"),
- i18nc("@action:inmenu", "Bookmark Folder..."));
+ addToPlacesAction = popup->addAction(KIcon("bookmark-folder"),
+ i18nc("@action:inmenu Add selected folder to places", "Add to Places"));
}
// Insert 'Open With...' sub menu
@@ -179,7 +179,7 @@ void DolphinContextMenu::openItemContextMenu()
QAction* activatedAction = popup->exec(QCursor::pos());
- if ((bookmarkAction != 0) && (activatedAction == bookmarkAction)) {
+ if ((addToPlacesAction != 0) && (activatedAction == addToPlacesAction)) {
const KUrl selectedUrl(m_fileInfo.url());
if (selectedUrl.isValid()) {
DolphinSettings::instance().placesModel()->addPlace(selectedUrl.fileName(),
@@ -240,8 +240,8 @@ void DolphinContextMenu::openViewportContextMenu()
popup->addSeparator();
- QAction* bookmarkAction = popup->addAction(KIcon("bookmark-folder"),
- i18nc("@action:inmenu", "Bookmark This Folder..."));
+ QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-folder"),
+ i18nc("@action:inmenu Add current folder to places", "Add to Places"));
popup->addSeparator();
QAction* propertiesAction = popup->addAction(i18nc("@action:inmenu", "Properties"));
@@ -251,7 +251,7 @@ void DolphinContextMenu::openViewportContextMenu()
const KUrl& url = m_mainWindow->activeViewContainer()->url();
KPropertiesDialog dialog(url);
dialog.exec();
- } else if (action == bookmarkAction) {
+ } else if (action == addToPlacesAction) {
const KUrl& url = m_mainWindow->activeViewContainer()->url();
if (url.isValid()) {
DolphinSettings::instance().placesModel()->addPlace(url.fileName(), url);
diff --git a/src/dolphinsettings.h b/src/dolphinsettings.h
index 327e4defc..dc1b0a840 100644
--- a/src/dolphinsettings.h
+++ b/src/dolphinsettings.h
@@ -33,12 +33,11 @@ class KFilePlacesModel;
* @brief Manages and stores all settings from Dolphin.
*
* The following properties are stored:
- * - home Url
+ * - home URL
* - default view mode
- * - Url navigator state (editable or not)
+ * - URL navigator state (editable or not)
* - split view
- * - bookmarks
- * - properties for icons and details view
+ * - properties for views
*/
class LIBDOLPHINPRIVATE_EXPORT DolphinSettings
{
diff --git a/src/dolphinsettingsdialog.h b/src/dolphinsettingsdialog.h
index 612baa3c2..d7bc4ddfb 100644
--- a/src/dolphinsettingsdialog.h
+++ b/src/dolphinsettingsdialog.h
@@ -29,8 +29,7 @@ class DolphinMainWindow;
/**
* @brief Settings dialog for Dolphin.
*
- * Contains the pages for general settings, view settings and
- * bookmark settings.
+ * Contains the pages for general settings and view settings.
*
* @author Peter Penz <[email protected]>
*/
diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 01099b1cc..207b236ee 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -576,7 +576,7 @@ void DolphinView::startDirLister(const KUrl& url, bool reload)
const KUrl& dirListerUrl = m_dirLister->url();
if ((dirListerUrl == url) || !m_dirLister->url().isParentOf(url)) {
// The current URL is not a child of the dir lister
- // URL. This may happen when e. g. a bookmark has been selected
+ // URL. This may happen when e. g. a place has been selected
// and hence the view must be reset.
keepOldDirs = false;
}
diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index b1dee423f..ae692fc42 100644
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -186,7 +186,7 @@ void InfoSidebarPage::showItemInfo()
K3Icon::SizeEnormous);
m_preview->setPixmap(icon);
m_nameLabel->setText(i18ncp("@info", "%1 item selected", "%1 items selected", selectedItems.count()));
- } else if (!applyBookmark(file)) {
+ } else if (!applyPlace(file)) {
// try to get a preview pixmap from the item...
KUrl::List list;
list.append(file);
@@ -226,7 +226,7 @@ void InfoSidebarPage::slotTimeout()
void InfoSidebarPage::showIcon(const KFileItem& item)
{
m_pendingPreview = false;
- if (!applyBookmark(item.url())) {
+ if (!applyPlace(item.url())) {
m_preview->setPixmap(item.pixmap(K3Icon::SizeEnormous));
}
}
@@ -241,7 +241,7 @@ void InfoSidebarPage::showPreview(const KFileItem& item,
}
}
-bool InfoSidebarPage::applyBookmark(const KUrl& url)
+bool InfoSidebarPage::applyPlace(const KUrl& url)
{
KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel();
int count = placesModel->rowCount();
diff --git a/src/infosidebarpage.h b/src/infosidebarpage.h
index c78eaa093..24e639dcd 100644
--- a/src/infosidebarpage.h
+++ b/src/infosidebarpage.h
@@ -105,12 +105,12 @@ private:
enum { TimerDelay = 300 };
/**
- * Checks whether the an URL is repesented by a bookmark. If yes,
- * then the bookmark icon and name are shown instead of a preview.
- * @return True, if the URL represents exactly a bookmark.
+ * Checks whether the an URL is repesented by a place. If yes,
+ * then the place icon and name are shown instead of a preview.
+ * @return True, if the URL represents exactly a place.
* @param url The url to check.
*/
- bool applyBookmark(const KUrl& url);
+ bool applyPlace(const KUrl& url);
/** Assures that any pending item information request is cancelled. */
void cancelRequest();
diff --git a/src/treeviewsidebarpage.cpp b/src/treeviewsidebarpage.cpp
index 7b434a495..c8bae088b 100644
--- a/src/treeviewsidebarpage.cpp
+++ b/src/treeviewsidebarpage.cpp
@@ -189,7 +189,7 @@ void TreeViewSidebarPage::loadTree(const KUrl& url)
{
Q_ASSERT(m_dirLister != 0);
- // adjust the root of the tree to the base bookmark
+ // adjust the root of the tree to the base place
KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel();
KUrl baseUrl = placesModel->url(placesModel->closestItem(url));
if (!baseUrl.isValid()) {
diff --git a/src/treeviewsidebarpage.h b/src/treeviewsidebarpage.h
index 06631abda..05df1f75a 100644
--- a/src/treeviewsidebarpage.h
+++ b/src/treeviewsidebarpage.h
@@ -32,7 +32,7 @@ class QModelIndex;
/**
* @brief Shows a tree view of the directories starting from
- * the currently selected bookmark.
+ * the currently selected place.
*
* The tree view is always synchronized with the currently active view
* from the main window.
generated by cgit v1.3 (git 2.53.0) at 2026-04-18 14:17:57 +0000