Depend on mkin (>= 1.0.2) to preserve model names in fits

Some comments and small rearrangements in the GUI code that I introduced
as I started to review it.

16 files changed, 28 insertions, 21 deletions

diff --git a/DESCRIPTION b/DESCRIPTION
index c039c67..6986b69 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: gmkin
 Type: Package
 Title: Graphical User Interface for Fitting Kinetic Models to Chemical Degradation Data
-Version: 0.6.11
-Date: 2021-02-21
+Version: 0.6.12
+Date: 2021-02-13
 Authors@R: c(person("Johannes", "Ranke", role = c("aut", "cre", "cph"), 
                     email = "jranke@uni-bremen.de"),
              person("Stefan", "Meinecke", role = "ctb"),
@@ -10,7 +10,7 @@ Authors@R: c(person("Johannes", "Ranke", role = c("aut", "cre", "cph"),
 Description: Browser based graphical user interface for R package mkin, based
   on the gWidgetsWWW2 package. Both gmkin and gWidgetsWWW2 are developed on
   GitHub, but are also available from the R-Forge repository.
-Depends: R (>= 3.5.0), mkin (>= 1.0.1), gWidgetsWWW2 (>= 0.4-7)
+Depends: R (>= 3.5.0), mkin (>= 1.0.2), gWidgetsWWW2 (>= 0.4-7)
 Imports: R6, markdown, plyr, devEMF
 Suggests: knitr, rmarkdown
 License: GPL
diff --git a/NEWS.md b/NEWS.md
index c4915bc..7b21903 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,6 +1,10 @@
 # NEWS for package 'gmkin'
 
-## gmkin 0.6-11 (2021-02-21)
+## gmkin 0.6-12 (2021-02-13)
+
+- Depend on mkin (>= 1.0.2) which preserves model names stored in 'mkinmod' objects, which were overwritten starting from mkin 1.0.0
+
+## gmkin 0.6-11 (2021-02-12)
 
 - Adapt built-in 'FOCUS_2006' workspace to mkin 1.0.x as we have now have the 'deg_func' element in 'mkinmod' objects
 
diff --git a/docs/404.html b/docs/404.html
index 12b760a..2853e25 100644
--- a/docs/404.html
+++ b/docs/404.html
@@ -71,7 +71,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="index.html">gmkin</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.6.11</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.6.12</span>
       </span>
     </div>
 
diff --git a/docs/articles/gmkin_manual.html b/docs/articles/gmkin_manual.html
index cad446a..2a87182 100644
--- a/docs/articles/gmkin_manual.html
+++ b/docs/articles/gmkin_manual.html
@@ -31,7 +31,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">gmkin</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.6.11</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.6.12</span>
       </span>
     </div>
 
@@ -85,7 +85,7 @@
       <h1 data-toc-skip>Manual for gmkin</h1>
                         <h4 class="author">Johannes Ranke</h4>
             
-            <h4 class="date">2021-02-12</h4>
+            <h4 class="date">2021-02-13</h4>
       
       <small class="dont-index">Source: <a href="http://github.com/jranke/gmkin/blob/master/vignettes/gmkin_manual.Rmd"><code>vignettes/gmkin_manual.Rmd</code></a></small>
       <div class="hidden name"><code>gmkin_manual.Rmd</code></div>
diff --git a/docs/articles/index.html b/docs/articles/index.html
index 6c915b0..f777bd3 100644
--- a/docs/articles/index.html
+++ b/docs/articles/index.html
@@ -71,7 +71,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">gmkin</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.6.11</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.6.12</span>
       </span>
     </div>
 
diff --git a/docs/authors.html b/docs/authors.html
index 9cd757e..8224fa6 100644
--- a/docs/authors.html
+++ b/docs/authors.html
@@ -71,7 +71,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="index.html">gmkin</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.6.11</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.6.12</span>
       </span>
     </div>
 
diff --git a/docs/index.html b/docs/index.html
index 229d914..e34b2a5 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -33,7 +33,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="index.html">gmkin</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.6.11</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.6.12</span>
       </span>
     </div>
 
diff --git a/docs/news/index.html b/docs/news/index.html
index f57adf3..4c0f6cc 100644
--- a/docs/news/index.html
+++ b/docs/news/index.html
@@ -71,7 +71,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">gmkin</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.6.11</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.6.12</span>
       </span>
     </div>
 
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
index 8c1853a..eaddd9e 100644
--- a/docs/pkgdown.yml
+++ b/docs/pkgdown.yml
@@ -3,5 +3,5 @@ pkgdown: 1.6.1
 pkgdown_sha: ~
 articles:
   gmkin_manual: gmkin_manual.html
-last_built: 2021-02-12T16:41Z
+last_built: 2021-02-13T06:25Z
 
diff --git a/docs/reference/FOCUS_2006.html b/docs/reference/FOCUS_2006.html
index d5fb9ed..99a027d 100644
--- a/docs/reference/FOCUS_2006.html
+++ b/docs/reference/FOCUS_2006.html
@@ -74,7 +74,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">gmkin</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.6.11</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.6.12</span>
       </span>
     </div>
 
diff --git a/docs/reference/FOCUS_2006_Z.html b/docs/reference/FOCUS_2006_Z.html
index 4b8555b..b6e9751 100644
--- a/docs/reference/FOCUS_2006_Z.html
+++ b/docs/reference/FOCUS_2006_Z.html
@@ -72,7 +72,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">gmkin</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.6.11</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.6.12</span>
       </span>
     </div>
 
diff --git a/docs/reference/UBA_model_gallery.html b/docs/reference/UBA_model_gallery.html
index 4e7cce1..6ae615d 100644
--- a/docs/reference/UBA_model_gallery.html
+++ b/docs/reference/UBA_model_gallery.html
@@ -77,7 +77,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">gmkin</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.6.11</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.6.12</span>
       </span>
     </div>
 
diff --git a/docs/reference/gmkin.html b/docs/reference/gmkin.html
index c4226b3..4e4b521 100644
--- a/docs/reference/gmkin.html
+++ b/docs/reference/gmkin.html
@@ -74,7 +74,7 @@ for an explanation how this toolkit works." />
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">gmkin</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.6.11</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.6.12</span>
       </span>
     </div>
 
diff --git a/docs/reference/gmkinws.html b/docs/reference/gmkinws.html
index 53b093f..6272326 100644
--- a/docs/reference/gmkinws.html
+++ b/docs/reference/gmkinws.html
@@ -72,7 +72,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">gmkin</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.6.11</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.6.12</span>
       </span>
     </div>
 
diff --git a/docs/reference/index.html b/docs/reference/index.html
index d16dfb6..6ef0488 100644
--- a/docs/reference/index.html
+++ b/docs/reference/index.html
@@ -71,7 +71,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">gmkin</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.6.11</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">0.6.12</span>
       </span>
     </div>
 
diff --git a/inst/GUI/gmkin.R b/inst/GUI/gmkin.R
index 7e0a052..63d347c 100644
--- a/inst/GUI/gmkin.R
+++ b/inst/GUI/gmkin.R
@@ -1,6 +1,6 @@
 # gWidgetsWWW2 GUI for mkin {{{1

 

-# Copyright (C) 2013-2016,2018,2019 Johannes Ranke

+# Copyright (C) 2013-2016,2018,2019,2021 Johannes Ranke

 # Portions of this file are copyright (C) 2013 Eurofins Regulatory AG, Switzerland

 # Contact: jranke@uni-bremen.de

 

@@ -21,17 +21,18 @@
 

 # Configuration {{{1

 # Widgets {{{2

+# Three column layout

 left_width = 250

 right_width = 500

+# Widget heights in left column

 ds_height = 142

 m_height = 142

 f_height = 142

-save_keybinding = "Shift-F12"

+# Model editor gcombobox with mkinmod model definition

 gcb_observed_width = 100

 gcb_type_width = 70

 gcb_to_width = 160

 gcb_sink_width = 70

-

 # Plotting {{{2

 plot_formats <- c("png", "pdf")

 if (requireNamespace("devEMF", quietly = TRUE)) {

@@ -40,6 +41,8 @@ if (requireNamespace("devEMF", quietly = TRUE)) {
 plot_format <- plot_formats[[1]]

 # Options {{{2

 options(width = 75) # For summary

+# Keybinding {{{2

+save_keybinding = "Shift-F12"

 # Set the GUI title and create the basic widget layout {{{1

 # Three panel layout {{{2

 window_title <- paste0("gmkin ", packageVersion("gmkin"),