attempt 1 for issue #149

andrew-bibb · Aug 12, 2016 · 75a3f0b · 75a3f0b
1 parent 9a45c29
commit 75a3f0b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 16 deletions.
diff --git a/apps/cmstapp/code/control_box/ui/controlbox.ui b/apps/cmstapp/code/control_box/ui/controlbox.ui
@@ -32,7 +32,7 @@
       </sizepolicy>
      </property>
      <property name="currentIndex">
-      <number>5</number>
+      <number>0</number>
      </property>
      <property name="movable">
       <bool>true</bool>

diff --git a/apps/cmstapp/code/peditor/peditor.cpp b/apps/cmstapp/code/peditor/peditor.cpp
@@ -113,14 +113,20 @@ PropertiesEditor::PropertiesEditor(QWidget* parent, const arrayElement& ae)
   }
 
   // proxy page
-  if (! proxmap.value("Method").toString().isEmpty() ) {
-    ui.comboBox_proxymethod->setCurrentIndex(sl_proxy_method.indexOf(QRegularExpression(proxmap.value("Method").toString())) );
-  }
+  if (proxmap.value("Method").toString().isEmpty() )
+		ui.comboBox_proxymethod->setCurrentIndex(-1);
+	else
+		ui.comboBox_proxymethod->setCurrentIndex(sl_proxy_method.indexOf(QRegularExpression(proxmap.value("Method").toString())) );	
+
   ui.lineEdit_proxyservers->setText(proxmap.value("Servers").toStringList().join("\n") );
   ui.lineEdit_proxyexcludes->setText(proxmap.value("Excludes").toStringList().join("\n") );
   ui.lineEdit_proxyurl->setText(proxmap.value("URL").toString() );
-
-
+
+  if (ui.comboBox_proxymethod->currentIndex() < 0)
+		ui.stackedWidget_proxy01->setCurrentIndex(0);
+	else	
+		ui.stackedWidget_proxy01->setCurrentIndex(ui.comboBox_proxymethod->currentIndex() );
+
   // connect signals to slots
   connect(ui.toolButton_whatsthis, SIGNAL(clicked()), this, SLOT(showWhatsThis()));
   connect(ui.pushButton_resetpage, SIGNAL(clicked()), this, SLOT(resetPage()));
@@ -336,7 +342,7 @@ void PropertiesEditor::updateConfiguration()
     } // for
 
     vlist << QVariant::fromValue(QDBusVariant(dict) );
-    qDebug() << dict;
+    //qDebug() << dict;
     shared::processReply(iface_serv->callWithArgumentList(QDBus::AutoDetect, "SetProperty", vlist) );
   } // if proxy changed
 

diff --git a/apps/cmstapp/code/peditor/ui/peditor.ui b/apps/cmstapp/code/peditor/ui/peditor.ui
@@ -23,7 +23,7 @@
    <item>
     <widget class="QToolBox" name="toolBox_peditor">
      <property name="currentIndex">
-      <number>0</number>
+      <number>6</number>
      </property>
      <widget class="QWidget" name="general">
       <property name="geometry">
@@ -68,8 +68,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>98</width>
-        <height>46</height>
+        <width>279</width>
+        <height>166</height>
        </rect>
       </property>
       <property name="whatsThis">
@@ -102,8 +102,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>98</width>
-        <height>46</height>
+        <width>279</width>
+        <height>166</height>
        </rect>
       </property>
       <property name="whatsThis">
@@ -136,8 +136,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>98</width>
-        <height>46</height>
+        <width>279</width>
+        <height>166</height>
        </rect>
       </property>
       <property name="whatsThis">
@@ -380,7 +380,7 @@
          <item row="1" column="0" colspan="2">
           <widget class="QStackedWidget" name="stackedWidget_proxy01">
            <property name="currentIndex">
-            <number>2</number>
+            <number>0</number>
            </property>
            <widget class="QWidget" name="page_0"/>
            <widget class="QWidget" name="page_1">

diff --git a/apps/resource.h b/apps/resource.h
@@ -35,7 +35,7 @@ DEALINGS IN THE SOFTWARE.
 ///////////////////////////////// Program Values ///////////////////////
 //
 // Program Info (may be visible, but don't mark for tranalation) 
-#define VERSION "2016.06.07-1"
+#define VERSION "2016.08.11-1"
 
 #define RELEASE_DATE "3 April 2016"
 #define COPYRIGHT_DATE "2013-2016"