cleanups prior to release

andrew-bibb · Mar 7, 2020 · 2814492 · 2814492
1 parent a2ff6e6
commit 2814492
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/apps/cmstapp/code/control_box/controlbox.cpp b/apps/cmstapp/code/control_box/controlbox.cpp
@@ -212,9 +212,9 @@ ControlBox::ControlBox(const QCommandLineParser& parser, QWidget *parent)
   QSize sz_source = this->sizeHint();
   if (sz_source.width() > sz_target.width() || sz_source.height() > sz_target.height() ) {
     sz_source.scale(sz_target.width() - 100, sz_target.height() - 100, Qt::KeepAspectRatio); // keep min. 100 pixels around dialog
+    resize(sz_source);
+    move((sz_target.width() - this->width()) / 2, (sz_target.height() - this->height()) / 2); // re-center if needed
   }
-  resize(sz_source);
-  move((sz_target.width() - this->width()) / 2, (sz_target.height() - this->height()) / 2); // re-centre if needed
 
   // set a flag if we sent a commandline option to log the connman inputrequest
   agent->setLogInputRequest(parser.isSet("log-input-request"));

diff --git a/apps/resource.h b/apps/resource.h
@@ -35,9 +35,9 @@ DEALINGS IN THE SOFTWARE.
 ///////////////////////////////// Program Values ///////////////////////
 //
 // Program Info (may be visible, but don't mark for tranalation) 
-#define VERSION "2020.03.05-1"
+#define VERSION "2020.03.07-1"
 
-#define RELEASE_DATE "1 January 2020"
+#define RELEASE_DATE "7 Marc2020.03.07h 2020"
 #define COPYRIGHT_DATE "2013-2020"
 
 // Program Values:

diff --git a/text/changelog.txt b/text/changelog.txt
@@ -1,10 +1,11 @@
 <b><center>Connman System Tray (CMST)</center></b>
 <b><center>Change Log</center></b>
-<b> In Progress</b>
+<b> 2020.03.07</b>
 <ul>
 <li>Move offline checkbox in tab 1 (issue # 201)</li>
 <li>Translation to Dutch by Heimen Stoffels.</li>
 <li>Cleaned up the IPv4 and IPv6 entries in the provisioning editor.</li>
+<li>Fixed retain state not working for window size and position.<li>
 <li>Additions for Connman 1.38</li>
 <ul>
 <li>Add mDNS status to the details tab.</li>