[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: branches/KDE/4.1/kdebase/apps/dolphin/src
From:       Peter Penz <peter.penz () gmx ! at>
Date:       2008-08-07 21:51:23
Message-ID: 200808072351.23792.peter.penz () gmx ! at
[Download RAW message or body]

Am Sunday, 3. August 2008 12:49:28 schrieb Peter Penz:
> SVN commit 841475 by ppenz:
>
> Backport of 841473: fixed issue that the "[ ] Show 'Delete' command" for
> the context menu did not work
>
> @David: the same issue occurs in Konqueror (settings/konq/behavior.cpp) -
> may I apply the fix there too?

David, I reverted the fix below and committed a correct fix -> no change in 
settings/konq/behavior.cpp is required: The reading was done in a wrong way in 
the Dolphin KPart. Sorry for the noise ;-)

>
> CCBUG: 167773
> CCMAIL: faure@kde.org
>
>  M  +5 -7      generalsettingspage.cpp
>
>
> --- branches/KDE/4.1/kdebase/apps/dolphin/src/generalsettingspage.cpp
> #841474:841475 @@ -106,10 +106,9 @@
>      confirmationGroup.writeEntry("ConfirmDelete",
> m_confirmDelete->isChecked()); confirmationGroup.sync();
>
> -    KSharedConfig::Ptr globalConfig =
> KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals); -   
> KConfigGroup globalGroup(globalConfig, "KDE");
> -    globalGroup.writeEntry("ShowDeleteCommand",
> m_showDeleteCommand->isChecked()); -    globalGroup.sync();
> +    KConfigGroup kdeConfig(KGlobal::config(), "KDE");
> +    kdeConfig.writeEntry("ShowDeleteCommand",
> m_showDeleteCommand->isChecked()); +    kdeConfig.sync();
>
>      settings->setShowCopyMoveMenu(m_showCopyMoveMenu->isChecked());
>     
> settings->setBrowseThroughArchives(m_browseThroughArchives->isChecked());
> @@ -133,9 +132,8 @@
>     
> m_confirmMoveToTrash->setChecked(confirmationGroup.readEntry("ConfirmTrash"
>, false));
> m_confirmDelete->setChecked(confirmationGroup.readEntry("ConfirmDelete",
> true));
>
> -    KSharedConfig::Ptr globalConfig =
> KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals); -   
> KConfigGroup globalGroup(globalConfig, "KDE");
> -   
> m_showDeleteCommand->setChecked(globalGroup.readEntry("ShowDeleteCommand",
> false)); +    const KConfigGroup kdeConfig(KGlobal::config(), "KDE");
> +   
> m_showDeleteCommand->setChecked(kdeConfig.readEntry("ShowDeleteCommand",
> false));
>
>      GeneralSettings* settings =
> DolphinSettings::instance().generalSettings();
> m_showCopyMoveMenu->setChecked(settings->showCopyMoveMenu());

[prev in list] [next in list] [prev in thread] [next in thread]