Merge pull request #24 from yast/caasp_merge

Caasp merge

package/yast2-tune.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 20 16:21:30 UTC 2017 - mvidner@suse.com
+
+- Added Tune::Widgets::SystemInformation (FATE#322328).
+- 3.1.10
+
 -------------------------------------------------------------------
 Mon Jul 11 12:24:21 UTC 2016 - igonzalezsosa@suse.com
 

package/yast2-tune.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-tune
-Version:        3.1.9
+Version:        3.1.10
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -81,6 +81,8 @@ fi
 %{yast_desktopdir}/hwinfo.desktop
 %{yast_desktopdir}/system_settings.desktop
 %{yast_moduledir}/*.rb
+%dir %{yast_libdir}/tune
+%{yast_libdir}/tune/*.rb
 %{yast_scrconfdir}/*.scr
 %dir %{yast_docdir}
 %doc %{yast_docdir}/COPYING

src/Makefile.am

@@ -12,6 +12,10 @@ client_DATA = \
   clients/hwinfo.rb \
   clients/system_settings_finish.rb
 
+ylibdir = "${yast2dir}/lib/tune"
+ylib_DATA = \
+  lib/tune/widgets.rb
+
 yncludedir = @yncludedir@/hwinfo
 ynclude_DATA = \
   include/hwinfo/system_settings_ui.rb \
@@ -26,6 +30,6 @@ desktop_DATA = \
   desktop/system_settings.desktop \
   desktop/hwinfo.desktop
 
-EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(desktop_DATA)
+EXTRA_DIST = $(module_DATA) $(client_DATA) $(ylib_DATA) $(ynclude_DATA) $(scrconf_DATA) $(desktop_DATA)
 
-include $(top_srcdir)/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common

src/lib/tune/widgets.rb

@@ -0,0 +1,44 @@
+# encoding: utf-8
+
+# ------------------------------------------------------------------------------
+# Copyright (c) 2017 SUSE LLC
+#
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of version 2 of the GNU General Public License as published by the
+# Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, contact SUSE.
+#
+# To contact SUSE about this file by physical or electronic mail, you may find
+# current contact information at www.suse.com.
+# ------------------------------------------------------------------------------
+
+require "yast"
+require "cwm/widget"
+
+module Tune
+  module Widgets
+    class SystemInformation < CWM::PushButton
+      def initialize
+        textdomain "tune"
+      end
+
+      def label
+        # PushButton label
+        _("System Information")
+      end
+
+      def handle
+        Yast::WFM.CallFunction("inst_hwinfo", [])
+        # stay in the dialog
+        nil
+      end
+    end
+  end
+end