diff --git a/apps/cmstapp/code/control_box/ui/controlbox.ui b/apps/cmstapp/code/control_box/ui/controlbox.ui
index c7440771..12ecdfe8 100644
--- a/apps/cmstapp/code/control_box/ui/controlbox.ui
+++ b/apps/cmstapp/code/control_box/ui/controlbox.ui
@@ -32,7 +32,7 @@
- 5
+ 0
true
diff --git a/apps/cmstapp/code/peditor/peditor.cpp b/apps/cmstapp/code/peditor/peditor.cpp
index 811dd0db..4773f174 100644
--- 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
index eeff638d..97fa172a 100644
--- a/apps/cmstapp/code/peditor/ui/peditor.ui
+++ b/apps/cmstapp/code/peditor/ui/peditor.ui
@@ -23,7 +23,7 @@
-
- 0
+ 6
@@ -68,8 +68,8 @@
0
0
- 98
- 46
+ 279
+ 166
@@ -102,8 +102,8 @@
0
0
- 98
- 46
+ 279
+ 166
@@ -136,8 +136,8 @@
0
0
- 98
- 46
+ 279
+ 166
@@ -380,7 +380,7 @@
-
- 2
+ 0
diff --git a/apps/resource.h b/apps/resource.h
index 1e1457a4..04e96cc2 100755
--- 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"