Merge pull request #305 from johnbenweber/fix-299

Fix for About popup
MaslowCNC · May 31, 2017 · b78cd1c · b78cd1c
2 parents c2af100 + 09e8d63
commit b78cd1c
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 4 deletions.
diff --git a/UIElements/pageableTextPopup.py b/UIElements/pageableTextPopup.py
@@ -0,0 +1,18 @@
+from kivy.uix.floatlayout             import    FloatLayout
+from kivy.properties                  import    ObjectProperty
+from kivy.properties                  import    StringProperty
+from UIElements.scrollableLabel       import    ScrollableLabel
+
+
+class PageableTextPopup(FloatLayout):
+    '''
+    
+    A Pop-up Dialog To Display Text
+    
+    If the text does not all fit on the display, the user can scroll it
+    
+    '''
+    cancel = ObjectProperty(None)
+    next = ObjectProperty(None)
+    prev = ObjectProperty(None)
+    text = StringProperty("")
diff --git a/UIElements/scrollableTextPopup.py b/UIElements/scrollableTextPopup.py
@@ -13,6 +13,4 @@ class ScrollableTextPopup(FloatLayout):
     
     '''
     cancel = ObjectProperty(None)
-    next = ObjectProperty(None)
-    prev = ObjectProperty(None)
     text = StringProperty("")
diff --git a/UIElements/viewMenu.py b/UIElements/viewMenu.py
@@ -1,6 +1,6 @@
 from   kivy.uix.gridlayout                       import   GridLayout
 from   UIElements.loadDialog                     import   LoadDialog
-from   UIElements.scrollableTextPopup            import   ScrollableTextPopup
+from   UIElements.pageableTextPopup              import   PageableTextPopup
 from   kivy.uix.popup                            import   Popup
 import re
 from DataStructures.makesmithInitFuncs           import MakesmithInitFuncs
@@ -110,7 +110,7 @@ def show_gcode(self):
                     popupText = popupText + "...\n...\n...\n"
                     break
 
-        content = ScrollableTextPopup(cancel = self.dismiss_popup,
+        content = PageableTextPopup(cancel = self.dismiss_popup,
                                       prev = self.show_gcode_prev,
                                       next = self.show_gcode_next,
                                       text = popupText)

diff --git a/groundcontrol.kv b/groundcontrol.kv
@@ -523,6 +523,22 @@
                 on_release: root.continueOn()
 
 <ScrollableTextPopup>:
+    BoxLayout:
+        size: root.size
+        pos: root.pos
+        orientation: "vertical"
+
+        ScrollableLabel:
+            text: root.text
+
+        BoxLayout:
+            size_hint_y: None
+            height: dp(30)
+            Button:
+                text: "Close"
+                on_release: root.cancel()
+
+<PageableTextPopup>:
     BoxLayout:
         size: root.size
         pos: root.pos