Don't overload the word "Properties" to mean multiple things

Summary:
Generally "Properties" refers to information about a selected file. However Dolphin also
uses the word "Properties" in the phrase "View Properties", which refers to the display
style of the view. Since "properties" is a fairly esoteric and technical term to most
users, it would probably be wise to avoid using it in multiple contexts.

Accordingly, this patch changes "view properties" to "view display style".

Test Plan: Look at the settings window, hamburger menu, view menu, and docbook

Reviewers: #vdg, #dolphin, ndavis, elvisangelaccio

Reviewed By: #vdg, #dolphin, ndavis, elvisangelaccio

Subscribers: ndavis, kfm-devel, kde-doc-english

Tags: #dolphin, #documentation

Differential Revision: https://phabricator.kde.org/D25987

diff --git a/doc/index.docbook b/doc/index.docbook
index 03c4c48481c4e0c704c911353490f61a48df334c..170a092ff7b658d1c5e4525449ba8988261af129 100644 (file)
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -312,7 +312,7 @@ The buttons in the toolbar which control the appearance of the view.
 All the settings discussed below and other options concerning, ⪚ the
 sorting of the files in the current folder, can also be modified in the
 <guimenu>View</guimenu> menu and in the
 All the settings discussed below and other options concerning, &eg; the
 sorting of the files in the current folder, can also be modified in the
 <guimenu>View</guimenu> menu and in the

-<link linkend="view-properties-dialog">View Properties dialog</link>. By
+<link linkend="view-properties-dialog">View Display Style dialog</link>. By

 default, these settings are remembered for each folder separately. This
 behavior can be changed in the
 <link linkend="preferences-dialog-general"><quote>General</quote></link> section of the settings.
 default, these settings are remembered for each folder separately. This
 behavior can be changed in the
 <link linkend="preferences-dialog-general"><quote>General</quote></link> section of the settings.


@@ -951,11 +951,11 @@ using the <link linkend="preferences-dialog">Preferences Dialog</link>.
 
 <listitem><para>
 Settings which determine how the contents of a folder are displayed in &dolphin;.
 
 <listitem><para>
 Settings which determine how the contents of a folder are displayed in &dolphin;.

-These settings are called <link linkend="view-properties">View Properties</link>
+These settings are called <link linkend="view-properties">View Display Styles</link>

 and can be controlled with toolbar buttons, via the <guimenu>View</guimenu> menu,
 and can be controlled with toolbar buttons, via the <guimenu>View</guimenu> menu,

-and with the <link linkend="view-properties-dialog">View Properties Dialog</link>.
-In the default configuration, the view properties are remembered for each folder,
-but &dolphin; can also be configured to use common view properties for all folders
+and with the <link linkend="view-properties-dialog">View Display Style dialog</link>.
+In the default configuration, all folders use the same display style,
+but &dolphin; can also be configured to remember each folder's display style separately

 in the <link linkend="preferences-dialog-general-behavior"><quote>General</quote>
 section of the settings</link>.
 </para></listitem>
 in the <link linkend="preferences-dialog-general-behavior"><quote>General</quote>
 section of the settings</link>.
 </para></listitem>


@@ -1008,9 +1008,9 @@ tab bar at the top.
 <itemizedlist>
 
 <listitem><para>
 <itemizedlist>
 
 <listitem><para>

-In the <guilabel>View</guilabel> section, you can configure whether the
-<link linkend="view-properties"> view properties</link> are stored for each
-folder or if common view properties are to be used for all folders.
+In the <guilabel>View</guilabel> section, you can configure whether the same
+<link linkend="view-properties"> view display style</link>is shared among all folders
+or folders remember their own individual view display styles.

 </para></listitem>
 
 <listitem><para>
 </para></listitem>
 
 <listitem><para>


@@ -1412,7 +1412,7 @@ largest files can be deleted automatically.
 </sect1>
 <!-- begin copy to konqueror filemanager.docbook -->
 <sect1 id="view-properties">
 </sect1>
 <!-- begin copy to konqueror filemanager.docbook -->
 <sect1 id="view-properties">

-<title>Folder View Properties</title>
+<title>Folder View Display Style</title>

 
 <para>
 The following settings control how the contents of a folder are displayed in the
 
 <para>
 The following settings control how the contents of a folder are displayed in the


@@ -1454,31 +1454,31 @@ What additional information (besides the name) is shown in the Icons or Details
 
 </itemizedlist>
 <para>
 
 </itemizedlist>
 <para>

-The view properties can be configured in the
+The view display style can be configured in the

 <menuchoice><guimenu>View</guimenu></menuchoice> menu, some (such as the view
 mode) can also be changed using toolbar buttons.
 </para>
 
 <sect2 id="view-properties-dialog">
 <menuchoice><guimenu>View</guimenu></menuchoice> menu, some (such as the view
 mode) can also be changed using toolbar buttons.
 </para>
 
 <sect2 id="view-properties-dialog">

-<title>The View Properties Dialog</title>
+<title>The View Display Style dialog</title>

 
 <para>
 
 <screenshot>
 
 <para>
 
 <screenshot>

-<screeninfo>Screenshot of the View Properties dialog</screeninfo>
+<screeninfo>Screenshot of the View Display Style dialog</screeninfo>

 <mediaobject>
 <imageobject>
 <imagedata fileref="viewproperties-dialog.png" format="PNG"/>
 </imageobject>
 <textobject>
 <mediaobject>
 <imageobject>
 <imagedata fileref="viewproperties-dialog.png" format="PNG"/>
 </imageobject>
 <textobject>

