use new registration widget

yast · Jan 27, 2017 · 16b4d2e · 16b4d2e
1 parent 07edba9
commit 16b4d2e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 23 deletions.
diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -105,8 +105,8 @@ Conflicts:	yast2-core < 2.17.10
 # Top bar with logo
 Conflicts:	yast2-ycp-ui-bindings < 3.1.7
 
-# RegserviceSelectionDialog
-Conflicts:  yast2-registration < 3.1.179
+# new registration widget
+Conflicts:  yast2-registration <= 3.1.190
 
 Obsoletes:	yast2-installation-devel-doc
 

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -214,7 +214,6 @@ ylibdialog_DATA = \
 
 ylibwidgetdir = "${yast2dir}/lib/installation/widgets"
 ylibwidget_DATA = \
-  lib/installation/widgets/mocked.rb \
   lib/installation/widgets/overview.rb \
   lib/installation/widgets/system_role.rb
 

diff --git a/src/lib/installation/clients/inst_casp_overview.rb b/src/lib/installation/clients/inst_casp_overview.rb
@@ -23,11 +23,10 @@
 require "y2country/widgets"
 require "ui/widgets"
 require "tune/widgets"
+require "registration/widgets/registration_code"
 
 require "installation/widgets/overview"
 require "installation/widgets/system_role"
-# FIXME: prototype only
-require "installation/widgets/mocked"
 
 module Installation
   # This library provides a simple dialog for setting
@@ -125,7 +124,7 @@ def content
       dashboard = Installation::Widgets::DashboardPlace.new
       quadrant_layout(
         upper_left:  VBox(
-          ::Widgets::RegistrationCode.new,
+          ::Registration::Widgets::RegistrationCode.new,
           ::Users::PasswordWidget.new(little_space: true),
           # use english us as default keyboard layout
           ::Y2Country::Widgets::KeyboardSelectionCombo.new("english-us")

diff --git a/src/lib/installation/widgets/mocked.rb b/src/lib/installation/widgets/mocked.rb