From b53f4dcb2ad447c5ee521c42a0abc15a8cd48e31 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 5 May 2013 13:41:37 -0500 Subject: [PATCH] Fix KControl module display when administrative privileges are requested and granted --- tdecmshell/main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tdecmshell/main.cpp b/tdecmshell/main.cpp index 72f3c66f2..43ec7a9e9 100644 --- a/tdecmshell/main.cpp +++ b/tdecmshell/main.cpp @@ -282,11 +282,11 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[]) return 0; } - //KDialogBase::DialogType dtype = KDialogBase::Plain; // FIXME - KDialogBase::DialogType dtype = KDialogBase::IconList; // Work around a bug whereby several kcontrol modules (such as displayconfig) use an incorrect size when loaded with tdecmshell in the Plain mode - // This bug is possibly related to kcmultidialog.cpp:266 [( new TQHBoxLayout( page ) )->setAutoAdd( true );] - // In fact, this method of display may be preferable to the Plain mode from a UX perspective, - // as the icon shows the user what the active kcontrol module is called. + //KDialogBase::DialogType dtype = KDialogBase::Plain; // FIXME + KDialogBase::DialogType dtype = KDialogBase::IconList; // Work around a bug whereby several kcontrol modules (such as displayconfig) use an incorrect size when loaded with tdecmshell in the Plain mode + if ( args->isSet( "embed-proxy" ) || args->isSet( "embed" ) ) { // This bug is possibly related to kcmultidialog.cpp:266 [( new TQHBoxLayout( page ) )->setAutoAdd( true );] + dtype = KDialogBase::Plain; // In fact, this method of display may be preferable to the Plain mode from a UX perspective, + } // as the icon shows the user what the active kcontrol module is called. if ( modules.count() < 1 ) return 0;