Commit 79bb28ec authored by Peter Penz's avatar Peter Penz
Browse files

Remove "Rename inline" option

The new view-engine currently does not support inline-renaming
and because of more important pending issues this cannot be
implemented for the 4.8 release of KDE applications.

The plan for 4.9 is to implement inline-renaming again and
to make it "so good" (tm) that it is always turned on (-> there is
no need anymore for an option to disable it ;-)

CCBUG: 286893
parent 4f94ca5d
......@@ -52,10 +52,6 @@
<label>Ask for confirmation when closing windows with multiple tabs.</label>
<default>true</default>
</entry>
<entry name="RenameInline" type="Bool">
<label>Rename inline</label>
<default>false</default>
</entry>
<entry name="ShowSelectionToggle" type="Bool">
<label>Show selection toggle</label>
<default>true</default>
......
......@@ -44,7 +44,6 @@ BehaviorSettingsPage::BehaviorSettingsPage(const KUrl& url, QWidget* parent) :
m_globalProps(0),
m_confirmMoveToTrash(0),
m_confirmDelete(0),
m_renameInline(0),
m_showToolTips(0),
m_showSelectionToggle(0),
m_naturalSorting(0)
......@@ -78,9 +77,6 @@ BehaviorSettingsPage::BehaviorSettingsPage(const KUrl& url, QWidget* parent) :
confirmBoxLayout->addWidget(m_confirmDelete);
confirmBoxLayout->addWidget(m_confirmClosingMultipleTabs);
// 'Rename inline'
m_renameInline = new QCheckBox(i18nc("@option:check", "Rename inline"), this);
// 'Show tooltips'
m_showToolTips = new QCheckBox(i18nc("@option:check", "Show tooltips"), this);
......@@ -92,7 +88,6 @@ BehaviorSettingsPage::BehaviorSettingsPage(const KUrl& url, QWidget* parent) :
topLayout->addWidget(propsBox);
topLayout->addWidget(confirmBox);
topLayout->addWidget(m_renameInline);
topLayout->addWidget(m_showToolTips);
topLayout->addWidget(m_showSelectionToggle);
topLayout->addWidget(m_naturalSorting);
......@@ -105,7 +100,6 @@ BehaviorSettingsPage::BehaviorSettingsPage(const KUrl& url, QWidget* parent) :
connect(m_confirmMoveToTrash, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
connect(m_confirmDelete, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
connect(m_confirmClosingMultipleTabs, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
connect(m_renameInline, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
connect(m_showToolTips, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
connect(m_showSelectionToggle, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
connect(m_naturalSorting, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
......@@ -140,7 +134,6 @@ void BehaviorSettingsPage::applySettings()
confirmationGroup.sync();
settings->setConfirmClosingMultipleTabs(m_confirmClosingMultipleTabs->isChecked());
settings->setRenameInline(m_renameInline->isChecked());
settings->setShowToolTips(m_showToolTips->isChecked());
settings->setShowSelectionToggle(m_showSelectionToggle->isChecked());
settings->writeConfig();
......@@ -177,7 +170,6 @@ void BehaviorSettingsPage::loadSettings()
m_confirmDelete->setChecked(confirmationGroup.readEntry("ConfirmDelete", CONFIRM_DELETE));
m_confirmClosingMultipleTabs->setChecked(GeneralSettings::confirmClosingMultipleTabs());
m_renameInline->setChecked(GeneralSettings::renameInline());
m_showToolTips->setChecked(GeneralSettings::showToolTips());
m_showSelectionToggle->setChecked(GeneralSettings::showSelectionToggle());
m_naturalSorting->setChecked(KGlobalSettings::naturalSorting());
......
......@@ -57,7 +57,6 @@ private:
QCheckBox* m_confirmDelete;
QCheckBox* m_confirmClosingMultipleTabs;
QCheckBox* m_renameInline;
QCheckBox* m_showToolTips;
QLabel* m_configureToolTips;
QCheckBox* m_showSelectionToggle;
......
......@@ -591,6 +591,8 @@ void DolphinView::renameSelectedItems()
return;
}
// TODO: The new view-engine introduced with Dolphin 2.0 does not support inline
// renaming yet.
/*if ((itemCount == 1) && DolphinSettings::instance().generalSettings()->renameInline()) {
const QModelIndex dirIndex = m_viewAccessor.dirModel()->indexForItem(items.first());
const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->mapFromSource(dirIndex);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment