Fixed display of single control modules in tdecmshell.

This was a regression introduced in commit 5117798 three years ago.
After reverting the related part, I have tested at length and not found any problem,
so it seems safe enough to push the old code back.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit dfd961b2b9)
pull/16/head
Michele Calgaro 9 years ago
parent 7e9167c319
commit d94fb5dd63

@ -285,12 +285,7 @@ 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
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.
KDialogBase::DialogType dtype = KDialogBase::Plain;
if ( modules.count() < 1 )
return 0;
else if( modules.count() > 1 )

Loading…
Cancel
Save