glimmer-dsl-opal 0.7.4 → 0.9.2

data/lib/glimmer/swt/message_box_proxy.rb

@@ -1,23 +1,88 @@
+# Copyright (c) 2020 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 require 'glimmer/swt/widget_proxy'
 require 'glimmer/swt/display_proxy'
 
 module Glimmer
   module SWT
     class MessageBoxProxy < WidgetProxy
+      STYLE = <<~CSS
+        .modal {
+          position: fixed;
+          z-index: 1;
+          padding-top: 100px;
+          left: 0;
+          top: 0;
+          width: 100%;
+          height: 100%;
+          overflow: auto;
+          background-color: rgb(0,0,0);
+          background-color: rgba(0,0,0,0.4);
+          text-align: center;
+        }
+        .modal-content .text {
+          background: rgb(80, 116, 211);
+          color: white;
+          padding: 5px;
+        }
+        .modal-content .message {
+          padding: 20px;
+        }
+        .modal-content {
+          background-color: #fefefe;
+          padding-bottom: 15px;
+          border: 1px solid #888;
+          display: inline-block;
+          min-width: 200px;
+        }
+      CSS
+#         .close {
+#           color: #aaaaaa;
+#           float: right;
+#           font-weight: bold;
+#           margin: 5px;
+#         }
+#         .close:hover,
+#         .close:focus {
+#           color: #000;
+#           text-decoration: none;
+#           cursor: pointer;
+#         }
+      
       attr_reader :text, :message
       
       def initialize(parent, args, block)
         i = 0
-        @parent = parent || DisplayProxy.instance.shells.last
+        @parent = parent
+        @parent = nil if parent.is_a?(LatestShellProxy)
+        @parent ||= DisplayProxy.instance.shells.last || ShellProxy.new([])
         @args = args
         @block = block
         @children = Set.new
         @enabled = true
-        content do
-          on_widget_selected {
-            hide
-          }
-        end
+        on_widget_selected {
+          hide
+        }
+        DisplayProxy.instance.message_boxes << self
       end
       
       def text=(txt)
@@ -25,9 +90,13 @@ module Glimmer
         dom_element.find('.modal-content .text').html(@text)
       end
     
+      def html_message
+        message&.gsub("\n", '<br />')
+      end
+      
       def message=(msg)
         @message = msg
-        dom_element.find('.modal-content .message').html(@text)
+        dom_element.find('.modal-content .message').html(html_message)
       end
       
       def open
@@ -62,68 +131,15 @@ module Glimmer
         }
       end
  
-      def style_dom_modal_css
-        <<~CSS
-          .modal {
-            position: fixed;
-            z-index: 1;
-            padding-top: 100px;
-            left: 0;
-            top: 0;
-            width: 100%;
-            height: 100%;
-            overflow: auto;
-            background-color: rgb(0,0,0);
-            background-color: rgba(0,0,0,0.4);
-            text-align: center;
-          }
-          .modal-content .text {
-            background: rgb(80, 116, 211);
-            color: white;
-            padding: 5px;
-          }
-          .modal-content .message {
-            padding: 20px;
-          }
-          .modal-content {
-            background-color: #fefefe;
-            padding-bottom: 15px;
-            border: 1px solid #888;
-            display: inline-block;
-            min-width: 200px;
-          }
-        CSS
-#           .close {
-#             color: #aaaaaa;
-#             float: right;
-#             font-weight: bold;
-#             margin: 5px;
-#           }
-#           .close:hover,
-#           .close:focus {
-#             color: #000;
-#             text-decoration: none;
-#             cursor: pointer;
-#           }
-      end
-      
       def dom
