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

List:       kde-commits
Subject:    KDE/kdelibs/kdeprint/management
From:       Laurent Montel <montel () kde ! org>
Date:       2007-09-08 10:37:05
Message-ID: 1189247825.843686.4332.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 709826 by mlaurent:

fix crash when command list is empty
fix i18n
Fix layout


 M  +3 -1      kmspecialprinterdlg.cpp  
 M  +2 -1      kxmlcommanddlg.cpp  
 M  +3 -0      kxmlcommandselector.cpp  


--- trunk/KDE/kdelibs/kdeprint/management/kmspecialprinterdlg.cpp #709825:709826
@@ -68,9 +68,11 @@
 
     sep->setFixedHeight(10);
     QGroupBox *m_gb = new QGroupBox(i18n("Command &Settings"), dummy);
-    m_gb->setLayout(new QHBoxLayout);
+    QHBoxLayout *layout = new QHBoxLayout;
     m_command = new KXmlCommandSelector(true, m_gb, this);
     m_command->setObjectName("CommandSelector");
+    layout->addWidget(m_command);
+    m_gb->setLayout(layout);
     QGroupBox *m_outfile_gb = new QGroupBox(i18n("Outp&ut File"), dummy);
     m_outfile_gb->setLayout(new QHBoxLayout);
 
--- trunk/KDE/kdelibs/kdeprint/management/kxmlcommanddlg.cpp #709825:709826
@@ -961,7 +961,8 @@
     setCaption(i18n("Command Edit for %1", xmlCmd->name()));
 
     m_cmd = xmlCmd;
-    m_description->setText(i18n(xmlCmd->description().toUtf8()));
+    QString tmp = xmlCmd->description().toUtf8();
+    m_description->setText(tmp.isEmpty() ? "" : i18n(xmlCmd->description().toUtf8()));
     m_idname->setText(xmlCmd->name());
 
     m_requirements->clear();
--- trunk/KDE/kdelibs/kdeprint/management/kxmlcommandselector.cpp #709825:709826
@@ -227,6 +227,9 @@
 
 void KXmlCommandSelector::slotCommandSelected(int ID)
 {
+    if(m_cmdlist.count() == 0)
+        return;
+
     KXmlCommand *xmlCmd = KXmlCommandManager::self()->loadCommand(m_cmdlist[ID], true);
     if (xmlCmd) {
         QString msg;
[prev in list] [next in list] [prev in thread] [next in thread]