reterm 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8eccbffc9e67c0b58c4ecce6689ed983192fdfc
-  data.tar.gz: fa932fa439231e95d1bb945c33a3e760da491f4a
+  metadata.gz: 4a718fe1f9ad7dbe389aaba371d9456c88957cbb
+  data.tar.gz: 1deb434bf5d7296cbcf7c2dd12a277490241ddec
 SHA512:
-  metadata.gz: 45677b6521f05935d939bac79b2ab237508ce109cf177868a69136f89cfb0993fa3404202b87d0c90cc2734439250db8a00401c4509b5eb7ddabcb0128ddc282
-  data.tar.gz: 5800ed5af8c81a8909a3ce6f50a4ee7fba3db37bfd932a14d927fba956accb60d1b603cf196a2e5e9105ab748072f1d5d53b460a707f1e9c914ecccf08376c1f
+  metadata.gz: caeaaef04e95b928996a7e11fb49478a3b6a4365a3ede393fe6f434f24ca562e9a477a4cdfedb6a15ed44d65fc5b6bd8df754e6cbd92dc245dc8fa2b920fa1eb
+  data.tar.gz: d98622a223979d12bdc27c50df65ecfdd728d455fa2d2524022eb1d3cf734f619c889e9252fcb9d5dc6d30916b062b8c25a000ffc3eace21f1ee0d26040b9d80

data/designer/src/ComponentParams.rb

@@ -18,66 +18,106 @@ class ComponentParams
   end
 
   def before_show
+    set_title
+    add_component_params
+    add_general_params
+  end
+
+  private
+
+  def set_title
     @builder[:component_edit_title].text = "Edit \"#{@component}\" params"
+  end
 
+  def add_component_params
     COMPONENTS[@component][:params].each { |label, type|
-      layout = Gtk::HBox.new
-
-      glabel = Gtk::Label.new label
-      glabel.margin = 5
-      layout.add glabel
-      glabel.show
-
-      if type.is_a?(Array)
-        placeholder = Gtk::Image.new(:file => "#{IMG_DIR}/blank_sm.png")
-        layout.pack_end placeholder
-        placeholder.margin = 14
-        placeholder.show
-
-        add_img = Gtk::Image.new(:file => "#{IMG_DIR}/add.png")
-        add_btn = Gtk::Button.new
-        add_btn.margin = 5
-        add_btn.add(add_img)
-
-        layout.pack_end add_btn
-        add_btn.signal_connect("clicked") {
-          add_row(label, type)
-        }
-
-        add_img.show
-        add_btn.show
-      end
+      add_params(label, type)
+    }
+  end
+
+  def add_general_params
+    COMPONENTS[:generic][:params].each { |label, type|
+      add_params(label, type)
+    }
+
+    # TODO if adding to Grid Layout also add x/y params
+    # (required, default to 1)
+  end
+
+  def add_params(label, type)
+    layout = Gtk::HBox.new
+
+    glabel = Gtk::Label.new label
+    glabel.margin = 5
+    layout.add glabel
+    glabel.show
 
+    if type.is_a?(Array)
+      placeholder = Gtk::Image.new(:file => "#{IMG_DIR}/blank_sm.png")
+      layout.pack_end placeholder
+      placeholder.margin = 14
+      placeholder.show
+
+      add_img = Gtk::Image.new(:file => "#{IMG_DIR}/add.png")
+      add_btn = Gtk::Button.new
+      add_btn.margin = 5
+      add_btn.add(add_img)
+
+      layout.pack_end add_btn
+      add_btn.signal_connect("clicked") {
+        add_row(type)
+      }
+
+      add_img.show
+      add_btn.show
+    end
+
+    if type == :bool
+      gchk = Gtk::CheckButton.new
+      layout.pack_end gchk
+      gchk.show
+
+    else
       gedit = Gtk::Entry.new
       layout.pack_end gedit
       gedit.show
+    end
 
 
-      @builder[:component_edit_layout].add layout
-      layout.show
-    }
+    @builder[:component_edit_layout].add layout
+    layout.show
   end
 
-  private
-
   def component_params
     @builder[:component_edit_layout].children.collect { |c|
       p = c.children.first # label
            .text
 
-      t = COMPONENTS[@component][:params][p]
+
+      t = (COMPONENTS.key?(@component) &&
+           COMPONENTS[@component].key?(:params) &&
+           COMPONENTS[@component][:params].key?(p)) ?
+           COMPONENTS[@component][:params][p] :
+           COMPONENTS[:generic][:params][p]
+
       t = t.first if t.is_a?(Array)
 
-      txt = c.children[1].text
-      if t == :int
-        txt.to_i
-      else # if t == :string
-        txt
+      if t == :bool
+        !!c.children[1].active?
+
+      else
+        txt = c.children[1].text
+
+        if t == :int
+          txt.to_i
+        else # if t == :string
+          txt
+        end
       end
     }
   end
 
