Add exit button for the PACS Connection GUI

diff --git a/vv/qt_ui/vvPacsConnection.ui b/vv/qt_ui/vvPacsConnection.ui
index 3347fec2ad23ce2585a67ad8e1e4f50ae3b3c030..659eca35408a9112e55510ebc2717716ba9c2f64 100644 (file)
--- a/vv/qt_ui/vvPacsConnection.ui
+++ b/vv/qt_ui/vvPacsConnection.ui
@@ -790,6 +790,48 @@
     <string>Options</string>
    </property>
   </widget>
+  <widget class="QToolButton" name="exitButton">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>580</y>
+     <width>51</width>
+     <height>51</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string notr="true">...</string>
+   </property>
+   <property name="icon">
+    <iconset resource="../vvIcons.qrc">
+     <normaloff>:/common/icons/standardbutton-cancel-16.png</normaloff>:/common/icons/standardbutton-cancel-16.png</iconset>
+   </property>
+   <property name="iconSize">
+    <size>
+     <width>32</width>
+     <height>32</height>
+    </size>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_exit">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>630</y>
+     <width>51</width>
+     <height>20</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Exit</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
   <zorder>groupBox_4</zorder>
   <zorder>groupBox_3</zorder>
   <zorder>label_ID</zorder>
@@ -814,6 +856,8 @@
   <zorder>helpButton</zorder>
   <zorder>optionsButton</zorder>
   <zorder>label_email_2</zorder>
+  <zorder>exitButton</zorder>
+  <zorder>label_exit</zorder>
  </widget>
  <tabstops>
   <tabstop>scanButton</tabstop>

diff --git a/vv/vvQPacsConnection.cxx b/vv/vvQPacsConnection.cxx
index 89ac8412bc37a8a160c788473f2e9af3760b38dd..ce381107b803dce5f05bb2a11d7632e7c898d5e2 100644 (file)
--- a/vv/vvQPacsConnection.cxx
+++ b/vv/vvQPacsConnection.cxx
@@ -16,7 +16,7 @@ vvQPacsConnection::vvQPacsConnection(QWidget *i_parent)
        :QDialog(i_parent)
 {
        ui.setupUi(this);
-       setWindowTitle(QString::fromUtf8("PACS CONNECTIONHHHH"));
+       setWindowTitle(QString::fromUtf8("PACS CONNECTION"));
        createTreeView();
        ui.tabFilter->setTabText(0,QString(tr("Modality")));
        ui.tabFilter->setTabText(1,QString(tr("Date")));
@@ -31,10 +31,18 @@ vvQPacsConnection::vvQPacsConnection(QWidget *i_parent)
        connect(ui.networkCombo,SIGNAL(currentIndexChanged(int)),this,SLOT(chooseServer(int)));
        connect(ui.removeNetworkButton,SIGNAL(clicked()),this,SLOT(removeServer()));
        connect(ui.NetworkButton,SIGNAL(clicked()),this,SLOT(modifyServer()));
+       connect(ui.exitButton,SIGNAL(clicked()),this,SLOT(close()));
        
        update();
 }
 
+// Exit window
+bool vvQPacsConnection::close()
+{
+    QApplication::restoreOverrideCursor();
+    return QWidget::close();
+}
+
 // remote a Dicom Server in VV settings
 void vvQPacsConnection::removeServer()
 {

diff --git a/vv/vvQPacsConnection.h b/vv/vvQPacsConnection.h
index 13ec9f935c4954c85d27ed8ae2fdcbb83c0e5721..4c98458470c14ba3f70f257655643d28472e1d69 100644 (file)
--- a/vv/vvQPacsConnection.h
+++ b/vv/vvQPacsConnection.h
@@ -43,6 +43,7 @@ public slots:
        void on_importButton_clicked();
  void chooseServer(int index);
  void removeServer();
+ bool close();
  void modifyServer();
 
   private :