[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kcontrol/filetypes
From:       Nadeem Hasan <nhasan () nadmm ! com>
Date:       2003-10-09 15:53:56
[Download RAW message or body]

CVS commit by nhasan: 

* Check the return value of QDialog::exec() correctly
* Add a caption and label to KServiceSelectDlg


  M +2 -2      kservicelistwidget.cpp   1.20
  M +10 -11    kserviceselectdlg.cpp   1.8


--- kdebase/kcontrol/filetypes/kservicelistwidget.cpp  #1.19:1.20
@@ -206,5 +206,5 @@ void KServiceListWidget::addService()
       KOpenWithDlg dlg(m_item->name(), QString::null, 0L);
       dlg.setSaveNewApplications(true);
-      if (dlg.exec() == false)
+      if (dlg.exec() != QDialog::Accepted)
           return;
 
@@ -218,5 +218,5 @@ void KServiceListWidget::addService()
   {
       KServiceSelectDlg dlg(m_item->name(), QString::null, 0L);
-      if (dlg.exec() == false)
+      if (dlg.exec() != QDialog::Accepted)
           return;
        service = dlg.service();

--- kdebase/kcontrol/filetypes/kserviceselectdlg.cpp  #1.7:1.8
@@ -20,20 +20,19 @@
 #include "kserviceselectdlg.moc"
 #include "kservicelistwidget.h"
+
+#include <klocale.h>
+
 #include <qvbox.h>
-#include <qlayout.h>
+#include <qlabel.h>
 
 KServiceSelectDlg::KServiceSelectDlg( const QString& /*serviceType*/, const QString& \
/*value*/, QWidget *parent )  : KDialogBase( parent, "serviceSelectDlg", true,
-                   /* TODO caption */ QString::null, Ok|Cancel, Ok )
+                   i18n( "Add Service" ), Ok|Cancel, Ok )
 {
-    QVBox *topcontents = new QVBox ( this );
-    topcontents->setSpacing(KDialog::spacingHint());
-    QWidget *contents = new QWidget(topcontents);
-    QHBoxLayout * lay = new QHBoxLayout(contents);
-    lay->setSpacing(KDialog::spacingHint());
-
-    lay->addStretch(1);
+    QVBox *vbox = new QVBox ( this );
 
-    m_listbox=new KListBox( topcontents );
+    vbox->setSpacing( KDialog::spacingHint() );
+    new QLabel( i18n( "Select service:" ), vbox );
+    m_listbox=new KListBox( vbox );
 
     // Can't make a KTrader query since we don't have a servicetype to give,
@@ -53,5 +52,5 @@ KServiceSelectDlg::KServiceSelectDlg( co
     m_listbox->setMinimumWidth(300);
     connect(m_listbox,SIGNAL(doubleClicked ( QListBoxItem * )),SLOT(slotOk()));
-    setMainWidget(topcontents);
+    setMainWidget(vbox);
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]