diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp index a8f1e28c8..7bf98caaf 100644 --- a/kcontrol/konq/behaviour.cpp +++ b/kcontrol/konq/behaviour.cpp @@ -80,6 +80,15 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget " separate window.") ); + // ---- + + cbShowArchivesAsFolders = new TQCheckBox( i18n( "Show archived &files as folders" ), vbox ); + connect(cbShowArchivesAsFolders, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + + TQWhatsThis::add( cbShowArchivesAsFolders, i18n("Checking this option will list archived" + " files as folders when using tree view.") ); + + // -- cbShowTips = new TQCheckBox( i18n( "Show file &tips" ), vbox ); @@ -202,7 +211,7 @@ void KBehaviourOptions::load( bool useDefaults ) cbShowPreviewsInTips->setChecked( showPreviewsIntips ); cbRenameDirectlyIcon->setChecked( g_pConfig->readBoolEntry("RenameIconDirectly", DEFAULT_RENAMEICONDIRECTLY ) ); - + TDEConfig globalconfig("kdeglobals", true, false); globalconfig.setGroup( "KDE" ); cbShowDeleteCommand->setChecked( globalconfig.readBoolEntry("ShowDeleteCommand", false) ); @@ -214,13 +223,16 @@ void KBehaviourOptions::load( bool useDefaults ) TDEConfig config("uiserverrc"); config.setGroup( "UIServer" ); - cbListProgress->setChecked( config.readBoolEntry( "ShowList", false ) ); g_pConfig->setGroup( "Trash" ); cbMoveToTrash->setChecked( g_pConfig->readBoolEntry("ConfirmTrash", DEFAULT_CONFIRMTRASH) ); cbDelete->setChecked( g_pConfig->readBoolEntry("ConfirmDelete", DEFAULT_CONFIRMDELETE) ); + TDEConfig sidebarconfig("konqsidebartng.rc"); + sidebarconfig.setGroup( "" ); + cbShowArchivesAsFolders->setChecked( sidebarconfig.readBoolEntry( "ShowArchivesAsFolders", false ) ); + emit changed( useDefaults ); } @@ -241,12 +253,17 @@ void KBehaviourOptions::save() // g_pConfig->writeEntry( "FileTipsItems", sbToolTip->value() ); g_pConfig->writeEntry( "RenameIconDirectly", cbRenameDirectlyIcon->isChecked()); - + + TDEConfig sidebarconfig("konqsidebartng.rc"); + sidebarconfig.setGroup( "" ); + sidebarconfig.writeEntry( "ShowArchivesAsFolders", cbShowArchivesAsFolders->isChecked() ); + sidebarconfig.sync(); + TDEConfig globalconfig("kdeglobals", false, false); globalconfig.setGroup( "KDE" ); globalconfig.writeEntry( "ShowDeleteCommand", cbShowDeleteCommand->isChecked()); globalconfig.sync(); - + g_pConfig->setGroup( "Trash" ); g_pConfig->writeEntry( "ConfirmTrash", cbMoveToTrash->isChecked()); g_pConfig->writeEntry( "ConfirmDelete", cbDelete->isChecked()); @@ -257,6 +274,7 @@ void KBehaviourOptions::save() config.setGroup( "UIServer" ); config.writeEntry( "ShowList", cbListProgress->isChecked() ); config.sync(); + // Tell the running server if ( kapp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) ) { diff --git a/kcontrol/konq/behaviour.h b/kcontrol/konq/behaviour.h index edc723c53..2e011f2d2 100644 --- a/kcontrol/konq/behaviour.h +++ b/kcontrol/konq/behaviour.h @@ -55,6 +55,7 @@ private: TQCheckBox *cbNewWin; TQCheckBox *cbListProgress; + TQCheckBox *cbShowArchivesAsFolders; TQLabel *winPixmap;