-        modal_id = id
-        modal_style = css
-        modal_text = text
-        modal_message = message
-        modal_class = ['modal', name].join(' ')
         @dom ||= html {
-          div(id: modal_id, style: modal_style, class: modal_class) {
-            style(class: 'modal-style') {
-              style_dom_modal_css #.split("\n").map(&:strip).join(' ')
-            }
+          div(id: id, class: "modal #{name}") {
             div(class: 'modal-content') {
               header(class: 'text') {
-                modal_text
+                text
               }
               tag(_name: 'p', id: 'message', class: 'message') {
-                modal_message
+                html_message
               }
               input(type: 'button', class: 'close', autofocus: 'autofocus', value: 'OK')
             }

data/lib/glimmer/swt/property_owner.rb

@@ -2,6 +2,8 @@ module Glimmer
   module SWT
     # Adapts Glimmer UI classes to SWT JavaBean property owner classes (which are now adapted to Opal)
     module PropertyOwner
+      # TODO consider adding has_attribute?
+      
       def get_attribute(attribute_name)
         send(attribute_getter(attribute_name))
       end

data/lib/glimmer/swt/radio_proxy.rb

@@ -4,7 +4,7 @@ module Glimmer
   module SWT
     class RadioProxy < WidgetProxy
       # TODO add a create method that ensures passing :radio style in if not there
-      STYLE=<<~CSS
+      STYLE = <<~CSS
         .radio {
           display: inline;
         }

data/lib/glimmer/swt/shell_proxy.rb

@@ -1,12 +1,34 @@
 require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/layout_proxy'
 require 'glimmer/swt/display_proxy'
 require 'glimmer/swt/point'
 
 module Glimmer
   module SWT
     class ShellProxy < CompositeProxy
+      STYLE = <<~CSS
+        html {
+          width: 100%;
+          height: 100%;
+        }
+        body {
+          width: 100%;
+          height: 100%;
+          margin: 0;
+        }
+        .shell {
+          height: 100%;
+          margin: 0;
+        }
+        .shell iframe {
+          width: 100%;
+          height: 100%;
+        }
+      CSS
+    
       # TODO consider renaming to ShellProxy to match SWT API
       attr_reader :minimum_size
+      attr_accessor :menu_bar
     
       WIDTH_MIN = 130
       HEIGHT_MIN = 0
@@ -14,7 +36,7 @@ module Glimmer
       def initialize(args)
         @args = args
         @children = []
-#         Document.ready? do end # TODO consider embedding this jQuery call in so outside consumers don't have to use it
+        # TODO consider the implication of emptying the body
         Document.find('body').empty unless ENV['RUBY_ENV'] == 'test'
         render
         @layout = FillLayoutProxy.new(self, [])
@@ -52,208 +74,31 @@ module Glimmer
           .hide {
             display: none !important;
           }
-          .selected, .tabs .tab.selected {
+          .selected {
             background: rgb(80, 116, 211);
             color: white;
           }
         CSS
       end
             
-      def style_dom_shell_css
-        <<~CSS
-          html {
-            width: 100%;
-            height: 100%;
-          }
-          body {
-            width: 100%;
-            height: 100%;
-            margin: 0;
-          }
-          .shell {
-            height: 100%;
-            margin: 0;
-          }
-          .shell iframe {
-            width: 100%;
-            height: 100%;
-          }
-        CSS
-      end
-      
-      def style_dom_list_css
-        <<~CSS
-          ul {
-            list-style: none;
-            padding: 0;
-          }
-          li {
-            cursor: default;
-            padding-left: 10px;
-            padding-right: 10px;
-          }
-          li.empty-list-item {
-            color: transparent;
-          }
-        CSS
-      end
-      
-      def style_dom_tab_css
-        <<~CSS
-          .tabs .tab {
-            background-color: inherit;
-            float: left;
-            border: none;
-            outline: none;
-            cursor: pointer;
-            padding: 14px 16px;
-            transition: 0.3s;
-            font-size: 17px;
-          }
-          .tabs {
-            overflow: hidden;
-            border: 1px solid #ccc;
-            background-color: #f1f1f1;
-          }
-        CSS
-      end
-      
-      def style_dom_tab_item_css
-        <<~CSS
-          /* Create an selected/current tablink class */
-          .tabs .tab.selected {
-            background-color: #ccc;
-          }
-          /* Change background color of buttons on hover */
-          .tabs .tab:hover {
-            background-color: #ddd;
-          }
-          /* Style the tab content */
-          .tab-item {
-            padding: 6px 12px;
-            border: 1px solid #ccc;
-            border-top: none;
-          }
-        CSS
-      end
-
-      def style_dom_modal_css
-        <<~CSS
-          /* The Modal (background) */
-          .modal {
-            position: fixed; /* Stay in place */
-            z-index: 1; /* Sit on top */
-            padding-top: 100px; /* Location of the box */
-            left: 0;
-            top: 0;
-            width: 100%; /* Full width */
-            height: 100%; /* Full height */
-            overflow: auto; /* Enable scroll if needed */
-            background-color: rgb(0,0,0); /* Fallback color */
-            background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
-            text-align: center;
-          }
-            
-          /* Modal Content */
-          .modal-content {
-            background-color: #fefefe;
-            margin: auto;
-            border: 1px solid #888;
-            display: inline-block;
-            min-width: 200px;
-          }
-            
-          .modal-content .text {
-            background: rgb(80, 116, 211);
-            color: white;
-            padding: 5px;
-          }
-            
-          .modal-content .message {
-            padding: 20px;
-          }
-            
-          /* The Close Button */
-          .close {
-            color: #aaaaaa;
-            float: right;
-            font-weight: bold;
-            margin: 5px;
-          }
-            
-          .close:hover,
-          .close:focus {
-            color: #000;
-            text-decoration: none;
-            cursor: pointer;
-          }
-        CSS
-      end
-      
-      def style_dom_table_css
-        <<~CSS
-          table {
-            border-spacing: 0;
-          }
-            
-          table tr th,td {
-            cursor: default;
-          }
-        CSS
-      end
-      
       def dom
         i = 0
         body_id = id
         body_class = ([name] + css_classes.to_a).join(' ')
         @dom ||= html {
           div(id: body_id, class: body_class) {
-            # TODO support the idea of dynamic CSS building on close of shell that adds only as much CSS as needed for widgets that were mentioned
+            # TODO consider supporting the idea of dynamic CSS building on close of shell that adds only as much CSS as needed for widgets that were mentioned
             style(class: 'common-style') {
               style_dom_css
             }
-            style(class: 'shell-style') {
-              style_dom_shell_css
-            }
-            style(class: 'list-style') {
-              style_dom_list_css
-            }
-            style(class: 'tab-style') {
-              style_dom_tab_css
-            }
-#             style(class: 'tab-item-style') {
-#               style_dom_tab_item_css
-#             }
-#             style(class: 'modal-style') {
-#               style_dom_modal_css
-#             }
-            style(class: 'table-style') {
-              style_dom_table_css
-            }
-            style(class: 'fill-layout-style') {
-              Glimmer::SWT::FillLayoutProxy::STYLE
-            }
-            style(class: 'row-layout-style') {
-              Glimmer::SWT::RowLayoutProxy::STYLE
-            }
-            style(class: 'grid-layout-style') {
-              Glimmer::SWT::GridLayoutProxy::STYLE
-            }
-            style(class: 'checkbox-style') {
-              Glimmer::SWT::CheckboxProxy::STYLE
-            }
-            style(class: 'radio-style') {
-              Glimmer::SWT::RadioProxy::STYLE
-            }
-            style(class: 'scrolled-composite-style') {
-              Glimmer::SWT::ScrolledCompositeProxy::STYLE
-            }
-            style(class: 'table-item-style') {
-              Glimmer::SWT::TableItemProxy::STYLE
-            }
-            style(class: 'table-column-style') {
-              Glimmer::SWT::TableColumnProxy::STYLE
-            }
+            [LayoutProxy, WidgetProxy].map(&:descendants).reduce(:+).each do |style_class|
+              if style_class.constants.include?('STYLE')
+                style(class: "#{style_class.name.split(':').last.underscore.gsub('_', '-').sub(/-proxy$/, '')}-style") {
+                  style_class::STYLE
+                }
+              end
+            end
+            ''
           }
         }.to_s
       end
@@ -261,7 +106,7 @@ module Glimmer
       def open
         # TODO consider the idea of delaying rendering till the open method
         # TODO make it start as hidden and show shell upon open
-        Glimmer::SWT::DisplayProxy.instance.shells << self
+#         DisplayProxy.instance.shells << self
       end
     end
   end