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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/runners/shell
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2009-06-24 1:42:29
Message-ID: 1245807749.107343.25519.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 986046 by aseigo:

config fixes



 M  +2 -0      shell_config.cpp  
 M  +3 -10     shellrunner.cpp  
 M  +0 -2      shellrunner.h  


--- trunk/KDE/kdebase/workspace/plasma/runners/shell/shell_config.cpp #986045:986046
@@ -33,6 +33,8 @@
     : QWidget(parent),
       m_config(config)
 {
+    QHBoxLayout *hboxLayout = new QHBoxLayout(parent);
+    hboxLayout->addWidget(this);
     m_ui.setupUi(this);
     load();
 
--- trunk/KDE/kdebase/workspace/plasma/runners/shell/shellrunner.cpp #986045:986046
@@ -96,18 +96,11 @@
 void ShellRunner::createRunOptions(QWidget *parent)
 {
     //TODO: for multiple runners?
-    m_configWidget = new ShellConfig(config(), parent);
-    connect(m_configWidget, SIGNAL(destroyed(QObject*)), this, \
                SLOT(configWidgetDestroyed()));
-    connect(m_configWidget->m_ui.cbRunAsOther, SIGNAL(clicked(bool)), this, \
                SLOT(setRunAsOtherUser(bool)));
-    connect(m_configWidget->m_ui.cbRunInTerminal, SIGNAL(clicked(bool)), this, \
                SLOT(setRunInTerminal(bool)));
-    m_configWidget->show();
+    ShellConfig *configWidget = new ShellConfig(config(), parent);
+    connect(configWidget->m_ui.cbRunAsOther, SIGNAL(clicked(bool)), this, \
SLOT(setRunAsOtherUser(bool))); +    connect(configWidget->m_ui.cbRunInTerminal, \
SIGNAL(clicked(bool)), this, SLOT(setRunInTerminal(bool)));  }
 
-void ShellRunner::configWidgetDestroyed()
-{
-    m_configWidget = 0;
-}
-
 void ShellRunner::setRunAsOtherUser(bool asOtherUser)
 {
     m_asOtherUser = asOtherUser;
--- trunk/KDE/kdebase/workspace/plasma/runners/shell/shellrunner.h #986045:986046
@@ -43,12 +43,10 @@
         void createRunOptions(QWidget *parent);
 
     private slots:
-        void configWidgetDestroyed();
         void setRunAsOtherUser(bool asOtherUser);
         void setRunInTerminal(bool runInTerminal);
 
     private:
-        ShellConfig *m_configWidget;
         bool m_enabled;
         bool m_inTerminal;
         bool m_asOtherUser;


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