Add 'Return to host' button to JailIndicator. Thanks Dru for report. …

…May close #905
trueos · Jan 9, 2014 · 97f4aeb · 97f4aeb
1 parent f353da8
commit 97f4aeb
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 2 deletions.
diff --git a/src-qt4/pc-updatecenter/jailindicator.cpp b/src-qt4/pc-updatecenter/jailindicator.cpp
@@ -17,3 +17,8 @@ void JailIndicator::setJailName(QString name)
 {
     ui->jailNameLabel->setText(name);
 }
+
+void JailIndicator::on_returnToHostBtn_clicked()
+{
+    emit (returnToHost());
+}
diff --git a/src-qt4/pc-updatecenter/jailindicator.h b/src-qt4/pc-updatecenter/jailindicator.h
@@ -16,7 +16,13 @@ class JailIndicator : public QWidget
     ~JailIndicator();
 
     void setJailName(QString name);
+
+signals:
+    void returnToHost();
 
+private slots:
+    void on_returnToHostBtn_clicked();
+
 private:
     Ui::JailIndicator *ui;
 };

diff --git a/src-qt4/pc-updatecenter/jailindicator.ui b/src-qt4/pc-updatecenter/jailindicator.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>398</width>
-    <height>44</height>
+    <height>50</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -75,6 +75,13 @@
      </property>
     </spacer>
    </item>
+   <item>
+    <widget class="QPushButton" name="returnToHostBtn">
+     <property name="text">
+      <string>Return to host</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources>

diff --git a/src-qt4/pc-updatecenter/mainwindow.cpp b/src-qt4/pc-updatecenter/mainwindow.cpp
@@ -151,6 +151,9 @@ void MainWindow::init()
     connect(&mPBIController, SIGNAL(stateChanged(CAbstractUpdateController::EUpdateControllerState)),
             this, SLOT(globalStateChanged(CAbstractUpdateController::EUpdateControllerState)));
 
+    connect(ui->jailIndicatorWidget, SIGNAL(returnToHost()),
+            this, SLOT(slotReturnToHost()));
+
 
     ui->mainStatesStack->setCurrentIndex(MAIN_INDICATORS_IDX);
 
@@ -282,6 +285,13 @@ void MainWindow::globalStateChanged(CAbstractUpdateController::EUpdateController
     Q_UNUSED(new_state)
 }
 
+///////////////////////////////////////////////////////////////////////////////
+void MainWindow::slotReturnToHost()
+{
+    mJail.setJailEnabled(false);
+    jailRefresh();
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 void MainWindow::on_updateAllButton_clicked()
 {

diff --git a/src-qt4/pc-updatecenter/mainwindow.h b/src-qt4/pc-updatecenter/mainwindow.h
@@ -68,6 +68,7 @@ public slots:
 private slots:
 
     void globalStateChanged(CAbstractUpdateController::EUpdateControllerState new_state);
+    void slotReturnToHost();
 
 private slots:
 
@@ -80,7 +81,7 @@ private slots:
     void on_actionExit_triggered();
     void on_actionJail_triggered();
     void on_actionSystem_branches_triggered();
-    void on_actionUpdate_set_triggered();
+    void on_actionUpdate_set_triggered();   
 };
 
 #endif // MAINWINDOW_H