Talmo/pre v1.2.2 (#696)

* Change default tab appearance * Bump to 1.2.2
talmolab · Apr 3, 2022 · 608c7fd · 608c7fd
1 parent a3a1742
commit 608c7fd
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 26 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -27,15 +27,15 @@
 copyright = "2019–2022, Talmo Lab"
 
 # The short X.Y version
-version = "1.2.1"
+version = "1.2.2"
 
 # Get the sleap version
 # with open("../sleap/version.py") as f:
 #     version_file = f.read()
 #     version = re.search("\d.+(?=['\"])", version_file).group(0)
 
 # Release should be the full branch name
-release = "v1.2.1"
+release = "v1.2.2"
 
 html_title = f"SLEAP ({release})"
 html_short_title = "SLEAP"

diff --git a/docs/installation.md b/docs/installation.md
@@ -55,7 +55,7 @@ On Windows, our personal preference is to use alternative terminal apps like [Cm
 ````
 ### `conda` package
 ```bash
-conda create -y -n sleap -c sleap -c nvidia -c conda-forge sleap=1.2.1
+conda create -y -n sleap -c sleap -c nvidia -c conda-forge sleap=1.2.2
 ```
 **This is the recommended installation method**. Works on **Windows** and **Linux**.
 
@@ -84,7 +84,7 @@ This works on **Windows**, **Linux** and **Mac OS X** (pre-M1). This is the **re
 
 ### `pip` package
 ```bash
-pip install sleap==1.2.1
+pip install sleap==1.2.2
 ```
 This works on **any OS** and on **Google Colab**.
 ```{note}

diff --git a/sleap/gui/app.py b/sleap/gui/app.py
@@ -1005,28 +1005,10 @@ def new_edge():
         hbw.setLayout(hb)
         skeleton_layout.addWidget(hbw)
 
-        ####### Instances #######
-        instances_layout = _make_dock("Instances")
-        self.instancesTable = GenericTableView(
-            state=self.state,
-            row_name="instance",
-            name_prefix="",
-            model=LabeledFrameTableModel(
-                items=self.state["labeled_frame"], context=self.commands
-            ),
-        )
-        instances_layout.addWidget(self.instancesTable)
-
-        hb = QHBoxLayout()
-        _add_button(hb, "New Instance", lambda x: self.commands.newInstance())
-        _add_button(hb, "Delete Instance", self.commands.deleteSelectedInstance)
-
-        hbw = QWidget()
-        hbw.setLayout(hb)
-        instances_layout.addWidget(hbw)
-
         ####### Suggestions #######
-        suggestions_layout = _make_dock("Labeling Suggestions")
+        suggestions_layout = _make_dock(
+            "Labeling Suggestions", tab_with=videos_layout.parent().parent()
+        )
         self.suggestionsTable = GenericTableView(
             state=self.state,
             is_sortable=True,
@@ -1106,6 +1088,31 @@ def goto_suggestion(*args):
 
         self.state.connect("suggestion_idx", self.suggestionsTable.selectRow)
 
+        ####### Instances #######
+        instances_layout = _make_dock(
+            "Instances", tab_with=videos_layout.parent().parent()
+        )
+        self.instancesTable = GenericTableView(
+            state=self.state,
+            row_name="instance",
+            name_prefix="",
+            model=LabeledFrameTableModel(
+                items=self.state["labeled_frame"], context=self.commands
+            ),
+        )
+        instances_layout.addWidget(self.instancesTable)
+
+        hb = QHBoxLayout()
+        _add_button(hb, "New Instance", lambda x: self.commands.newInstance())
+        _add_button(hb, "Delete Instance", self.commands.deleteSelectedInstance)
+
+        hbw = QWidget()
+        hbw.setLayout(hb)
+        instances_layout.addWidget(hbw)
+
+        # Bring videos tab forward.
+        videos_layout.parent().parent().raise_()
+
     def _load_overlays(self):
         """Load all standard video overlays."""
         self.overlays["track_labels"] = TrackListOverlay(self.labels, self.player)

diff --git a/sleap/version.py b/sleap/version.py
@@ -12,7 +12,7 @@
 """
 
 
-__version__ = "1.2.1"
+__version__ = "1.2.2"
 
 
 def versions():
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ @@
     """
-    __version__ = "1.2.1"
+    __version__ = "1.2.2"
     def versions():
@@ Expand Down @@