add ui shortcuts

src/ruby/ycp.rb

@@ -38,40 +38,5 @@
 require "ycp/path"
 require "ycp/scr"
 require "ycp/term"
+require "ycp/ui"
 require "ycp/wfm"
-
-#--------------------------------------
-#
-# YCP::Ui
-#
-
-module YCP
-  module Ui
-
-  # Define symbols for the UI
-  ui_terms = [ :BarGraph, :Bottom, :CheckBox, :ColoredLabel, :ComboBox, :Date,
-    :DownloadProgress, :DumbTab, :DummySpecialWidget, :Empty, :Frame, :HBox, :HBoxvHCenter,
-    :HMultiProgressMeter, :HSpacing, :HSquash, :HStretch, :HVCenter, :HVSquash,
-    :HVStretch, :HWeight, :Heading, :IconButton, :Image, :IntField, :Label, :Left, :LogView,
-    :MarginBox, :MenuButton, :MinHeight, :MinSize, :MinWidth, :MultiLineEdit,
-    :MultiSelectionBox, :PackageSelector, :PatternSelector, :PartitionSplitter,
-    :Password, :PkgSpecial, :ProgressBar, :PushButton, :RadioButton,
-    :RadioButtonGroup, :ReplacePoint, :RichText, :Right, :SelectionBox, :Slider, :Table,
-    :TextEntry, :Time, :Top, :Tree, :VBox, :VCenter, :VMultiProgressMeter, :VSpacing,
-    :VSquash, :VStretch, :VWeight, :Wizard,
-    :id, :opt ]
-
-   # for each symbol define a util function that will create a term
-    ui_terms.each do | term_name |
-      define_method(term_name) do | *args |
-        t = YaST::Term.new(term_name.to_s)
-        args.each do |arg|
-          t.add(arg)
-        end
-        return t
-      end
-      alias_method term_name.to_s.downcase, term_name
-    end
-
-  end # end Ui module
-end

src/ruby/ycp/client_base.rb

@@ -1,11 +1,13 @@
 require "ycp/ycp"
 require "ycp/i18n"
 require "ycp/exportable"
+require "ycp/ui"
 
 module YCP
   class ClientBase
     include I18n
     extend Exportable
     include YCP
+    include UI
   end
 end

src/ruby/ycp/module_base.rb

@@ -1,11 +1,13 @@
 require "ycp/ycp"
 require "ycp/i18n"
 require "ycp/exportable"
+require "ycp/ui"
 
 module YCP
   class ModuleBase
     include I18n
     extend Exportable
     include YCP
+    include UI
   end
 end

src/ruby/ycp/ui.rb

@@ -0,0 +1,26 @@
+require "ycp/term"
+
+module YCP
+  module UI
+
+  # Define symbols for the UI
+  UI_TERMS = [ :BarGraph, :Bottom, :CheckBox, :ColoredLabel, :ComboBox, :Date,
+    :DownloadProgress, :DumbTab, :DummySpecialWidget, :Empty, :Frame, :HBox, :HBoxvHCenter,
+    :HMultiProgressMeter, :HSpacing, :HSquash, :HStretch, :HVCenter, :HVSquash,
+    :HVStretch, :HWeight, :Heading, :IconButton, :Image, :IntField, :Label, :Left, :LogView,
+    :MarginBox, :MenuButton, :MinHeight, :MinSize, :MinWidth, :MultiLineEdit,
+    :MultiSelectionBox, :PackageSelector, :PatternSelector, :PartitionSplitter,
+    :Password, :PkgSpecial, :ProgressBar, :PushButton, :RadioButton,
+    :RadioButtonGroup, :ReplacePoint, :RichText, :Right, :SelectionBox, :Slider, :Table,
+    :TextEntry, :Time, :Top, :Tree, :VBox, :VCenter, :VMultiProgressMeter, :VSpacing,
+    :VSquash, :VStretch, :VWeight, :Wizard,
+    :id, :opt ]
+
+   # for each symbol define a util function that will create a term
+    UI_TERMS.each do | term_name |
+      define_method(term_name) do | *args |
+        YCP::Term.new(term_name, *args)
+      end
+    end
+  end
+end

tests/ruby/ui_test.rb

@@ -0,0 +1,13 @@
+$LOAD_PATH << File.dirname(__FILE__)
+require "test_helper"
+
+require "ycp/ui"
+
+class UITest < YCP::TestCase
+  include YCP::UI
+
+  def test_shortcuts
+    assert_equal YCP::Term.new(:HBox), HBox()
+    assert_equal YCP::Term.new(:HBox, "test"), HBox("test")
+  end
+end