Hello community,
here is the log from the commit of package yast2-installation
checked in at Mon Sep 4 17:58:24 CEST 2006.
--------
--- yast2-installation/yast2-installation.changes 2006-08-23 17:16:46.000000000 +0200
+++ yast2-installation/yast2-installation.changes 2006-09-04 16:03:02.000000000 +0200
@@ -1,0 +2,18 @@
+Mon Sep 4 15:59:47 CEST 2006 - locilka@suse.cz
+
+- Running Installation in Wizard Window (#203510).
+- Needed binaries in inst-sys: xquery and fvwm-root.
+- Initially, a plain colored image is used as a background.
+- 2.13.148
+
+-------------------------------------------------------------------
+Mon Sep 4 15:49:40 CEST 2006 - ms@suse.de
+
+- fixed -fp setup of Xvnc (#203531)
+
+-------------------------------------------------------------------
+Fri Sep 1 08:48:50 CEST 2006 - locilka@suse.cz
+
+- Fixed Installation Mode dialog to redraw itself only when needed.
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.13.147.tar.bz2
New:
----
yast2-installation-2.13.148.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.FbmKYc/_old 2006-09-04 17:58:02.000000000 +0200
+++ /var/tmp/diff_new_pack.FbmKYc/_new 2006-09-04 17:58:02.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.13.147)
+# spec file for package yast2-installation (Version 2.13.148)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-installation
-Version: 2.13.147
+Version: 2.13.148
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.13.147.tar.bz2
+Source0: yast2-installation-2.13.148.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-firewall yast2-slp yast2-testsuite
# remove yast2-slp and yast2-firewall once SourceManager is moved back to yast2-packager
@@ -60,7 +60,7 @@
Jiri Srain
%prep
-%setup -n yast2-installation-2.13.147
+%setup -n yast2-installation-2.13.148
%build
%{prefix}/bin/y2tool y2autoconf
@@ -132,6 +132,15 @@
%endif
%changelog -n yast2-installation
+* Mon Sep 04 2006 - locilka@suse.cz
+- Running Installation in Wizard Window (#203510).
+- Needed binaries in inst-sys: xquery and fvwm-root.
+- Initially, a plain colored image is used as a background.
+- 2.13.148
+* Mon Sep 04 2006 - ms@suse.de
+- fixed -fp setup of Xvnc (#203531)
+* Fri Sep 01 2006 - locilka@suse.cz
+- Fixed Installation Mode dialog to redraw itself only when needed.
* Wed Aug 23 2006 - locilka@suse.cz
- Added a new debugger tool scr_switch_debugger.ycp that is called
when switching to the installed system in switch_scr_finish.ycp
++++++ yast2-installation-2.13.147.tar.bz2 -> yast2-installation-2.13.148.tar.bz2 ++++++
++++ 2391 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-installation-2.13.147/VERSION new/yast2-installation-2.13.148/VERSION
--- old/yast2-installation-2.13.147/VERSION 2006-08-23 17:17:14.000000000 +0200
+++ new/yast2-installation-2.13.148/VERSION 2006-09-04 16:01:07.000000000 +0200
@@ -1 +1 @@
-2.13.147
+2.13.148
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-installation-2.13.147/configure.in new/yast2-installation-2.13.148/configure.in
--- old/yast2-installation-2.13.147/configure.in 2006-08-23 17:18:05.000000000 +0200
+++ new/yast2-installation-2.13.148/configure.in 2006-09-04 16:03:51.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.13.147, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.13.148, http://bugs.opensuse.org/, yast2-installation)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.147"
+VERSION="2.13.148"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
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-installation-2.13.147/src/clients/inst_system_analysis.ycp new/yast2-installation-2.13.148/src/clients/inst_system_analysis.ycp
--- old/yast2-installation-2.13.147/src/clients/inst_system_analysis.ycp 2006-08-22 14:29:51.000000000 +0200
+++ new/yast2-installation-2.13.148/src/clients/inst_system_analysis.ycp 2006-09-01 08:49:40.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Installation mode selection, system analysis
* Authors: Jiri Srain
*
- * $Id: inst_system_analysis.ycp 32485 2006-08-22 12:31:26Z locilka $
+ * $Id: inst_system_analysis.ycp 32658 2006-09-01 06:51:15Z locilka $
*
*/
@@ -244,7 +244,10 @@
if (Mode::autoinst ())
return `auto;
-Wizard::SetContents (_("Installation Mode"), InstModeDialogContent(`install), help_text, true, true);
+Wizard::SetContents (
+ // dialog caption
+ _("Installation Mode"), InstModeDialogContent(`install), help_text, true, true
+);
Wizard::SetTitleIcon ("yast-inst-mode");
symbol ret = nil;
@@ -270,6 +273,7 @@
symbol current_expert_mode = `boot;
repeat {
ret = (symbol) UI::UserInput();
+ y2milestone("ret: %1", ret);
// Use-Add-On-Product status changed
if (ret == `add_on) {
@@ -293,7 +297,10 @@
add_on_selected = (boolean) UI::QueryWidget (`id (`add_on), `Value);
// Show other options
- Wizard::SetContents (_("Installation Mode"), InstModeDialogContent(`expert), help_text, true, true);
+ Wizard::SetContents (
+ // dialog caption
+ _("Installation Mode"), InstModeDialogContent(`expert), help_text, true, true
+ );
UI::ChangeWidget (`id(`add_on), `Value, false);
UI::ChangeWidget (`id(`add_on), `Enabled, false);
@@ -302,16 +309,20 @@
continue;
}
// Adjusting current UI - Hide Other Options
- else {
+ // in case of `install or `update clicked
+ else if (contains([`install, `update], ret)) {
symbol selected_mode = (symbol) UI::QueryWidget (`id (`inst_mode), `CurrentButton);
// Hide other options
- Wizard::SetContents (_("Installation Mode"), InstModeDialogContent(`install), help_text, true, true);
+ Wizard::SetContents (
+ // dialog caption
+ _("Installation Mode"), InstModeDialogContent(`install), help_text, true, true
+ );
// Enabling add-on, adjusting previous state (selected)
UI::ChangeWidget (`id(`add_on), `Enabled, true);
UI::ChangeWidget (`id(`add_on), `Value, add_on_selected);
- // Can be ither `install or `update
+ // Can be either `install or `update
UI::ChangeWidget (`id(`inst_mode), `CurrentButton, selected_mode);
}
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-installation-2.13.147/startup/Makefile.am new/yast2-installation-2.13.148/startup/Makefile.am
--- old/yast2-installation-2.13.147/startup/Makefile.am 2006-06-26 09:11:01.000000000 +0200
+++ new/yast2-installation-2.13.148/startup/Makefile.am 2006-09-04 16:02:04.000000000 +0200
@@ -9,7 +9,8 @@
YaST2.Second-Stage \
YaST2.call \
YaST2.ssh \
- requires
+ requires \
+ bkg.png
EXTRA_DIST = $(ystartupbin_SCRIPTS)
SUBDIRS = First-Stage Second-Stage arch common hooks
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-installation-2.13.147/startup/YaST2.call new/yast2-installation-2.13.148/startup/YaST2.call
--- old/yast2-installation-2.13.147/startup/YaST2.call 2006-08-09 12:31:07.000000000 +0200
+++ new/yast2-installation-2.13.148/startup/YaST2.call 2006-09-04 16:03:40.000000000 +0200
@@ -21,7 +21,7 @@
# : - VNC Installation via browser
# :
# :
-# STATUS : $Id: YaST2.call 32171 2006-08-04 14:35:07Z jsrain $
+# STATUS : $Id: YaST2.call 32688 2006-09-04 14:05:17Z locilka $
#----------------
#
#set -x
@@ -97,6 +97,66 @@
done
}
+#----[ count_qt_geometry ]----#
+function count_qt_geometry () {
+ # current X-resolution, display 0
+ XRES=$(/usr/sbin/xquery -d :0 -r)
+
+ log "\t===Qt Geometry==="
+ log "\tResolution: ${XRES}"
+
+ # current X and Y resolution
+ XRES_X=$(echo $XRES | sed 's|[0123456789]\+ \([0123456789]\+\)x[0123456789]\+|\1|') #'
+ XRES_Y=$(echo $XRES | sed 's|[0123456789]\+ [0123456789]\+x\([0123456789]\+\)|\1|') #'
+
+ log "\tX: ${XRES_X}"
+ log "\tY: ${XRES_Y}"
+
+ # default values, minimal window 640x480
+ WINDOW_SIZE_X=640
+ WINDOW_SIZE_Y=480
+ OFFSET_X=0
+ OFFSET_Y=0
+ BACKGROUND_IMAGE=""
+
+ # cannot get any X-resolution
+ if [ "${XRES}" == "" ]; then
+ # cannot find out X resolution
+ WINDOW_SIZE_X=800
+ WINDOW_SIZE_Y=600
+ # reasonable
+ else
+ # FIXME: recount background image
+ BACKGROUND_IMAGE="/usr/lib/YaST2/startup/bkg.png"
+
+ # must be bigger or equal to 1400x1050
+ if [ "$(expr $XRES_X \>= 1400)" == "1" ] && [ "$(expr $XRES_Y \>= 1050)" == "1" ]; then
+ WINDOW_SIZE_X=1024
+ WINDOW_SIZE_Y=786
+ # must be bigger or equal to 800x600
+ elif [ "$(expr $XRES_X \>= 800)" == "1" ] && [ "$(expr $XRES_Y \>= 600)" == "1" ]; then
+ WINDOW_SIZE_X=800
+ WINDOW_SIZE_Y=600
+ fi
+
+ # X and Y offsets
+ OFFSET_X=$(expr ${XRES_X} - ${WINDOW_SIZE_X})
+ OFFSET_X=$(expr ${OFFSET_X} / 2)
+ OFFSET_Y=$(expr ${XRES_Y} - ${WINDOW_SIZE_Y})
+ OFFSET_Y=$(expr ${OFFSET_Y} / 2)
+ fi
+
+ log "\tWindow size X: ${WINDOW_SIZE_X}"
+ log "\tWindow size X: ${WINDOW_SIZE_Y}"
+ log "\tOffset X: ${OFFSET_X}"
+ log "\tOffset X: ${OFFSET_Y}"
+
+ # final window geometry, 'Window_XxWindow_Y+Offset_X+Offset_Y'
+ X_GEOMETRY="${WINDOW_SIZE_X}x${WINDOW_SIZE_Y}+${OFFSET_X}+${OFFSET_Y}"
+
+ log "\tUsed geometry: ${X_GEOMETRY}"
+}
+
#----[ prepare_for_qt ]----#
function prepare_for_qt () {
#------------------------------------------------------
@@ -163,7 +223,11 @@
# set YaST2 Qt options for local displays
#---------------------------------------------
if [ ! -z "$NEED_XSERVER" ];then
- Y2_UI_ARGS="--fullscreen --noborder --auto-fonts"
+ Y2_UI_ARGS="--noborder --auto-fonts"
+ count_qt_geometry
+ if [ "${X_GEOMETRY}" != "" ]; then
+ Y2_UI_ARGS="${Y2_UI_ARGS} -geometry ${X_GEOMETRY}"
+ fi
fi
}
@@ -215,7 +279,9 @@
#=============================================
# Setup y2base options
#---------------------------------------------
- Y2_UI_ARGS="--fullscreen --noborder --auto-fonts"
+ # xxx
+ #Y2_UI_ARGS="--fullscreen --noborder --auto-fonts"
+ Y2_UI_ARGS="--noborder --auto-fonts"
#=============================================
# Setup VNC server and start it
@@ -321,6 +387,18 @@
fi
export QT_IM_MODULE=xim
+ if [ "$RUN_FBITERM" = "1" ]; then
+ OPT_FBITERM=/usr/bin/fbiterm
+ else
+ OPT_FBITERM=
+ fi
+
+ # set up a background if any needed
+ if [ "${BACKGROUND_IMAGE}" != "" ]; then
+ log "\tUsing background: ${BACKGROUND_IMAGE}"
+ fvwm-root --dither ${BACKGROUND_IMAGE}
+ fi
+
log "\tStarting YaST2:"
log "\tMODULE_NAME: $Y2_MODULE_NAME"
log "\tMODE_FLAGS: $Y2_MODE_FLAGS"
@@ -328,12 +406,6 @@
log "\tMODE: $Y2_MODE"
log "\tUI_ARGS: $Y2_UI_ARGS"
log "\tQT_IM_MODULE:$QT_IM_MODULE"
-
- if [ "$RUN_FBITERM" = "1" ]; then
- OPT_FBITERM=/usr/bin/fbiterm
- else
- OPT_FBITERM=
- fi
$OPT_FBITERM y2base \
"$Y2_MODULE_NAME" \
$Y2_MODE_FLAGS \
@@ -695,3 +767,5 @@
# 10) exit with YaST2 exit code
#---------------------------------------------
exit $Y2_EXIT_CODE
+
+
Binary files old/yast2-installation-2.13.147/startup/bkg.png and new/yast2-installation-2.13.148/startup/bkg.png differ
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-installation-2.13.147/startup/common/vnc.sh new/yast2-installation-2.13.148/startup/common/vnc.sh
--- old/yast2-installation-2.13.147/startup/common/vnc.sh 2006-08-23 16:58:34.000000000 +0200
+++ new/yast2-installation-2.13.148/startup/common/vnc.sh 2006-09-04 15:59:37.000000000 +0200
@@ -13,7 +13,7 @@
# DESCRIPTION : VNC helper functions to start the Xvnc server
# :
# :
-# STATUS : $Id: vnc.sh 32536 2006-08-23 14:46:20Z jsrain $
+# STATUS : $Id: vnc.sh 32687 2006-09-04 13:53:31Z ms $
#----------------
. /etc/YaST2/XVersion
@@ -84,7 +84,7 @@
-httpd /usr/share/vnc/classes \
-rfbport 5901 \
-httpport 5801 \
- -fp $Xlibdir/X11/fonts/misc/,$Xlibdir/X11/fonts/uni/,$Xlibdir/X11/fonts/truetype/ \
+ -fp $Xfontdir/misc/,$Xfontdir/uni/,$Xfontdir/truetype/ \
&> /var/log/YaST2/vncserver.log &
xserver_pid=$!
export DISPLAY=:0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org