-  def add_row(label, type)
+  def add_row(type)
     layout = Gtk::HBox.new
     glabel = Gtk::Label.new
     glabel.margin = 5
@@ -101,14 +141,21 @@ class ComponentParams
     add_btn.add(add_img)
     layout.pack_end add_btn
     add_btn.signal_connect("clicked") {
-      add_row(label, type)
+      add_row(type)
     }
     add_img.show
     add_btn.show
 
-    gedit = Gtk::Entry.new
-    layout.pack_end gedit
-    gedit.show
+    if type == :bool
+      gchk = Gtk::CheckButton.new
+      layout.pack_end gchk
+      gchk.show
+
+    else
+      gedit = Gtk::Entry.new
+      layout.pack_end gedit
+      gedit.show
+    end
 
     @builder[:component_edit_layout].add layout
     layout.show

data/designer/src/ComponentsList.rb

@@ -1,6 +1,6 @@
 # List of supported components
 class ComponentsList < VR::ListView
-  attr_accessor :designer
+  attr_accessor :designer, :selected
 
   def initialize(designer)
     @designer = designer
@@ -22,11 +22,24 @@ class ComponentsList < VR::ListView
     first = true
     selection.signal_connect("changed") {
       unless selection.selected.nil?
-        changed unless first
+        _changed(selected_component) unless first
         selection.unselect_all
         first = false
       end
     }
+
+    enable_model_drag_source(Gdk::ModifierType::BUTTON1_MASK,
+                             [["reterm", Gtk::TargetFlags::SAME_APP, 0]],
+                             Gdk::DragAction::DEFAULT | Gdk::DragAction::COPY)
+
+    lv = self
+    signal_connect("drag_data_get") do |widget, context, selection_data, info, time|
+      selection_data.set(Gdk::Selection::TYPE_STRING, lv.selected)
+    end
+  end
+
+  def selected_component
+    selection.selected[1]
   end
 
   def add_component(c)
@@ -37,40 +50,28 @@ class ComponentsList < VR::ListView
   end
 
   def self__row_activated(*args)
-    changed
+    _changed(selected_component)
+  end
+
+  def change_to(target)
+    _changed(target)
   end
 
   private
 
-  def changed
-    unless designer.has_toggled_area?
-      dialog = Gtk::MessageDialog.new(:parent  => designer.window,
-					                            :flags   => :destroy_with_parent,
-                                      :type    => :info,
-                                      :buttons => :close,
-                       :message => "Must select area to add component")
-
-      dialog.signal_connect("response") { |*args|
-        dialog.destroy
-      }
-      dialog.show
-      return
-    end
+  def _changed(selected)
+    @selected = selected
 
+    return unless designer.has_toggled_area?
 
-    c = selection.selected[1]
-    e = COMPONENTS[c.intern]
-    if e.key?(:params)
-      w = ComponentParams.new(c.intern, designer)
-      w.show_glade(designer)
-    else
-      designer.create_component(c.intern, [])
-    end
+    w = ComponentParams.new(@selected.intern, designer)
+    w.show_glade(designer)
   end
 
   DEFAULT_IMG = GdkPixbuf::Pixbuf.new(:file => "#{IMG_DIR}/blank.png")
 
   def desc_for(c)
+    return "" unless COMPONENTS.key?(c)
     COMPONENTS[c][:desc]
   end
 

data/designer/src/CreatedList.rb

@@ -88,6 +88,10 @@ class CreatedList < VR::TreeView
     component_for(row_for(widget))
   end
 
+  def reset!
+    unregister(rows_by_parent[nil].first)
+  end
+
   def unregister(row)
     0.upto(row.n_children-1) { |child|
       unregister(row.nth_child(child))
@@ -95,9 +99,12 @@ class CreatedList < VR::TreeView
 
     parent = parent_for(row)
     widget = widget_for(row)
+    component = component_for(row)
 
     rows_by_parent[parent].delete(row)
+    rows_by_component.delete(component)
     rows_by_widget.delete(widget)
+    params_by_widget.delete(widget)
     model.remove(row)
 
     designer.remove_component(widget)
@@ -114,6 +121,8 @@ class CreatedList < VR::TreeView
     win = {'window' => {}}
 
     top = rows_by_parent[nil].first # there should be only one element here
+    return win if top.nil?
+
     tc  = component_for(top)
     wg  = widget_for(top)
 

data/designer/src/Designer.rb

@@ -28,6 +28,7 @@ class Designer
     @builder["created_window"].add(@created_list,     :expand => true)
     @builder["viewer"].add(@component.btn)
     @component.show
+    wire_menus
   end  
 
   def create_component(component, params)
@@ -106,9 +107,30 @@ class Designer
   end
 
   def set_components
+    RETerm::Config.load_plugins
+
     (RETerm::Layouts.all.sort +
      RETerm::Components.all.sort).each { |c|
-      @component_list.add_component c if COMPONENTS.key?(c)
+      @component_list.add_component c
     }
   end
+
+  def wire_menus
+    @builder["file_menu_new"].signal_connect("activate") do
+      created_list.reset!
+    end
+
+    @builder["file_menu_save"].signal_connect("activate") do
+      file = FileChooser.new(window).show
+      File.write(file, created_list.schema)
+    end
+
+    @builder["file_menu_quit"].signal_connect("activate") do
+      window.destroy
+    end
+
+    @builder["help_menu_about"].signal_connect("activate") do
+      About.new
+    end
+  end
 end

data/designer/src/ToggleArea.rb

@@ -1,17 +1,17 @@
 # Mechanism which user specifies area to add component
 class ToggleArea
-  attr_accessor :toggled
+  attr_accessor :toggled, :designer
 
   def toggle_on
     @toggled = true
-    btn.remove(add)
+    btn.remove(btn.children[0])
     btn.add(rm)
     @designer.toggle_area = self
   end
 
   def toggle_off
     @toggled = false
-    btn.remove(rm)
+    btn.remove(btn.children[0])
     btn.add(add)
     show
     @designer.clear_toggle_area
@@ -46,6 +46,23 @@ class ToggleArea
         css_provider.load(data: "button:hover {background-image: image(#FFFF00);}")
         b.style_context.add_provider(css_provider, Gtk::StyleProvider::PRIORITY_USER)
 
+        b.drag_dest_set(Gtk::DestDefaults::ALL | Gtk::DestDefaults::MOTION | Gtk::DestDefaults::HIGHLIGHT,
+                        [["reterm", :same_app, 0]],
+                        [Gdk::DragAction::COPY.to_i,
+                         Gdk::DragAction::MOVE.to_i])
+
+        ta = self
+        dragged = nil
+
+        b.signal_connect("drag-data-received") do |widget, context, x, y, selection_data, info, time|
+          dragged = selection_data.text
+        end
+
+        b.signal_connect("drag-drop") do |widget, context, x, y, time|
+          ta.designer.toggle_area = self
+          ta.designer.component_list.change_to(dragged)
+        end
+
         b
       end
   end

data/designer/src/about.rb

@@ -0,0 +1,35 @@
+require 'reterm/version'
+
+class About
+  def initialize
+    Gtk::AboutDialog.set_email_hook {|about, link|
+      p "mo@morsi.org"
+      p link
+    }
+    Gtk::AboutDialog.set_url_hook {|about, link|
+      p "http://github.com/movitto/reterm"
+      p link
+    }
+
+    a = Gtk::AboutDialog.new
+    #a.artists   = ["Artist 1 <no1@foo.bar.com>"]
+    a.authors = ["Mo Morsi <mo@morsi.org>"]
+    a.comments  = "RETerm Terminal UI Designer"
+    a.copyright = "Copyright (C) 2017 Mo Morsi"
+    #a.documenters = ["Documenter 1 <no1@foo.bar.com>"]
+    a.license   = "MIT License"
+
+    icon_theme = Gtk::IconTheme.default
+    a.logo = icon_theme.load_icon(icon_theme.icons.first, 48, 0)
+
+    a.program_name = "RETerm Designer"
+    #a.translator_credits = "Translator 1\nTranslator 2\n"
+    a.version   = RETerm::VERSION
+    a.website   = "http://github.com/movitto/reterm"
+    a.website_label = "RETerm Project Website"
+
+    a.run
+    a.destroy
+  end
+end # class About
+

data/designer/src/component_factory.rb

@@ -1,4 +1,13 @@
 def build_component(designer, component, params)
+  # TODO all graphical components created here
+  # should be resizable by dragging widget border
+  # (unless fill or expand property is true).
+  # Widgets created in Grid layouts should be
+  # moveable by dragging component.
+  #
+  # Resizing or dragging component should update
+  # backend component / effect final output params
+
   if component == :Horizontal
     areas = []
     c = Gtk::HBox.new
@@ -23,7 +32,16 @@ def build_component(designer, component, params)
 
     return [c, areas]
 
+  # elsif component == :Grid
+    # TODO need to create a new component based
+    # on Gtk Grid Layout and use here in lieu
+    # of ToggleArea.
+
   else
+    # TODO visual properties based on component params
+    # eg actually render component of width/height at
+    # x/y coordinate w/ component-specific params,
+    # such as text for labels, options for radios, etc
     return designer.component_list.image_for(component)
 
   end