diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2016-04-16 19:12:30 +1000 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2016-04-21 14:52:45 +1000 |
| commit | d94fb5dd63c384a7a2d74728db9fb118183c35e2 (patch) | |
| tree | 1245b41c6e2e5b941ddff264c15ae48306ab3996 /tdecmshell | |
| parent | 7e9167c31972d5e6d330a807758a360876d9d719 (diff) | |
| download | tdelibs-d94fb5dd63c384a7a2d74728db9fb118183c35e2.tar.gz tdelibs-d94fb5dd63c384a7a2d74728db9fb118183c35e2.zip | |
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 dfd961b2b9ee29c7ca05c4e288cdeaaff9b2d6e8)
Diffstat (limited to 'tdecmshell')
| -rw-r--r-- | tdecmshell/main.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tdecmshell/main.cpp b/tdecmshell/main.cpp index 9ca169c2f..20ef629d9 100644 --- a/tdecmshell/main.cpp +++ b/tdecmshell/main.cpp @@ -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 ) |