Hello community,
here is the log from the commit of package yast2-qt
checked in at Fri Feb 1 00:12:38 CET 2008.
--------
--- yast2-qt/yast2-qt.changes 2008-01-30 09:28:28.000000000 +0100
+++ yast2-qt/yast2-qt.changes 2008-01-31 16:45:36.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Jan 31 15:27:06 CET 2008 - sh@suse.de
+
+- Simplified dialog handling
+- V 2.16.20
+
+-------------------------------------------------------------------
Old:
----
yast2-qt-2.16.19.tar.bz2
New:
----
yast2-qt-2.16.20.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-qt.spec ++++++
--- /var/tmp/diff_new_pack.S19849/_old 2008-02-01 00:11:39.000000000 +0100
+++ /var/tmp/diff_new_pack.S19849/_new 2008-02-01 00:11:39.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-qt (Version 2.16.19)
+# spec file for package yast2-qt (Version 2.16.20)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,17 +10,17 @@
Name: yast2-qt
-Version: 2.16.19
-Release: 2
+Version: 2.16.20
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-qt-2.16.19.tar.bz2
+Source0: yast2-qt-2.16.20.tar.bz2
BuildRequires: docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel libqt4-devel libxcrypt-devel libxslt libzypp-devel perl-XML-Writer sgml-skel update-desktop-files
Summary: YaST2 - Graphical User Interface
BuildRequires: yast2-devtools >= 2.16.3
-BuildRequires: yast2-core-devel >= 2.16.24
-Requires: yast2-core >= 2.16.24
+BuildRequires: yast2-core-devel >= 2.16.25
+Requires: yast2-core >= 2.16.25
Requires: yast2_theme >= 2.16.1
Requires: libzypp >= 3.11.8
Provides: yast2_ui
@@ -78,6 +78,9 @@
%_libdir/YaST2/plugin/libpy2qt_pkg.so
%changelog
+* Thu Jan 31 2008 sh@suse.de
+- Simplified dialog handling
+- V 2.16.20
* Wed Jan 30 2008 coolo@suse.de
- recreate tar to fix build
* Tue Jan 29 2008 sh@suse.de
++++++ yast2-qt-2.16.19.tar.bz2 -> yast2-qt-2.16.20.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/src/CMakeLists.txt new/yast2-qt-2.16.20/src/CMakeLists.txt
--- old/yast2-qt-2.16.19/src/CMakeLists.txt 2008-01-30 09:28:25.000000000 +0100
+++ new/yast2-qt-2.16.20/src/CMakeLists.txt 2008-01-31 16:45:33.000000000 +0100
@@ -5,7 +5,7 @@
-DQT_LOCALEDIR=\\\"${CMAKE_INSTALL_PREFIX}/share/qt4/translations\\\"
-DICONDIR=\\"${Y2QT_ICONDIR}\\"
-DLOCALEDIR=\\\"${Y2QT_LOCALEDIR}\\\"
- -DLANG_FONTS_FILE=\\\"${CMAKE_INSTALL_PREFIX}/share/fonts/lang_fonts\\\"
+ -DLANG_FONTS_FILE=\\\"${CMAKE_INSTALL_PREFIX}/share/YaST2/data/lang_fonts\\\"
-DTHEMEDIR=\\\"${Y2QT_THEMEDIR}\\\"
-DQTLIBDIR=\\\"${LIB_INSTALL_DIR}\\\"
)
@@ -93,6 +93,8 @@
INSTALL(TARGETS py2qt LIBRARY DESTINATION ${YAST_PLUGIN_DIR} )
+INSTALL(FILES lang_fonts DESTINATION ${CMAKE_INSTALL_PREFIX}/share/YaST2/data )
+
ADD_SUBDIRECTORY(pkg)
#SET_TARGET_PROPERTIES( y2lang_qt PROPERTIES PREFIX "" )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/src/YQDialog.cc new/yast2-qt-2.16.20/src/YQDialog.cc
--- old/yast2-qt-2.16.19/src/YQDialog.cc 2008-01-30 09:28:25.000000000 +0100
+++ new/yast2-qt-2.16.20/src/YQDialog.cc 2008-01-31 16:45:34.000000000 +0100
@@ -118,6 +118,24 @@
}
+void
+YQDialog::openInternal()
+{
+ ensureOnlyOneDefaultButton();
+ QWidget::show();
+ QWidget::raise(); // FIXME: is this really necessary?
+ QWidget::update();
+}
+
+
+void
+YQDialog::activate()
+{
+ QWidget::raise();
+ QWidget::update();
+}
+
+
int
YQDialog::preferredWidth()
{
@@ -212,10 +230,12 @@
void
YQDialog::activate( bool active )
{
+#if 0
if ( active )
{
ensureOnlyOneDefaultButton();
}
+#endif
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/src/YQDialog.h new/yast2-qt-2.16.20/src/YQDialog.h
--- old/yast2-qt-2.16.19/src/YQDialog.h 2008-01-30 09:28:26.000000000 +0100
+++ new/yast2-qt-2.16.20/src/YQDialog.h 2008-01-31 16:45:35.000000000 +0100
@@ -203,8 +203,24 @@
**/
YQWizard * ensureOnlyOneDefaultButton( YWidgetListConstIterator begin,
YWidgetListConstIterator end );
+
+ /**
+ * Internal open() method, called exactly once during the life
+ * time of the dialog in open().
+ *
+ * Implemented from YDialog.
+ **/
+ virtual void openInternal();
/**
+ * Activate this dialog: Make sure that it is shown as the topmost dialog
+ * of this application and that it can receive input.
+ *
+ * Implemented from YDialog.
+ **/
+ virtual void activate();
+
+ /**
* Qt event handlers.
*
* All reimplemented from QWidget.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/src/YQUI_core.cc new/yast2-qt-2.16.20/src/YQUI_core.cc
--- old/yast2-qt-2.16.19/src/YQUI_core.cc 2008-01-30 09:28:25.000000000 +0100
+++ new/yast2-qt-2.16.20/src/YQUI_core.cc 2008-01-31 16:45:34.000000000 +0100
@@ -171,7 +171,7 @@
// Hide the main window for now. The first call to UI::OpenDialog() on an
- // `opt(`defaultSize) dialog will trigger a showDialog() call that shows
+ // `opt(`defaultSize) dialog will trigger a dialog->open() call that shows
// the main window - there is nothing to display yet.
_main_win->hide();
@@ -523,29 +523,6 @@
}
-#warning FIXME Move this to Y(Q)Dialog (and rename it to ::finalize()?)
-void YQUI::showDialog( YDialog * dialog )
-{
- QWidget * qw = (QWidget *) dialog->widgetRep();
-
- if ( qw )
- {
- qw->show();
- qw->raise();
- qw->update();
- }
-
- ( (YQDialog *) dialog)->ensureOnlyOneDefaultButton();
-
- //qApp->processEvents();
-}
-
-
-void YQUI::closeDialog( YDialog * dialog )
-{
-}
-
-
QString YQUI::productName() const
{
return fromUTF8( YUI::productName() );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/config/default.exp new/yast2-qt-2.16.20/testsuite/config/default.exp
--- old/yast2-qt-2.16.19/testsuite/config/default.exp 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/testsuite/config/default.exp 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-# default.exp -- empty
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/config/unix.exp new/yast2-qt-2.16.20/testsuite/config/unix.exp
--- old/yast2-qt-2.16.19/testsuite/config/unix.exp 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/testsuite/config/unix.exp 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-load_lib "y2qt_init.exp"
-
-proc y2qt_exit {} {}
-proc y2qt_version {} {}
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/config/unknown.exp new/yast2-qt-2.16.20/testsuite/config/unknown.exp
--- old/yast2-qt-2.16.19/testsuite/config/unknown.exp 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/testsuite/config/unknown.exp 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-perror "No setup for current configuration"
-exit 1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/lib/y2qt.exp new/yast2-qt-2.16.20/testsuite/lib/y2qt.exp
--- old/yast2-qt-2.16.19/testsuite/lib/y2qt.exp 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/testsuite/lib/y2qt.exp 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-# qt.exp -- empty
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/lib/y2qt_init.exp new/yast2-qt-2.16.20/testsuite/lib/y2qt_init.exp
--- old/yast2-qt-2.16.19/testsuite/lib/y2qt_init.exp 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/testsuite/lib/y2qt_init.exp 1970-01-01 01:00:00.000000000 +0100
@@ -1,54 +0,0 @@
-#
-# run a ui file with y2qt
-#
-proc y2qt-run { src } {
-
- set path [split $src "/"]
- set filename [lindex $path [expr [llength $path]-1]]
-
- # extract basename and check extension
-
- set fname [split $filename "."]
-
- if {[llength $fname] < 2} {
- fail "Bad filename syntax '$src'"
- return
- }
- if {[lindex $fname [expr [llength $fname]-1]] != "ui"} {
- fail "Not .ui extension '$src'"
- return
- }
-
- # setup filenames
-
- set base_name [lindex $fname 0]
-
- set stdout_name "tests/$base_name.out"
- set tmpout_name "tmp.out.$base_name"
- set tmperr_name "tmp.err.$base_name"
-
- # due to a change of _debug() the stderr will be redirected to a log
- # set stderr_name "tests/$base_name.err"
-
- # run the test for qt
-
- set result [exec "runqt" "$src" "-l" "$tmperr_name" ">" "$tmpout_name"]
-
- # check return code
-
- if {$result != ""} {
- warning "Compilation of $base_name results in '$result'"
- }
-
- # check stdout
-
- if {[diff $stdout_name $tmpout_name] != 1} {
- fail "Wrong stdout for $base_name"
- }
-
- # check stderr -- no longer needed ?!
-
- # ok, all is fine
-
- pass $base_name
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/README new/yast2-qt-2.16.20/testsuite/README
--- old/yast2-qt-2.16.19/testsuite/README 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/testsuite/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-Qt testsuite
-
-The Qt testsuite test the y2qt component by running all
-.ui files in the qt.test directory (qt.test/*.ui) through
-runqt.
-
-Every run results in a stdout and stderr output which is
-checked agains .out and .err respectively.
-
-The file lib/qt.exp defines a function which runs all tests
-contained in qt.test (i.e. makes a 'glob' on qt.test/*.ui)
-
-For every .ui file you put in tests, you must create the proper
-.out and .err file with the following command
-
-runqt file.ui > file.out 2> file.err
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/runqt.cc new/yast2-qt-2.16.20/testsuite/runqt.cc
--- old/yast2-qt-2.16.19/testsuite/runqt.cc 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/testsuite/runqt.cc 1970-01-01 01:00:00.000000000 +0100
@@ -1,104 +0,0 @@
-/*---------------------------------------------------------------------\
-| |
-| __ __ ____ _____ ____ |
-| \ \ / /_ _/ ___|_ _|___ \ |
-| \ V / _` \___ \ | | __) | |
-| | | (_| |___) || | / __/ |
-| |_|\__,_|____/ |_| |_____| |
-| |
-| core system |
-| (C) SuSE GmbH |
-\----------------------------------------------------------------------/
-
- File: runqt.cc
-
- Author: Klaus Kaempf (kkaempf@suse.de)
- Maintainer: Klaus Kaempf (kkaempf@suse.de)
-
-/-*/
-
-#include
-
-#include "YUIQt.h"
-
-#include
-#include
-#include
-
-extern int yydebug;
-
-int
-main (int argc, char *argv[])
-{
- const char *fname = 0;
- FILE *infile = stdin;
-
- if (argc > 1) {
- int argp = 1;
- while (argp < argc) {
- if ((argv[argp][0] == '-')
- && (argv[argp][1] == 'l')
- && (argp+1 < argc)) {
- argp++;
- set_log_filename (argv[argp]);
- }
- else if (fname == 0) {
- fname = argv[argp];
- } else {
- fprintf (stderr, "Bad argument '%s'\nUsage: runqt [ name.ycp ]\n", argv[argp]);
- }
- argp++;
- }
- }
-
- YCPParser *parser;
- parser = new YCPParser ();
-
- if (!parser) {
- fprintf (stderr, "Failed to create YCPParser\n");
- return 1;
- }
-
- YUIInterpreter *interpreter;
- interpreter = new YUIQt (argc, argv, true, NULL);
-
- if (!interpreter) {
- fprintf (stderr, "Failed to create YUIQt\n");
- delete parser;
- return 1;
- }
-
- if (fname != 0) {
- infile = fopen (fname, "r");
- if (infile == 0) {
- fprintf (stderr, "Failed to open '%s'\n", fname);
- return 1;
- }
- }
- else {
- fname = "stdin";
- }
-
- parser->setInput (infile, fname);
- parser->setBuffered();
-
- YCPValue value = YCPVoid();
-
- for (;;) {
- value = parser->parse();
- if (value.isNull())
- break;
-
- value = interpreter->evaluate(value);
-
- printf ("(%s)\n", value->toString().c_str());
- }
-
- delete interpreter;
- delete parser;
-
- if (infile != stdin)
- fclose (infile);
-
- return 0;
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/aaa.out new/yast2-qt-2.16.20/testsuite/tests/aaa.out
--- old/yast2-qt-2.16.19/testsuite/tests/aaa.out 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/testsuite/tests/aaa.out 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-(`stdio())
-("After building the test environment new:all make clean, make -f Makefile.cvs, configure --prefix=/,make and make install as root.... there is more information on stderr ...It's a libtool feature :-) When you make a program a script will beinstalled in the source directory which will do the final linkingjust before you run it. (Just do more ui/Qt/qt to see what I mean)\nThe messages are warnings issued by the linker(for some reason these warnings are enabled within SuSE linux). Whenyou run the program a second time, the program is already linked so youwon't get the warnings any more.\nYou can get rid of the warnings by removing the \"-warn-common\" outof your egcs specfile. No idea why it is in there in the first place.")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/aaa.ui new/yast2-qt-2.16.20/testsuite/tests/aaa.ui
--- old/yast2-qt-2.16.19/testsuite/tests/aaa.ui 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/testsuite/tests/aaa.ui 1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-
-# ---------------------------------------------------------
-#
-# Filename: aaa.ui
-#
-# Purpose: dummy test case for ui test
-#
-# Creator: jd@suse.de
-#
-# Maintainer: jd@suse.de
-#
-# Remarks: there is more information on stderr
-#
-# ---------------------------------------------------------
-
-{
- return( "After building the test environment new:" +
- "all make clean, make -f Makefile.cvs, configure --prefix=/," +
- "make and make install as root." +
- "... there is more information on stderr ..." +
-
- "It's a libtool feature :-) When you make a program a script will be" +
- "installed in the source directory which will do the final linking" +
- "just before you run it. (Just do more ui/Qt/qt to see what I mean)\n" +
-
- "The messages are warnings issued by the linker" +
- "(for some reason these warnings are enabled within SuSE linux). When" +
- "you run the program a second time, the program is already linked so you" +
- "won't get the warnings any more.\n" +
-
- "You can get rid of the warnings by removing the \"-warn-common\" out" +
- "of your egcs specfile. No idea why it is in there in the first place." );
-}
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/Label1.ui new/yast2-qt-2.16.20/testsuite/tests/Label1.ui
--- old/yast2-qt-2.16.19/testsuite/tests/Label1.ui 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/testsuite/tests/Label1.ui 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-{
- OpenDialog(
- `VBox(
- `Label("Hello, World!"),
- `PushButton("&OK")
- )
- );
- UserInput();
- CloseDialog();
- return 0;
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/mkdata.sh new/yast2-qt-2.16.20/testsuite/tests/mkdata.sh
--- old/yast2-qt-2.16.19/testsuite/tests/mkdata.sh 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/testsuite/tests/mkdata.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-#!/bin/bash
-# mkdata make test data
-#
-../../y2ui < $1.ui > $1.out 2> $1.err
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/ru1.out new/yast2-qt-2.16.20/testsuite/tests/ru1.out
--- old/yast2-qt-2.16.19/testsuite/tests/ru1.out 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/testsuite/tests/ru1.out 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-(`stdio())
-("If you get a warning next, something likeWARNING: No font available with requested character set! #1please have a look at the installed fonts.At the moment variable fonts are not installed")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/ru1.ui new/yast2-qt-2.16.20/testsuite/tests/ru1.ui
--- old/yast2-qt-2.16.19/testsuite/tests/ru1.ui 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/testsuite/tests/ru1.ui 1970-01-01 01:00:00.000000000 +0100
@@ -1,102 +0,0 @@
-
-# ---------------------------------------------------------
-#
-# Filename: Ru1.ui
-#
-# Purpose: test cases for ui test
-#
-# Creator: jd@suse.de
-#
-# Maintainer: jd@suse.de
-#
-# Remarks: Always the user interaction is removed:
-# any answer = UserInput();
-# Furthermore the tested action is set into a loop
-#
-# ---------------------------------------------------------
-
-{
- SetCharset("ISO 8859-5");
- any ok = `HBox(`Stretch(), `Pushbutton(`Id("ok"), "OK"), `Stretch());
- any vbox = `VBox(
-
-// Main.cpp:112
- `Label ("Copying system config file."),
- `Label ( "Копирование Системной Конфугурации"),
-
-// Main.cpp:231 Main.cpp:250 MenuAction.cpp:364 MenuAction.cpp:386 MenuAction.cpp:878
- `Label ("DISMISS"),
- `Label ( "ПРОДОЛЖИТЬ"),
-
-// Main.cpp:235 MenuAction.cpp:371
- `Label ("Yudit: information"),
- `Label ( "Yudit: информация"),
-
-// Main.cpp:254
- `Label ("Yudit: error"),
- `Label ( "Yudit: ошибка"),
-
-// MainWidget.cpp:208
- `Label ("File"),
- `Label ( "Файл"),
-
-// MainWidget.cpp:210
- `Label ("Open..."),
- `Label ( "Открыть..."),
-
-// MainWidget.cpp:212
- `Label ("Append..."),
- `Label ( "Добавить..."),
-
-// MainWidget.cpp:214
- `Label ("Re-Load"),
- `Label ( "Перезагрузить"),
-
-// MainWidget.cpp:216
- `Label ("New Window"),
- `Label ( "Новое Окно"),
-
-// MainWidget.cpp:219
- `Label ("Save"),
- `Label ( "Записать"),
-
-// MainWidget.cpp:221
- `Label ("Save As..."),
- `Label ( "Записать В Файл..."),
-
-// MainWidget.cpp:224 MainWidget.cpp:317
- `Label ("Config"),
- `Label ( "Конфигурация"),
-
-// MainWidget.cpp:226
- `Label ("Print..."),
- `Label ( "Печать..."),
-
-// MainWidget.cpp:229
- `Label ("Close"),
- `Label ( "Закрыть"),
-
-// MainWidget.cpp:231
- `Label ("Exit All"),
- `Label ( "Конец Работы"),
- ok
- );
-
- integer loop = 0;
- while( loop < 10 )
- {
- ShowDialog( Dialog( vbox ));
- any CurrentMap = QueryDialog( );
- CloseDialog();
-
- if( ( is( CurrentMap, map ) == false ) ||
- ( size( CurrentMap ) != 0 ) ) return false;
-
- loop = loop + 1;
- }
- return( "If you get a warning next, something like" +
- "WARNING: No font available with requested character set! #1" +
- "please have a look at the installed fonts." +
- "At the moment variable fonts are not installed" );
-}
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/stretch2.out new/yast2-qt-2.16.20/testsuite/tests/stretch2.out
--- old/yast2-qt-2.16.19/testsuite/tests/stretch2.out 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/testsuite/tests/stretch2.out 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-(`stdio())
-(true)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/stretch2.ui new/yast2-qt-2.16.20/testsuite/tests/stretch2.ui
--- old/yast2-qt-2.16.19/testsuite/tests/stretch2.ui 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/testsuite/tests/stretch2.ui 1970-01-01 01:00:00.000000000 +0100
@@ -1,44 +0,0 @@
-
-# ---------------------------------------------------------
-#
-# Filename: Stretch2.ui
-#
-# Purpose: test cases for UI test
-#
-# Creator: jd@suse.de
-#
-# Maintainer: jd@suse.de
-#
-# ---------------------------------------------------------
-
-
-// Example 2 for Stretch
-//
-// Syntax: Stretch()
-//
-
-
-{
- any ok = `HBox(`Stretch(), `Pushbutton(`Id("ok"), "OK"), `Stretch());
-
- integer loop = 0;
- while( loop < 100 )
- {
- ShowDialog(
- Dialog(`VBox(
- `Stretch(),
- `Label("Some text goes here"),
- `Stretch(),
- `Label("This is some more text"),
- ok
- )));
- any CurrentMap = QueryDialog( );
- CloseDialog();
-
- if( ( is( CurrentMap, map ) == false ) || ( size( CurrentMap ) != 0 )) return( false );
-
- loop = loop + 1;
- }
-
- return true;
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/textentry3.out new/yast2-qt-2.16.20/testsuite/tests/textentry3.out
--- old/yast2-qt-2.16.19/testsuite/tests/textentry3.out 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/testsuite/tests/textentry3.out 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-(`stdio())
-(true)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/textentry3.ui new/yast2-qt-2.16.20/testsuite/tests/textentry3.ui
--- old/yast2-qt-2.16.19/testsuite/tests/textentry3.ui 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/testsuite/tests/textentry3.ui 1970-01-01 01:00:00.000000000 +0100
@@ -1,66 +0,0 @@
-
-# ---------------------------------------------------------
-#
-# Filename: Textentry3.ui
-#
-# Purpose: test cases for ui test
-#
-# Creator: jd@suse.de
-#
-# Maintainer: jd@suse.de
-#
-# Remarks: Always the user interaction is removed:
-# any answer = UserInput();
-# Furthermore the tested action is set into a loop
-#
-# ---------------------------------------------------------
-
-// Example 3 for Textentry
-//
-// Syntax: Textentry( Id id, UTF8 label ,UTF8 defaultText [, int maxLength, [int fieldSize]] )
-//
-
-{
- any ok = `HBox(`Stretch(), `Pushbutton(`Id("ok"), "OK"), `Stretch());
- any dialog = Dialog( `VBox(
- `Textentry(`Id("text"), "&Please enter your name:", "Helmut"),
- ok
- ));
-
- any CurrentMap = $[];
- integer loop = 0;
- while( loop < 100 )
- {
- any dialog = Dialog( `VBox(
- `Textentry(`Id("text"), "&Please enter your name:", "Helmut"),
- ok
- ));
-
- ChangeWidget( dialog, `Id("text"), "Hans-Diether" );
- ShowDialog();
- CurrentMap = QueryDialog( dialog );
- CloseDialog();
-
- if( ( is( CurrentMap, map ) == false ) ||
- ( size( CurrentMap ) != 1 ) ||
- ( select( CurrentMap, 0 ) != [ `Id("text"), "Hans-Diether" ] ) ) return false;
-
- dialog = Dialog( `VBox(
- `Textentry(`Id("text"), "&Please enter your name:", "Helmut"),
- ok
- ));
-
- ChangeWidget( dialog, `Id("text"), "Helmut" );
- ShowDialog();
- CurrentMap = QueryDialog( dialog );
- CloseDialog();
-
- if( ( is( CurrentMap, map ) == false ) ||
- ( size( CurrentMap ) != 1 ) ||
- ( select( CurrentMap, 0 ) != [ `Id("text"), "Helmut" ] ) ) return false;
-
- loop = loop + 1;
- }
-
- return true;
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/thread002.out new/yast2-qt-2.16.20/testsuite/tests/thread002.out
--- old/yast2-qt-2.16.19/testsuite/tests/thread002.out 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/testsuite/tests/thread002.out 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-(`stdio())
-(true)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/thread002.ui new/yast2-qt-2.16.20/testsuite/tests/thread002.ui
--- old/yast2-qt-2.16.19/testsuite/tests/thread002.ui 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/testsuite/tests/thread002.ui 1970-01-01 01:00:00.000000000 +0100
@@ -1,63 +0,0 @@
-
-# ---------------------------------------------------------
-#
-# Filename: threadXXX.ui
-#
-# Purpose: test cases for ui test
-#
-# Creator: jd@suse.de
-#
-# Maintainer: jd@suse.de
-#
-# Remarks: Always the user interaction is removed:
-# any answer = UserInput();
-# Furthermore the tested action is set into a loop
-#
-# ---------------------------------------------------------
-
-
-// Example1 for threads, former vbox1
-//
-// Syntax: VBox( [Id id, ] widget1, widget2, ... )
-//
-
-{
-
- define Check( )
- `` {
- return( ( is( CurrentMap, map ) == true ) &&
- ( size( CurrentMap ) == 4 ) &&
- ( select( CurrentMap, 0 ) == [`Id("cb1"), false] ) &&
- ( select( CurrentMap, 1 ) == [`Id("cb2"), false] ) &&
- ( select( CurrentMap, 2 ) == [`Id("cb3"), false] ) &&
- ( select( CurrentMap, 3 ) == [`Id("cb4"), false] ) );
- };
-
- if( true )
- {
- any ok = `HBox(`Stretch(), `Pushbutton(`Id("ok"), "OK"), `Stretch());
-
- integer loop = 0;
- while( loop < 10 )
- {
- any dialog = Dialog( `VBox(
- `VBox(
- `Checkbox(`Id("cb1"), "Option1"),
- `Checkbox(`Id("cb2"), "Option2"),
- `Checkbox(`Id("cb3"), "Option3"),
- `Checkbox(`Id("cb4"), "Option4")
- ),
- ok
- ));
-
- ShowDialog( );
- any CurrentMap = QueryDialog( dialog );
- CloseDialog( );
- if( Check() == false ) return false;
-
- loop = loop + 1;
- }
- }
- return( true );
-}
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/vbox1.out new/yast2-qt-2.16.20/testsuite/tests/vbox1.out
--- old/yast2-qt-2.16.19/testsuite/tests/vbox1.out 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/testsuite/tests/vbox1.out 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-(`stdio())
-(true)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/vbox1.ui new/yast2-qt-2.16.20/testsuite/tests/vbox1.ui
--- old/yast2-qt-2.16.19/testsuite/tests/vbox1.ui 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/testsuite/tests/vbox1.ui 1970-01-01 01:00:00.000000000 +0100
@@ -1,133 +0,0 @@
-
-# ---------------------------------------------------------
-#
-# Filename: Vbox1.ui
-#
-# Purpose: test cases for ui test
-#
-# Creator: jd@suse.de
-#
-# Maintainer: jd@suse.de
-#
-# Remarks: Always the user interaction is removed:
-# any answer = UserInput();
-# Furthermore the tested action is set into a loop
-#
-# ---------------------------------------------------------
-
-
-// Example1 for VBox
-//
-// Syntax: VBox( [Id id, ] widget1, widget2, ... )
-//
-// A VBox is used to give the UI a hint about how to
-// organize the dialog. All widgets listed inside the VBox
-// are laid out from top to bottom.
-//
-// A VBox can have an Id. This Id will be added as a prefix
-// to all widget Ids within the VBox.
-//
-// This example shows a VBox which organizes 4 checkboxes
-// above each other.
-//
-
-
-{
-
- define Check( boolean CheckBoxTwoState )
- ``{
- return( ( is( CurrentMap, map ) == true ) &&
- ( size( CurrentMap ) == 4 ) &&
- ( select( CurrentMap, 0 ) == [`Id("cb1"), false] ) &&
- ( select( CurrentMap, 1 ) == [`Id("cb2"), CheckBoxTwoState] ) &&
- ( select( CurrentMap, 2 ) == [`Id("cb3"), false] ) &&
- ( select( CurrentMap, 3 ) == [`Id("cb4"), false] ) );
- };
-
-
-// the display function ShowDialog() is called without parameters
- if( true )
- {
- any ok = `HBox(`Stretch(), `Pushbutton(`Id("ok"), "OK"), `Stretch());
-
- integer loop = 0;
- while( loop < 100 )
- {
- any dialog = OpenDialog( `VBox(
- `VBox(
- `Checkbox(`Id("cb1"), "Option1"),
- `Checkbox(`Id("cb2"), "Option2"),
- `Checkbox(`Id("cb3"), "Option3"),
- `Checkbox(`Id("cb4"), "Option4")
- ),
- ok
- ));
-
- ShowDialog( );
- any CurrentMap = QueryDialog( dialog );
- CloseDialog( );
-
- if( Check( false ) == false ) return false;
-
- loop = loop + 1;
- }
- }
-
-// the display function ShowDialog() is called with the dialog parameter
- if( true )
- {
- any ok = `HBox(`Stretch(), `Pushbutton(`Id("ok"), "OK"), `Stretch());
-
- integer loop = 0;
- while( loop < 100 )
- {
- any dialog = Dialog( `VBox(
- `VBox(
- `Checkbox(`Id("cb1"), "Option1"),
- `Checkbox(`Id("cb2"), "Option2"),
- `Checkbox(`Id("cb3"), "Option3"),
- `Checkbox(`Id("cb4"), "Option4")
- ),
- ok
- ));
-
- ShowDialog( dialog );
- any CurrentMap = QueryDialog( dialog );
- CloseDialog( dialog );
-
- if( Check( false ) == false ) return false;
-
- loop = loop + 1;
- }
- }
-
-// the display function ShowDialog() is called with the dialog itself
- if( true )
- {
- any ok = `HBox(`Stretch(), `Pushbutton(`Id("ok"), "OK"), `Stretch());
-
- integer loop = 0;
- while( loop < 100 )
- {
- ShowDialog(
- Dialog( `VBox(
- `VBox(
- `Checkbox(`Id("cb1"), "Option1"),
- `Checkbox(`Id("cb2"), "Option2", true),
- `Checkbox(`Id("cb3"), "Option3"),
- `Checkbox(`Id("cb4"), "Option4", false)
- ),
- ok
- )));
- any CurrentMap = QueryDialog( );
- CloseDialog( );
-
- if( Check( true ) == false ) return false;
-
- loop = loop + 1;
- }
- }
-
- return true;
-}
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/vbox2.out new/yast2-qt-2.16.20/testsuite/tests/vbox2.out
--- old/yast2-qt-2.16.19/testsuite/tests/vbox2.out 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/testsuite/tests/vbox2.out 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-(`stdio())
-(true)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/vbox2.ui new/yast2-qt-2.16.20/testsuite/tests/vbox2.ui
--- old/yast2-qt-2.16.19/testsuite/tests/vbox2.ui 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/testsuite/tests/vbox2.ui 1970-01-01 01:00:00.000000000 +0100
@@ -1,81 +0,0 @@
-
-# ---------------------------------------------------------
-#
-# Filename: Vbox2.ui
-#
-# Purpose: test cases for ui test
-#
-# Creator: jd@suse.de
-#
-# Maintainer: jd@suse.de
-#
-# Remarks: Always the user interaction is removed:
-# any answer = UserInput();
-# Furthermore the tested action is set into a loop
-#
-# ---------------------------------------------------------
-
-// Example 2 for VBox
-//
-// Syntax: VBox( [Id id, ] widget1, widget2, ... )
-//
-// A VBox is used to give the UI a hint about how to
-// organize the dialog. All widgets listed inside the VBox
-// are laid out from top to bottom.
-//
-// A VBox can have an Id. This Id will be added as a prefix
-// to all widget Ids within the VBox.
-//
-// This example shows two VBox'es. The first VBox has an Id
-// set. The Id's of the checkboxes in this VBox will be
-// prefixed with the Id of the VBox.
-//
-
-
-{
- define Check( )
- `` {
- return( ( ( is( CurrentMap, map ) == true ) &&
- ( size( CurrentMap ) == 5 ) &&
- ( select( CurrentMap, 0 ) == [`Id("vb", "cb1", "cb2", "cb3", "cb4"), false] ) &&
- ( select( CurrentMap, 1 ) == [`Id("cb1"), false] ) &&
- ( select( CurrentMap, 2 ) == [`Id("cb2"), false] ) &&
- ( select( CurrentMap, 3 ) == [`Id("cb3"), false] ) &&
- ( select( CurrentMap, 4 ) == [`Id("cb4"), false] )));
- };
-
-
- any ok = `HBox(`Stretch(), `Pushbutton(`Id("ok"), "OK"), `Stretch());
-
- boolean CheckState = true;
- integer loop = 0;
- while( loop < 100 )
- {
- any dialog = Dialog( `VBox(
- `VBox( `Id("vb"),
- `Checkbox(`Id("cb1"), "Option1"),
- `Checkbox(`Id("cb2"), "Option2"),
- `Checkbox(`Id("cb3"), "Option3"),
- `Checkbox(`Id("cb4"), "Option4")
- ),
- `VBox(
- `Checkbox(`Id("cb1"), "Option1"),
- `Checkbox(`Id("cb2"), "Option2"),
- `Checkbox(`Id("cb3"), "Option3"),
- `Checkbox(`Id("cb4"), "Option4")
- ),
- ok
- ));
-
- ShowDialog();
- any CurrentMap = QueryDialog( dialog );
- CloseDialog( dialog );
-
- CheckState = Check( );
- if( CheckState == false ) return CheckState;
-
- loop = loop + 1;
- }
-
- return CheckState;
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/y2qt.cc new/yast2-qt-2.16.20/testsuite/y2qt.cc
--- old/yast2-qt-2.16.19/testsuite/y2qt.cc 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/testsuite/y2qt.cc 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-/* it's all in liby2/src/genericfrontend.cc */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/y2qt.test/y2qt.exp new/yast2-qt-2.16.20/testsuite/y2qt.test/y2qt.exp
--- old/yast2-qt-2.16.19/testsuite/y2qt.test/y2qt.exp 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/testsuite/y2qt.test/y2qt.exp 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-#
-# y2qt.exp
-# 'main' file for all ui tests
-#
-
-# get all files matching tests/*.ui
-
-set filenames [glob $srcdir/tests/*.ui]
-
-# foreach file, call ui-run (from testsuite/lib)
-
-foreach file $filenames { y2qt-run $file }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/VERSION.cmake new/yast2-qt-2.16.20/VERSION.cmake
--- old/yast2-qt-2.16.19/VERSION.cmake 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/VERSION.cmake 2008-01-31 16:45:33.000000000 +0100
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "2")
SET(VERSION_MINOR "16")
-SET(VERSION_PATCH "19")
+SET(VERSION_PATCH "20")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/yast2-qt.spec.in new/yast2-qt-2.16.20/yast2-qt.spec.in
--- old/yast2-qt-2.16.19/yast2-qt.spec.in 2008-01-30 09:28:24.000000000 +0100
+++ new/yast2-qt-2.16.20/yast2-qt.spec.in 2008-01-31 16:45:33.000000000 +0100
@@ -6,8 +6,8 @@
Summary: -
BuildRequires: yast2-devtools >= 2.16.3
-BuildRequires: yast2-core-devel >= 2.16.24
-Requires: yast2-core >= 2.16.24
+BuildRequires: yast2-core-devel >= 2.16.25
+Requires: yast2-core >= 2.16.25
Requires: yast2_theme >= 2.16.1
Requires: libzypp >= 3.11.8
Provides: yast2_ui
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org