Revert "settingscreen: Added a button to the bottom of the network tab to invoke...
authorFranklin S. Cooper Jr <fcooper@ti.com>
Wed, 21 Nov 2012 16:01:04 +0000 (10:01 -0600)
committerFranklin S. Cooper Jr <fcooper@ti.com>
Wed, 21 Nov 2012 16:01:04 +0000 (10:01 -0600)
settingscreen.cpp
settingscreen.h

index 112a075ae44789f2b0580d58d597ff0074e0f796..2f19ae426160936b00c15f962bf45e00c6301b1d 100644 (file)
@@ -121,20 +121,23 @@ QWidget* SettingScreen::buildNetworkSettingsWidget()
     QGroupBox* proxySettingsGroupBox = new QGroupBox("Proxy Settings");
     proxySettingsGroupBox->setLayout(proxyVBoxLayout);
 
     QGroupBox* proxySettingsGroupBox = new QGroupBox("Proxy Settings");
     proxySettingsGroupBox->setLayout(proxyVBoxLayout);
 
-    configureWifiButton = new QPushButton("Configure Wifi");
 
 
-    connect(configureWifiButton, SIGNAL(clicked()), this, SLOT(launchWifiConfigure()));
-    configureWifiButton->setFocusPolicy(Qt::NoFocus);
+    QLabel *m_remoteListenPort = new QLabel("Remote Listen Port: ", this);
+    m_remoteListenPortLineEdit = new QKeyboardLineEdit;
+
+    QFormLayout* remoteListenLayout = new QFormLayout;
+    remoteListenLayout->addRow(m_remoteListenPort, m_remoteListenPortLineEdit);
+
+    QGroupBox* remoteSettingsGroupBox = new QGroupBox("Remote Settings");
+    remoteSettingsGroupBox->setLayout(remoteListenLayout);
 
     QVBoxLayout *networkSettingsLayout = new QVBoxLayout(this);
     networkSettingsLayout->addWidget(proxySettingsGroupBox);
 
     QVBoxLayout *networkSettingsLayout = new QVBoxLayout(this);
     networkSettingsLayout->addWidget(proxySettingsGroupBox);
-    networkSettingsLayout->addWidget(configureWifiButton);
+    //networkSettingsLayout->addWidget(remoteSettingsGroupBox);
     networkSettingsLayout->addStretch();
 
     networkSettingsWidget->setLayout(networkSettingsLayout);
 
     networkSettingsLayout->addStretch();
 
     networkSettingsWidget->setLayout(networkSettingsLayout);
 
-    connect(&m_wifiConfigureProcess, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(wifiConfigureFinished(int, QProcess::ExitStatus)));
-
     return networkSettingsWidget;
 }
 
     return networkSettingsWidget;
 }
 
@@ -305,14 +308,3 @@ void SettingScreen::commitChanges()
 
     close();
 }
 
     close();
 }
-
-void SettingScreen::launchWifiConfigure()
-{
-    configureWifiButton->setEnabled(false);
-    m_wifiConfigureProcess.start("wpatest.sh wpa_gui-e -geometry 480x240+0+0");
-}
-
-void SettingScreen::wifiConfigureFinished(int, QProcess::ExitStatus)
-{
-    configureWifiButton->setEnabled(true);
-}
index 02e635cac4b3fc9eae5f2748058e9d64189ba036..4edf175725dc9258a933a3d6982d7dc62a16d811 100644 (file)
@@ -28,9 +28,6 @@ public slots:
     void commitChanges();
     void fillSettingValues();
 
     void commitChanges();
     void fillSettingValues();
 
-    void launchWifiConfigure();
-    void wifiConfigureFinished(int, QProcess::ExitStatus);
-
 protected:
     void showEvent(QShowEvent *);
 
 protected:
     void showEvent(QShowEvent *);
 
@@ -44,8 +41,6 @@ private:
     QPushButton *Button12h;
     QPushButton *Button24h;
 
     QPushButton *Button12h;
     QPushButton *Button24h;
 
-    QPushButton *configureWifiButton;
-
     QKeyboardLineEdit* m_proxyHostLineEdit;
     QKeyboardLineEdit* m_proxyPortLineEdit;
     QKeyboardLineEdit* m_remoteListenPortLineEdit;
     QKeyboardLineEdit* m_proxyHostLineEdit;
     QKeyboardLineEdit* m_proxyPortLineEdit;
     QKeyboardLineEdit* m_remoteListenPortLineEdit;
@@ -55,8 +50,6 @@ private:
     QWidget* buildNetworkSettingsWidget();
     QWidget* buildGeneralSettingsWidget();
     QWidget* buildFormatSettingsWidget();
     QWidget* buildNetworkSettingsWidget();
     QWidget* buildGeneralSettingsWidget();
     QWidget* buildFormatSettingsWidget();
-
-    QProcess m_wifiConfigureProcess;
     
 };
 
     
 };