Browse Source

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>
Michele Calgaro 3 years ago
parent
commit
dfd961b2b9
1 changed files with 1 additions and 6 deletions
  1. 1
    6
      tdecmshell/main.cpp

+ 1
- 6
tdecmshell/main.cpp View File

@@ -285,12 +285,7 @@ extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
285 285
         return 0;
286 286
     }
287 287
 
288
-    //KDialogBase::DialogType dtype = KDialogBase::Plain;             // FIXME
289
-    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
290
-    if ( args->isSet( "embed-proxy" ) || args->isSet( "embed" ) ) {   // This bug is possibly related to kcmultidialog.cpp:266 [( new TQHBoxLayout( page ) )->setAutoAdd( true );]
291
-        dtype = KDialogBase::Plain;                                   // In fact, this method of display may be preferable to the Plain mode from a UX perspective,
292
-    }                                                                 // as the icon shows the user what the active kcontrol module is called.
293
-
288
+    KDialogBase::DialogType dtype = KDialogBase::Plain;               
294 289
     if ( modules.count() < 1 )
295 290
         return 0;
296 291
     else if( modules.count() > 1 )

Loading…
Cancel
Save