KDE/kdebase/runtime/keditfiletype

SVN commit 1005113 by cfeck:

Layout fixes

CCBUG: 155663


 M  +1 -10     filetypedetails.cpp  
 M  +0 -1      filetypesview.cpp  
 M  +0 -2      kservicelistwidget.cpp  
 M  +6 -5      kserviceselectdlg.cpp  


--- trunk/KDE/kdebase/runtime/keditfiletype/filetypedetails.cpp #1005112:1005113
@@ -59,11 +59,8 @@
   // First tab - General
   QWidget * firstWidget = new QWidget(m_tabWidget);
   QVBoxLayout *firstLayout = new QVBoxLayout(firstWidget);
-  firstLayout->setMargin(KDialog::marginHint());
-  firstLayout->setSpacing(KDialog::spacingHint());
 
   QHBoxLayout *hBox = new QHBoxLayout();
-  hBox->setSpacing(KDialog::spacingHint());
   firstLayout->addLayout(hBox);
 
     if (SharedMimeInfoVersion::supportsIcon()) {
@@ -88,7 +85,6 @@
   hBox->addWidget(gb);
 
   hBox = new QHBoxLayout(gb);
-  hBox->setSpacing(KDialog::spacingHint());
 
   extensionLB = new QListWidget(gb);
   connect(extensionLB, SIGNAL(itemSelectionChanged()), 
SLOT(enableExtButtons()));
@@ -104,8 +100,6 @@
 
   QVBoxLayout *vbox = new QVBoxLayout();
   hBox->addLayout(vbox);
-  vbox->setSpacing(KDialog::spacingHint());
-//   vbox->setMargins(KDialog::spacingHint());
 
   addExtButton = new KPushButton(i18n("Add..."), gb);
   addExtButton->setIcon(KIcon("list-add"));
@@ -149,11 +143,8 @@
   // Second tab - Embedding
   QWidget * secondWidget = new QWidget(m_tabWidget);
   QVBoxLayout *secondLayout = new QVBoxLayout(secondWidget);
-  secondLayout->setMargin(KDialog::marginHint());
-  secondLayout->setSpacing(KDialog::spacingHint());
 
   m_autoEmbedBox = new QGroupBox( i18n("Left Click Action"), secondWidget );
-  secondLayout->setSpacing( KDialog::spacingHint() );
   secondLayout->addWidget( m_autoEmbedBox );
 
   m_autoEmbedBox->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Fixed );
@@ -184,7 +175,7 @@
     " for instance 'image' if the current file type is image/png.") );
 
   embedServiceListWidget = new KServiceListWidget( 
KServiceListWidget::SERVICELIST_SERVICES, secondWidget );
-  embedServiceListWidget->setMinimumHeight( 
serviceListWidget->sizeHint().height() );
+//  embedServiceListWidget->setMinimumHeight( 
serviceListWidget->sizeHint().height() );
   connect( embedServiceListWidget, SIGNAL(changed(bool)), this, 
SIGNAL(changed(bool)));
   secondLayout->addWidget(embedServiceListWidget);
 
--- trunk/KDE/kdebase/runtime/keditfiletype/filetypesview.cpp #1005112:1005113
@@ -83,7 +83,6 @@
 
   QHBoxLayout* l = new QHBoxLayout(this);
   QVBoxLayout* leftLayout = new QVBoxLayout();
-  leftLayout->setSpacing(KDialog::spacingHint());
   l->addLayout( leftLayout );
 
   patternFilterLE = new KLineEdit(this);
--- trunk/KDE/kdebase/runtime/keditfiletype/kservicelistwidget.cpp 
#1005112:1005113
@@ -72,8 +72,6 @@
     m_kind( kind ), m_mimeTypeData( 0L )
 {
   QHBoxLayout *lay= new QHBoxLayout(this);
-  lay->setMargin(KDialog::marginHint());
-  lay->setSpacing(KDialog::spacingHint());
 
   servicesLB = new QListWidget(this);
   connect(servicesLB, SIGNAL(itemSelectionChanged()), 
SLOT(enableMoveButtons()));
--- trunk/KDE/kdebase/runtime/keditfiletype/kserviceselectdlg.cpp 
#1005112:1005113
@@ -20,7 +20,7 @@
 #include "kservicelistwidget.h"
 
 #include <klocale.h>
-#include <kvbox.h>
+#include <QtGui/QVBoxLayout>
 #include <QtGui/QLabel>
 
 KServiceSelectDlg::KServiceSelectDlg( const QString& /*serviceType*/, const 
QString& /*value*/, QWidget *parent )
@@ -31,10 +31,10 @@
     setCaption( i18n( "Add Service" ) );
     setButtons( Ok | Cancel );
 
-    KVBox *vbox = new KVBox ( this );
+    QWidget *vbox = new QWidget( this );
+    QVBoxLayout *layout = new QVBoxLayout( vbox );
 
-    vbox->setSpacing( KDialog::spacingHint() );
-    new QLabel( i18n( "Select service:" ), vbox );
+    layout->addWidget( new QLabel( i18n( "Select service:" ), vbox ) );
     m_listbox=new KListWidget( vbox );
 
     // Can't make a KTrader query since we don't have a servicetype to give,
@@ -51,7 +51,8 @@
 
     m_listbox->model()->sort(0);
     m_listbox->setMinimumHeight(350);
-    m_listbox->setMinimumWidth(300);
+    m_listbox->setMinimumWidth(400);
+    layout->addWidget( m_listbox );
     
connect(m_listbox,SIGNAL(itemDoubleClicked(QListWidgetItem*)),SLOT(slotOk()));
     connect( this, SIGNAL(okClicked()), this, SLOT(slotOk()) );
     setMainWidget(vbox);