-<phrase>The View Properties dialog.</phrase>
+<phrase>The View Display Style dialog.</phrase>

 </textobject>
 </textobject>

-<caption><para>The View Properties Dialog.</para></caption>
+<caption><para>The View Display Style Dialog.</para></caption>

 </mediaobject>
 </screenshot>
 
 </mediaobject>
 </screenshot>
 

-The <guilabel>View Properties</guilabel> dialog can be used to quickly modify
-several view properties at once. This is done for the current folder, for the
+The <guilabel>View Display Style</guilabel> dialog can be used to quickly modify
+the view display styles for many folders at once. This is done for the current folder, for the

 current folder including all subfolders, or even for all folders, depending on
 the choice made in the <guilabel>Apply to</guilabel> section.
 </para>
 current folder including all subfolders, or even for all folders, depending on
 the choice made in the <guilabel>Apply to</guilabel> section.
 </para>


@@ -1917,9 +1917,9 @@ if necessary, and selects the location such that it can be replaced quickly.
 <varlistentry>
 <term><menuchoice>
 <guimenu>View</guimenu>
 <varlistentry>
 <term><menuchoice>
 <guimenu>View</guimenu>

-<guimenuitem>Adjust View Properties...</guimenuitem>
+<guimenuitem>Adjust View Display Style...</guimenuitem>

 </menuchoice></term>
 </menuchoice></term>

-<listitem><para><action>Opens the <link linkend="view-properties-dialog">View Properties
+<listitem><para><action>Opens the <link linkend="view-properties-dialog">View Display Style

 Dialog</link>.</action></para></listitem>
 </varlistentry>
 </variablelist>
 Dialog</link>.</action></para></listitem>
 </varlistentry>
 </variablelist>

diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp
index df7ea21135f62b55e6d224ab3d0ad9bd5f610d36..30883c5dade1bb3c52fbf03f52ef8b5afc8af9ac 100644 (file)
--- a/src/settings/general/behaviorsettingspage.cpp
+++ b/src/settings/general/behaviorsettingspage.cpp
@@ -48,8 +48,8 @@ BehaviorSettingsPage::BehaviorSettingsPage(const QUrl& url, QWidget* parent) :
 
 
     // View properties
 
 
     // View properties

-    m_globalViewProps = new QRadioButton(i18nc("@option:radio", "Use common properties for all folders"));
-    m_localViewProps = new QRadioButton(i18nc("@option:radio", "Remember properties for each folder"));
+    m_globalViewProps = new QRadioButton(i18nc("@option:radio", "Use common display style for all folders"));
+    m_localViewProps = new QRadioButton(i18nc("@option:radio", "Remember display style for each folder"));

     m_localViewProps->setToolTip(i18nc("@info", "Dolphin will create a hidden .directory file in each folder you change view properties for."));
 
     QButtonGroup* viewGroup = new QButtonGroup(this);
     m_localViewProps->setToolTip(i18nc("@info", "Dolphin will create a hidden .directory file in each folder you change view properties for."));
 
     QButtonGroup* viewGroup = new QButtonGroup(this);

diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index a1f9718feaceccf70faee9e6784457a7d1cea332..c3078d5df492511a2233de17dcc535774e068bd9 100644 (file)
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -68,7 +68,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     Q_ASSERT(dolphinView);
     const bool useGlobalViewProps = GeneralSettings::globalViewProps();
 
     Q_ASSERT(dolphinView);
     const bool useGlobalViewProps = GeneralSettings::globalViewProps();
 

-    setWindowTitle(i18nc("@title:window", "View Properties"));
+    setWindowTitle(i18nc("@title:window", "View Display Style"));

 
     const QUrl& url = dolphinView->url();
     m_viewProps = new ViewProperties(url);
 
     const QUrl& url = dolphinView->url();
     m_viewProps = new ViewProperties(url);

diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index 0d9f9f81cc8bdd1a47c05b2d7ecb279e9f68a42c..ef9f317ee16d20e3399d6e46b41d1bd33d0ef4b2 100644 (file)
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -280,7 +280,7 @@ void DolphinViewActionHandler::createActions()
     connect(showHiddenFiles, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleShowHiddenFiles);
 
     QAction* adjustViewProps = m_actionCollection->addAction(QStringLiteral("view_properties"));
     connect(showHiddenFiles, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleShowHiddenFiles);
 
     QAction* adjustViewProps = m_actionCollection->addAction(QStringLiteral("view_properties"));

-    adjustViewProps->setText(i18nc("@action:inmenu View", "Adjust View Properties..."));
+    adjustViewProps->setText(i18nc("@action:inmenu View", "Adjust View Display Style..."));

     adjustViewProps->setIcon(QIcon::fromTheme(QStringLiteral("view-choose")));
     adjustViewProps->setWhatsThis(i18nc("@info:whatsthis", "This opens a window "
         "in which all folder view properties can be adjusted."));
     adjustViewProps->setIcon(QIcon::fromTheme(QStringLiteral("view-choose")));
     adjustViewProps->setWhatsThis(i18nc("@info:whatsthis", "This opens a window "
         "in which all folder view properties can be adjusted."));