Mailinglist Archive: opensuse-commit (2125 mails)
| < Previous | Next > |
commit yast2-ycp-ui-bindings
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 04 Apr 2008 01:21:52 +0200
- Message-id: <20080403232152.8167F678168@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-ycp-ui-bindings
checked in at Fri Apr 4 01:21:52 CEST 2008.
--------
--- yast2-ycp-ui-bindings/yast2-ycp-ui-bindings.changes 2008-03-07
14:14:21.000000000 +0100
+++
/mounts/work_src_done/STABLE/yast2-ycp-ui-bindings/yast2-ycp-ui-bindings.changes
2008-04-03 18:08:56.066456000 +0200
@@ -1,0 +2,17 @@
+Thu Apr 3 15:25:08 CEST 2008 - sh@xxxxxxx
+
+- Added `opt(`helpButton) for PushButton widgets
+- V 2.16.41
+
+-------------------------------------------------------------------
+Wed Mar 26 17:14:18 CET 2008 - sh@xxxxxxx
+
+- Added UI::TextMode() (bnc #222948)
+- V 2.16.40
+
+-------------------------------------------------------------------
+Wed Mar 12 14:29:16 CET 2008 - mvidner@xxxxxxx
+
+- build fix - prefix friendliness
+
+-------------------------------------------------------------------
Old:
----
yast2-ycp-ui-bindings-2.16.39.tar.bz2
New:
----
yast2-ycp-ui-bindings-2.16.41.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ycp-ui-bindings.spec ++++++
--- /var/tmp/diff_new_pack.j14257/_old 2008-04-04 01:20:04.000000000 +0200
+++ /var/tmp/diff_new_pack.j14257/_new 2008-04-04 01:20:04.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ycp-ui-bindings (Version 2.16.39)
+# spec file for package yast2-ycp-ui-bindings (Version 2.16.41)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-ycp-ui-bindings
-Version: 2.16.39
+Version: 2.16.41
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ycp-ui-bindings-2.16.39.tar.bz2
+Source0: yast2-ycp-ui-bindings-2.16.41.tar.bz2
Prefix: /usr
BuildRequires: gcc-c++
BuildRequires: yast2-devtools
@@ -30,8 +30,8 @@
Conflicts: yast2-core < 2.16.38
# libycp includes crypto built-ins
BuildRequires: libxcrypt-devel
-Requires: yast2-libyui >= 2.16.39
-BuildRequires: yast2-libyui-devel >= 2.16.39
+Requires: yast2-libyui >= 2.16.41
+BuildRequires: yast2-libyui-devel >= 2.16.41
# libyui ImplPtr
BuildRequires: boost-devel
Summary: YaST2 - YCP Bindings for the YaST2 User Interface Engine
@@ -51,6 +51,7 @@
Matthias Kettner
%package devel
+License: GPL v2 or later
Requires: yast2-ycp-ui-bindings = %version
Group: System/YaST
Summary: YaST2 - Development for YCP Bindings for the YaST2 User
Interface Engine
@@ -76,7 +77,7 @@
Matthias Kettner
%prep
-%setup -n yast2-ycp-ui-bindings-2.16.39
+%setup -n yast2-ycp-ui-bindings-2.16.41
%build
%{prefix}/bin/y2tool y2autoconf
@@ -115,6 +116,14 @@
%{_libdir}/pkgconfig/yast2-ycp-ui-bindings.pc
%doc %{prefix}/share/doc/packages/yast2-ycp-ui-bindings
%changelog
+* Thu Apr 03 2008 sh@xxxxxxx
+- Added `opt(`helpButton) for PushButton widgets
+- V 2.16.41
+* Wed Mar 26 2008 sh@xxxxxxx
+- Added UI::TextMode() (bnc #222948)
+- V 2.16.40
+* Wed Mar 12 2008 mvidner@xxxxxxx
+- build fix - prefix friendliness
* Fri Mar 07 2008 aschnell@xxxxxxx
- include open info also of items in closed branches in OpenItems
* Wed Mar 05 2008 sh@xxxxxxx
++++++ yast2-ycp-ui-bindings-2.16.39.tar.bz2 ->
yast2-ycp-ui-bindings-2.16.41.tar.bz2 ++++++
++++ 10749 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ycp-ui-bindings-2.16.39/configure.in
new/yast2-ycp-ui-bindings-2.16.41/configure.in
--- old/yast2-ycp-ui-bindings-2.16.39/configure.in 2008-03-07
14:13:46.000000000 +0100
+++ new/yast2-ycp-ui-bindings-2.16.41/configure.in 2008-03-12
19:42:47.000000000 +0100
@@ -1,6 +1,6 @@
dnl configure.in for yast2-ycp-ui-bindings
dnl
-dnl -- This file is generated by y2autoconf 2.16.6 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
AC_INIT(yast2-ycp-ui-bindings, 2.16.39, http://bugs.opensuse.org/,
yast2-ycp-ui-bindings)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ycp-ui-bindings-2.16.39/examples/BarGraph1.ycp
new/yast2-ycp-ui-bindings-2.16.41/examples/BarGraph1.ycp
--- old/yast2-ycp-ui-bindings-2.16.39/examples/BarGraph1.ycp 2008-02-22
12:03:18.000000000 +0100
+++ new/yast2-ycp-ui-bindings-2.16.41/examples/BarGraph1.ycp 2008-04-03
14:11:21.000000000 +0200
@@ -1,12 +1,13 @@
+// BarGraph1.ycp
{
if ( ! UI::HasSpecialWidget(`BarGraph) )
{
UI::OpenDialog(
- `VBox(
- `Label("Error: This UI doesn't support the BarGraph
widget!"),
- `PushButton(`opt(`default), "&OK")
- )
- );
+ `VBox(
+ `Label("Error: This UI doesn't support the
BarGraph widget!"),
+ `PushButton(`opt(`default), "&OK")
+ )
+ );
UI::UserInput();
UI::CloseDialog();
@@ -14,12 +15,12 @@
}
UI::OpenDialog(
- `VBox(
- `HSpacing( 60 ), // wider default size
- `BarGraph( [450, 100, 700] ),
- `PushButton(`opt(`default), "&OK")
- )
- );
+ `VBox(
+ `HSpacing( 60 ), // wider default size
+ `BarGraph( [450, 100, 700] ),
+ `PushButton(`opt(`default), "&OK")
+ )
+ );
UI::UserInput();
UI::CloseDialog();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ycp-ui-bindings-2.16.39/examples/bullshit.ycp
new/yast2-ycp-ui-bindings-2.16.41/examples/bullshit.ycp
--- old/yast2-ycp-ui-bindings-2.16.39/examples/bullshit.ycp 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-ycp-ui-bindings-2.16.41/examples/bullshit.ycp 2008-04-03
15:59:55.000000000 +0200
@@ -0,0 +1,17 @@
+// Simple example for help text
+{
+ UI::OpenDialog(
+ `VBox(`id(`mainLayout),
+ `Label("Hello, World!"),
+ `HBox(
+ `PushButton(`opt(`helpButton ), "&Help"),
+ `PushButton(`opt(`default ), "&OK")
+ )
+ )
+ );
+ // UI::ChangeWidget(`mainLayout, `HelpText,
+ // "Oh, come on, do you really need help for this?" );
+
+ UI::UserInput();
+ UI::CloseDialog();
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ycp-ui-bindings-2.16.39/examples/DefaultButtons1.ycp
new/yast2-ycp-ui-bindings-2.16.41/examples/DefaultButtons1.ycp
--- old/yast2-ycp-ui-bindings-2.16.39/examples/DefaultButtons1.ycp
2008-02-22 12:03:18.000000000 +0100
+++ new/yast2-ycp-ui-bindings-2.16.41/examples/DefaultButtons1.ycp
2008-03-28 11:37:49.000000000 +0100
@@ -62,7 +62,7 @@
// UI::DumpWidgetTree();
- UI::WizardCommand(`SetDialogIcon(
"/usr/share/YaST2/theme/SuSELinux/icons/22x22/apps/user_add.png" ) );
+ UI::WizardCommand(`SetDialogIcon(
"/usr/share/YaST2/theme/current/icons/22x22/apps/YaST.png" ) );
UI::WizardCommand(`SetDialogHeading( "Welcome to the YaST2 installation" )
);
UI::WizardCommand(`SetHelpText( help_text ) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ycp-ui-bindings-2.16.39/examples/DefaultButtons2.ycp
new/yast2-ycp-ui-bindings-2.16.41/examples/DefaultButtons2.ycp
--- old/yast2-ycp-ui-bindings-2.16.39/examples/DefaultButtons2.ycp
2008-02-22 12:03:18.000000000 +0100
+++ new/yast2-ycp-ui-bindings-2.16.41/examples/DefaultButtons2.ycp
2008-03-28 11:38:59.000000000 +0100
@@ -62,7 +62,7 @@
// UI::DumpWidgetTree();
- UI::WizardCommand(`SetDialogIcon(
"/usr/share/YaST2/theme/SuSELinux/icons/22x22/apps/user_add.png" ) );
+ UI::WizardCommand(`SetDialogIcon(
"/usr/share/YaST2/theme/current/icons/22x22/apps/YaST.png" ) );
UI::WizardCommand(`SetDialogHeading( "Welcome to the YaST2 installation" )
);
UI::WizardCommand(`SetHelpText( help_text ) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ycp-ui-bindings-2.16.39/examples/DefaultButtons3.ycp
new/yast2-ycp-ui-bindings-2.16.41/examples/DefaultButtons3.ycp
--- old/yast2-ycp-ui-bindings-2.16.39/examples/DefaultButtons3.ycp
2008-02-22 12:03:18.000000000 +0100
+++ new/yast2-ycp-ui-bindings-2.16.41/examples/DefaultButtons3.ycp
2008-03-28 11:39:01.000000000 +0100
@@ -62,7 +62,7 @@
// UI::DumpWidgetTree();
- UI::WizardCommand(`SetDialogIcon(
"/usr/share/YaST2/theme/SuSELinux/icons/22x22/apps/user_add.png" ) );
+ UI::WizardCommand(`SetDialogIcon(
"/usr/share/YaST2/theme/current/icons/22x22/apps/YaST.png" ) );
UI::WizardCommand(`SetDialogHeading( "Welcome to the YaST2 installation" )
);
UI::WizardCommand(`SetHelpText( help_text ) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ycp-ui-bindings-2.16.39/examples/Events.ycp
new/yast2-ycp-ui-bindings-2.16.41/examples/Events.ycp
--- old/yast2-ycp-ui-bindings-2.16.39/examples/Events.ycp 2008-03-06
11:55:11.000000000 +0100
+++ new/yast2-ycp-ui-bindings-2.16.41/examples/Events.ycp 2008-04-03
15:14:53.000000000 +0200
@@ -118,7 +118,7 @@
`HWeight( 1, pizza ),
`HWeight( 1, toppings ),
`HWeight( 1, drink ),
- `HWeight( 1, `RichText(`id(`help), help_text ) )
+ `HWeight( 1, `RichText(`id(`help_text),
help_text ) )
);
term buttons = `HBox(
@@ -176,7 +176,7 @@
UI::OpenDialog(`opt(`defaultsize),
- `VBox(
+ `VBox(`id(`mainLayout),
`Heading( "Event Example" ),
`Label( howto ),
`VSpacing(),
@@ -200,10 +200,16 @@
`VWeight( 1,
`RichText(`id(`event_display), event_display
)
),
- `Right( `PushButton(`id(`close), "C&lose" ) )
+ `HBox(
+ `PushButton(`id(`help), `opt(`helpButton),
"&Help" ),
+ `HStretch(),
+ `PushButton(`id(`close), "C&lose" )
+ )
)
);
+ UI::ChangeWidget(`mainLayout, `HelpText, howto );
+
//
// Event loop
//
@@ -247,6 +253,17 @@
UI::ChangeWidget(`send_mafioso, `Value, nil );
UI::DumpWidgetTree();
}
+ //
+ // Help text is displayed automatically (because of `opt(`helpButton)
+ //
+ // else if ( event["ID"]:nil == `help )
+ // {
+ // string helpText = (string) UI::QueryWidget(`mainLayout,
`HelpText );
+ // UI::OpenDialog(`VBox(`MinSize( 35, 7, `RichText( helpText )
),
+ // `PushButton("&OK" ) ) );
+ // UI::UserInput();
+ // UI::CloseDialog();
+ // }
else if ( event["ID"]:nil == `cancel_order )
{
y2milestone( "Cancelling order" );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ycp-ui-bindings-2.16.39/examples/HelpText.ycp
new/yast2-ycp-ui-bindings-2.16.41/examples/HelpText.ycp
--- old/yast2-ycp-ui-bindings-2.16.39/examples/HelpText.ycp 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-ycp-ui-bindings-2.16.41/examples/HelpText.ycp 2008-04-03
15:41:51.000000000 +0200
@@ -0,0 +1,17 @@
+// Simple example for help text
+{
+ UI::OpenDialog(
+ `VBox(`id(`mainLayout),
+ `Label("Hello, World!"),
+ `HBox(
+ `PushButton(`opt(`helpButton ), "&Help"),
+ `PushButton(`opt(`default ), "&OK")
+ )
+ )
+ );
+ UI::ChangeWidget(`mainLayout, `HelpText,
+ "Oh, come on, do you really need help for this?" );
+
+ UI::UserInput();
+ UI::CloseDialog();
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ycp-ui-bindings-2.16.39/examples/PatternSelector-wizard.ycp
new/yast2-ycp-ui-bindings-2.16.41/examples/PatternSelector-wizard.ycp
--- old/yast2-ycp-ui-bindings-2.16.39/examples/PatternSelector-wizard.ycp
2008-02-22 12:03:18.000000000 +0100
+++ new/yast2-ycp-ui-bindings-2.16.41/examples/PatternSelector-wizard.ycp
2008-03-28 11:38:10.000000000 +0100
@@ -61,7 +61,7 @@
"The system needs some available disk space to run properly."
"</p>" );
- UI::WizardCommand(`SetDialogIcon(
"/usr/share/YaST2/theme/SuSELinux/icons/22x22/apps/yast-software.png" ) );
+ UI::WizardCommand(`SetDialogIcon(
"/usr/share/YaST2/theme/current/icons/22x22/apps/YaST.png" ) );
UI::WizardCommand(`SetDialogHeading( "Software Selection" ) );
UI::WizardCommand(`SetHelpText( help_text ) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ycp-ui-bindings-2.16.39/examples/SlideShowDemo2.ycp
new/yast2-ycp-ui-bindings-2.16.41/examples/SlideShowDemo2.ycp
--- old/yast2-ycp-ui-bindings-2.16.39/examples/SlideShowDemo2.ycp
2008-02-22 12:03:18.000000000 +0100
+++ new/yast2-ycp-ui-bindings-2.16.41/examples/SlideShowDemo2.ycp
2008-03-28 11:39:05.000000000 +0100
@@ -211,7 +211,7 @@
// UI::DumpWidgetTree();
- UI::WizardCommand(`SetDialogIcon(
"/usr/share/YaST2/theme/SuSELinux/icons/22x22/apps/user_add.png" ) );
+ UI::WizardCommand(`SetDialogIcon(
"/usr/share/YaST2/theme/current/icons/22x22/apps/YaST.png" ) );
UI::WizardCommand(`SetDialogHeading( "Package Installation" ) );
UI::WizardCommand(`SetHelpText( help_text ) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ycp-ui-bindings-2.16.39/examples/SlideShowDemo.ycp
new/yast2-ycp-ui-bindings-2.16.41/examples/SlideShowDemo.ycp
--- old/yast2-ycp-ui-bindings-2.16.39/examples/SlideShowDemo.ycp
2008-02-22 12:03:18.000000000 +0100
+++ new/yast2-ycp-ui-bindings-2.16.41/examples/SlideShowDemo.ycp
2008-03-28 11:39:19.000000000 +0100
@@ -211,7 +211,7 @@
// UI::DumpWidgetTree();
- UI::WizardCommand(`SetDialogIcon(
"/usr/share/YaST2/theme/SuSELinux/icons/22x22/apps/user_add.png" ) );
+ UI::WizardCommand(`SetDialogIcon(
"/usr/share/YaST2/theme/current/icons/22x22/apps/YaST.png" ) );
UI::WizardCommand(`SetDialogHeading( "Package Installation" ) );
UI::WizardCommand(`SetHelpText( help_text ) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ycp-ui-bindings-2.16.39/examples/TextMode.ycp
new/yast2-ycp-ui-bindings-2.16.41/examples/TextMode.ycp
--- old/yast2-ycp-ui-bindings-2.16.39/examples/TextMode.ycp 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-ycp-ui-bindings-2.16.41/examples/TextMode.ycp 2008-03-26
16:57:47.000000000 +0100
@@ -0,0 +1,12 @@
+// Using UI::TextMode()
+{
+ string msg = UI::TextMode() ? "Text mode" : "GUI mode";
+ UI::OpenDialog(
+ `VBox(
+ `Label( msg ),
+ `PushButton(`opt(`default), "&OK")
+ )
+ );
+ UI::UserInput();
+ UI::CloseDialog();
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ycp-ui-bindings-2.16.39/examples/Wizard2.ycp
new/yast2-ycp-ui-bindings-2.16.41/examples/Wizard2.ycp
--- old/yast2-ycp-ui-bindings-2.16.39/examples/Wizard2.ycp 2008-02-22
12:03:18.000000000 +0100
+++ new/yast2-ycp-ui-bindings-2.16.41/examples/Wizard2.ycp 2008-03-28
11:37:17.000000000 +0100
@@ -23,7 +23,7 @@
// UI::DumpWidgetTree();
- UI::WizardCommand(`SetDialogIcon(
"/usr/share/YaST2/theme/SuSELinux/icons/22x22/apps/user_add.png" ) );
+ UI::WizardCommand(`SetDialogIcon(
"/usr/share/YaST2/theme/current/icons/22x22/apps/YaST.png" ) );
UI::WizardCommand(`SetDialogHeading( "Welcome to the YaST2 installation" )
);
UI::WizardCommand(`SetHelpText( help_text ) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ycp-ui-bindings-2.16.39/examples/Wizard3.ycp
new/yast2-ycp-ui-bindings-2.16.41/examples/Wizard3.ycp
--- old/yast2-ycp-ui-bindings-2.16.39/examples/Wizard3.ycp 2008-02-22
12:03:18.000000000 +0100
+++ new/yast2-ycp-ui-bindings-2.16.41/examples/Wizard3.ycp 2008-03-28
11:39:19.000000000 +0100
@@ -66,7 +66,7 @@
// UI::DumpWidgetTree();
- UI::WizardCommand(`SetDialogIcon(
"/usr/share/YaST2/theme/SuSELinux/icons/22x22/apps/user_add.png" ) );
+ UI::WizardCommand(`SetDialogIcon(
"/usr/share/YaST2/theme/current/icons/22x22/apps/YaST.png" ) );
UI::WizardCommand(`SetDialogHeading( "Welcome to the YaST2 installation" )
);
UI::WizardCommand(`SetHelpText( help_text ) );
UI::WizardCommand(`ShowReleaseNotesButton( "&Release Notes",
"release_notes" ) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ycp-ui-bindings-2.16.39/examples/Wizard4.ycp
new/yast2-ycp-ui-bindings-2.16.41/examples/Wizard4.ycp
--- old/yast2-ycp-ui-bindings-2.16.39/examples/Wizard4.ycp 2008-02-22
12:03:18.000000000 +0100
+++ new/yast2-ycp-ui-bindings-2.16.41/examples/Wizard4.ycp 2008-03-28
11:39:17.000000000 +0100
@@ -24,7 +24,7 @@
// UI::DumpWidgetTree();
- UI::WizardCommand(`SetDialogIcon(
"/usr/share/YaST2/theme/SuSELinux/icons/22x22/apps/user_add.png" ) );
+ UI::WizardCommand(`SetDialogIcon(
"/usr/share/YaST2/theme/current/icons/22x22/apps/YaST.png" ) );
UI::WizardCommand(`SetDialogHeading( "Welcome to the YaST2 installation" )
);
UI::WizardCommand(`SetHelpText( help_text ) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ycp-ui-bindings-2.16.39/missing
new/yast2-ycp-ui-bindings-2.16.41/missing
--- old/yast2-ycp-ui-bindings-2.16.39/missing 2008-03-07 14:13:58.000000000
+0100
+++ new/yast2-ycp-ui-bindings-2.16.41/missing 2008-03-12 19:43:05.000000000
+0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2005-06-08.21
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@xxxxxxxxxxxxxxxx>, 1996.
@@ -33,8 +33,6 @@
fi
run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -46,7 +44,7 @@
msg="missing on your system"
-case $1 in
+case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -79,7 +77,6 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -109,7 +106,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case $1 in
+case "$1" in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -138,7 +135,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case "$1" in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -167,7 +164,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case $f in
+ case "$f" in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -195,8 +192,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
if test -f "$file"; then
touch $file
else
@@ -217,25 +214,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if test ! -f y.tab.h; then
+ if [ ! -f y.tab.h ]; then
echo >y.tab.h
fi
- if test ! -f y.tab.c; then
+ if [ ! -f y.tab.c ]; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -247,18 +244,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if test ! -f lex.yy.c; then
+ if [ ! -f lex.yy.c ]; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -270,9 +267,11 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ if test -z "$file"; then
+ file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+ fi
+ if [ -f "$file" ]; then
touch $file
else
test -z "$file" || exec >$file
@@ -290,17 +289,11 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -324,13 +317,13 @@
fi
firstarg="$1"
if shift; then
- case $firstarg in
+ case "$firstarg" in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case $firstarg in
+ case "$firstarg" in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ycp-ui-bindings-2.16.39/src/Makefile.am
new/yast2-ycp-ui-bindings-2.16.41/src/Makefile.am
--- old/yast2-ycp-ui-bindings-2.16.39/src/Makefile.am 2008-02-22
12:03:17.000000000 +0100
+++ new/yast2-ycp-ui-bindings-2.16.41/src/Makefile.am 2008-03-12
19:38:54.000000000 +0100
@@ -83,7 +83,7 @@
-I$(includedir) \
-I$(includedir)/yui
-libpy2UI_la_LDFLAGS = -version-info 2:0 -Wl,--no-undefined
+libpy2UI_la_LDFLAGS = -L$(libdir) -version-info 2:0 -Wl,--no-undefined
libpy2UI_la_LIBADD = \
-lpthread -lyui -ly2 -lycp -lycpvalues -ly2util
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ycp-ui-bindings-2.16.39/src/YCPDialogParser.cc
new/yast2-ycp-ui-bindings-2.16.41/src/YCPDialogParser.cc
--- old/yast2-ycp-ui-bindings-2.16.39/src/YCPDialogParser.cc 2008-02-22
12:03:17.000000000 +0100
+++ new/yast2-ycp-ui-bindings-2.16.41/src/YCPDialogParser.cc 2008-04-03
15:43:04.000000000 +0200
@@ -1147,6 +1147,7 @@
* @arg string iconName (IconButton only)
* @arg string label
* @option default makes this button the dialogs default button
+ * @option helpButton automatically shows topmost `HelpText
* @usage `PushButton( `id( `click ), `opt( `default, `hstretch ), "Click
me" )
* @examples PushButton1.ycp PushButton2.ycp IconButton1.ycp
*
@@ -1170,6 +1171,15 @@
* Icons are (at the time of this writing) loaded from the <em>theme</em>
* directory, /usr/share/YaST2/theme/current.
*
+ * If a button has `opt(`helpButton) set, it is the official help button of
+ * this dialog. When activated, this will open a new dialog with the topmost
+ * help text in this dialog (the topmost widget that has a property `HelpText)
+ * in a pop-up dialog with a local event loop. Note that this is not done
+ * during UI::PollInput() to prevent the application from blocking as long as
+ * the help dialog is open.
+ *
+ * Since a help button is handled internally by the UI, UI::UserInput() and
+ * related will never return this button's ID.
**/
YWidget *
@@ -1180,6 +1190,7 @@
string label;
string iconName;
bool isDefaultButton = false;
+ bool isHelpButton = false;
if ( isIconButton )
{
@@ -1212,7 +1223,8 @@
{
string sym = optList->value(o)->asSymbol()->symbol();
- if ( sym == YUIOpt_default ) isDefaultButton = true;
+ if ( sym == YUIOpt_default ) isDefaultButton = true;
+ else if ( sym == YUIOpt_helpButton ) isHelpButton = true;
else logUnknownOption( term, optList->value(o) );
}
else logUnknownOption( term, optList->value(o) );
@@ -1223,6 +1235,9 @@
if ( isDefaultButton )
button->setDefaultButton();
+ if ( isHelpButton )
+ button->setHelpButton();
+
if ( isIconButton )
button->setIcon( iconName );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ycp-ui-bindings-2.16.39/src/YCP_UI.cc
new/yast2-ycp-ui-bindings-2.16.41/src/YCP_UI.cc
--- old/yast2-ycp-ui-bindings-2.16.39/src/YCP_UI.cc 2008-02-22
12:03:17.000000000 +0100
+++ new/yast2-ycp-ui-bindings-2.16.41/src/YCP_UI.cc 2008-04-03
15:04:41.000000000 +0200
@@ -537,12 +537,12 @@
{
if ( optList->value(o)->isSymbol() )
{
- if ( optList->value(o)->asSymbol()->symbol() ==
YUIOpt_mainDialog ) dialogType = YMainDialog;
- if ( optList->value(o)->asSymbol()->symbol() ==
YUIOpt_defaultsize ) dialogType = YMainDialog;
- else if ( optList->value(o)->asSymbol()->symbol() ==
YUIOpt_infocolor ) colorMode = YDialogInfoColor;
- else if ( optList->value(o)->asSymbol()->symbol() ==
YUIOpt_warncolor ) colorMode = YDialogWarnColor;
- else if ( optList->value(o)->asSymbol()->symbol() ==
YUIOpt_decorated ) {} // obsolete
- else if ( optList->value(o)->asSymbol()->symbol() ==
YUIOpt_centered ) {} // obsolete
+ if ( optList->value(o)->asSymbol()->symbol() ==
YUIOpt_mainDialog ) dialogType = YMainDialog;
+ if ( optList->value(o)->asSymbol()->symbol() ==
YUIOpt_defaultsize ) dialogType = YMainDialog;
+ else if ( optList->value(o)->asSymbol()->symbol() ==
YUIOpt_infocolor ) colorMode = YDialogInfoColor;
+ else if ( optList->value(o)->asSymbol()->symbol() ==
YUIOpt_warncolor ) colorMode = YDialogWarnColor;
+ else if ( optList->value(o)->asSymbol()->symbol() ==
YUIOpt_decorated ) {} // obsolete
+ else if ( optList->value(o)->asSymbol()->symbol() ==
YUIOpt_centered ) {} // obsolete
else
yuiWarning() << "Unknown option " << opts->value(o) <<
" for OpenDialog" << endl;
}
@@ -958,6 +958,42 @@
/**
+ * @builtin TextMode
+ * @short Check if the UI is running in text (NCurses) mode.
+ *
+ * @description
+ *
+ * This checks if a text mode UI (NCurses) is currently running.
+ * Please notice that this is almost always bad style. The purpose of the YaST2
+ * UI is to have an abstraction layer to avoid this kind of check.
+ *
+ * When you find yourself using this built-in, please check if there is really
+ * no other way. In particular, NEVER rely on this check to make any
+ * assumptions on the UI's capabilities. Rather, use the map entries from
+ * UI::GetDisplayInfo() or UI::HasSpecialWidget().
+ *
+ * If you feel you must make a difference between text mode and GUI mode for a
+ * dialog's layout, please check if that dialog is not simply overcrowded and
+ * thus should be redesigned - it is very likely that it is also overly
+ * complex.
+ *
+ * Also keep in mind that layout units are UI independent; a spacing should
+ * consume about the same amount of space in all UIs. A Qt UI 800x600 main
+ * window corresponds to 80x25 layout units, i.e. the typical NCurses terminal
+ * size.
+ *
+ * @return true if text mode, false if GUI (Qt / Gtk).
+ */
+
+YCPBoolean YCP_UI::TextMode()
+{
+ ycpwarning( "UI::TextMode(): Please check if this is really necessary!" );
+
+ return YCPBoolean( YUI::app()->isTextMode() );
+}
+
+
+/**
* @builtin RedrawScreen
* @short Redraws the screen
* @description
@@ -1040,7 +1076,7 @@
{
YMacro::record( filename->value () );
}
-
+
/**
@@ -1556,7 +1592,7 @@
if ( callbackComponent )
{
YCPValue ret = YCPNull();
-
+
if ( to_wfm ) // if it goes to WFM, just send the value
{
ret = callbackComponent->evaluate( term->value(0) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ycp-ui-bindings-2.16.39/src/YCP_UI.h
new/yast2-ycp-ui-bindings-2.16.41/src/YCP_UI.h
--- old/yast2-ycp-ui-bindings-2.16.39/src/YCP_UI.h 2008-02-22
12:03:17.000000000 +0100
+++ new/yast2-ycp-ui-bindings-2.16.41/src/YCP_UI.h 2008-03-26
16:36:47.000000000 +0100
@@ -84,6 +84,7 @@
static YCPValue WaitForEvent ( const YCPInteger &
timeout = YCPNull() );
static YCPValue WizardCommand ( const YCPTerm &
command );
static YCPValue PollInput ();
+ static YCPBoolean TextMode ();
/**
* Not really a UI built-in: This implements the WFM or SCR callback
command.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ycp-ui-bindings-2.16.39/src/YUINamespace.cc
new/yast2-ycp-ui-bindings-2.16.41/src/YUINamespace.cc
--- old/yast2-ycp-ui-bindings-2.16.39/src/YUINamespace.cc 2008-02-22
12:03:17.000000000 +0100
+++ new/yast2-ycp-ui-bindings-2.16.41/src/YUINamespace.cc 2008-03-26
16:59:55.000000000 +0100
@@ -584,6 +584,16 @@
}
+YCPBoolean
+YUINamespace::TextMode()
+{
+ if ( YUIComponent::ui() )
+ return YCP_UI::TextMode();
+ else
+ return YCPBoolean( false );
+}
+
+
YCPValue
YUINamespace::CallHandler( void * ptr, int argc, YCPValue argv[] )
{
@@ -618,7 +628,7 @@
, m_param4 ( YCPNull() )
, m_param5 ( YCPNull() )
{
-
+
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ycp-ui-bindings-2.16.39/src/YUINamespace.h
new/yast2-ycp-ui-bindings-2.16.41/src/YUINamespace.h
--- old/yast2-ycp-ui-bindings-2.16.39/src/YUINamespace.h 2008-03-06
14:54:35.000000000 +0100
+++ new/yast2-ycp-ui-bindings-2.16.41/src/YUINamespace.h 2008-03-26
17:06:42.000000000 +0100
@@ -85,7 +85,7 @@
vector<SymbolEntryPtr>::iterator candidates_e,
bool
play_macro_blocks );
- // attachParameter, appendParameter, reset from parent: fine
+ // attachParameter, appendParameter, reset from parent: fine
// wantedParameterType from parent: kind of fine
bool finishParameters();
@@ -96,9 +96,9 @@
{
private:
void registerFunctions();
-
+
vector<string> _registered_functions;
-
+
YUIComponent* m_comp;
public:
@@ -133,7 +133,7 @@
-
+
/* TYPEINFO: void (string) */
YCPValue SetLanguage( const YCPString & language );
@@ -280,7 +280,7 @@
YCPValue AskForExistingDirectory( const YCPString & startDir, const
YCPString & headline );
/* TYPEINFO: string (string, string, string) */
- YCPValue AskForExistingFile( const YCPString & startWith, const YCPString
& filter, const YCPString & headline );
+ YCPValue AskForExistingFile( const YCPString & startWith, const YCPString
& filter, const YCPString & headline );
/* TYPEINFO: string (string, string, string) */
YCPValue AskForSaveFileName( const YCPString & startWith, const YCPString
& filter, const YCPString & headline );
@@ -297,8 +297,11 @@
/* TYPEINFO: boolean (term) */
YCPValue WizardCommand( const YCPTerm & command );
+ /* TYPEINFO: boolean () */
+ YCPBoolean TextMode();
+
+
YCPValue
CallHandler( void * ptr, int argc, YCPValue argv[] );
-
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-ycp-ui-bindings-2.16.39/VERSION
new/yast2-ycp-ui-bindings-2.16.41/VERSION
--- old/yast2-ycp-ui-bindings-2.16.39/VERSION 2008-03-07 13:15:36.000000000
+0100
+++ new/yast2-ycp-ui-bindings-2.16.41/VERSION 2008-04-03 15:25:06.000000000
+0200
@@ -1 +1 @@
-2.16.39
+2.16.41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |