November 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r42556 - /tags/branch-SLE-10-SP2-2_13_106/yast2/
by mzugec＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: mzugec Date: Fri Nov 30 13:54:17 2007 New Revision: 42556 URL: http://svn.opensuse.org/viewcvs/yast?rev=42556&view=rev Log: Created tag branch-SLE-10-SP2-2_13_106 for yast2 Added: tags/branch-SLE-10-SP2-2_13_106/yast2/ - copied from r42555, branches/SuSE-SLE-10-SP2-Branch/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42555 - /tags/branch-SLE-10-SP2-2_13_106/
by mzugec＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: mzugec Date: Fri Nov 30 13:54:15 2007 New Revision: 42555 URL: http://svn.opensuse.org/viewcvs/yast?rev=42555&view=rev Log: Created tag branch-SLE-10-SP2-2_13_106 Added: tags/branch-SLE-10-SP2-2_13_106/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42554 - in /branches/SuSE-SLE-10-SP2-Branch/yast2: VERSION library/network/src/NetworkService.ycp package/yast2.changes
by mzugec＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: mzugec Date: Fri Nov 30 13:54:08 2007 New Revision: 42554 URL: http://svn.opensuse.org/viewcvs/yast?rev=42554&view=rev Log: added function NetworkService::isNetworkRunning() Modified: branches/SuSE-SLE-10-SP2-Branch/yast2/VERSION branches/SuSE-SLE-10-SP2-Branch/yast2/library/network/src/NetworkService.ycp branches/SuSE-SLE-10-SP2-Branch/yast2/package/yast2.changes Modified: branches/SuSE-SLE-10-SP2-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/yast2/… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/yast2/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/yast2/VERSION Fri Nov 30 13:54:08 2007 @@ -1 +1 @@ -2.13.105 +2.13.106 Modified: branches/SuSE-SLE-10-SP2-Branch/yast2/library/network/src/NetworkService.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/yast2/… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/yast2/library/network/src/NetworkService.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/yast2/library/network/src/NetworkService.ycp Fri Nov 30 13:54:08 2007 @@ -128,5 +128,19 @@ } } +global boolean isNetworkRunning(){ + map output = (map)SCR::Execute(.target.bash_output, + "([ $(ip addr|grep -v '127.0.0.1'|grep -c inet) != '0' ] && echo 'network') || echo 'no net'"); + if (issubstring(output["stdout"]:"", "network")) { + y2milestone ("Network is running ..."); + return true; + } else { + y2milestone("Network is not running ..."); + return false; + } + +} + + /* EOF */ } Modified: branches/SuSE-SLE-10-SP2-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/yast2/… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/yast2/package/yast2.changes Fri Nov 30 13:54:08 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Nov 30 13:53:24 CET 2007 - mzugec(a)suse.cz + +- added function NetworkService::isNetworkRunning() +- 2.13.106 + +------------------------------------------------------------------- Thu Nov 29 13:10:33 CET 2007 - mzugec(a)suse.cz - for AY Confirm::Detection popup has timeout 10 seconds (#192181) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42553 - in /trunk/devtools/devtools/skeletons/config-python: ./ agents/ doc/ doc/autodocs/ package/ src/ testsuite/ testsuite/tests/
by dfiser＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: dfiser Date: Fri Nov 30 13:54:06 2007 New Revision: 42553 URL: http://svn.opensuse.org/viewcvs/yast?rev=42553&view=rev Log: Added skeleton for yast modules written completely in python. Added: trunk/devtools/devtools/skeletons/config-python/ trunk/devtools/devtools/skeletons/config-python/.cvsignore trunk/devtools/devtools/skeletons/config-python/MAINTAINER trunk/devtools/devtools/skeletons/config-python/Makefile.cvs trunk/devtools/devtools/skeletons/config-python/RPMNAME trunk/devtools/devtools/skeletons/config-python/VERSION trunk/devtools/devtools/skeletons/config-python/agents/ trunk/devtools/devtools/skeletons/config-python/agents/.cvsignore trunk/devtools/devtools/skeletons/config-python/agents/Makefile.am trunk/devtools/devtools/skeletons/config-python/configure.in.in trunk/devtools/devtools/skeletons/config-python/doc/ trunk/devtools/devtools/skeletons/config-python/doc/.cvsignore trunk/devtools/devtools/skeletons/config-python/doc/Makefile.am trunk/devtools/devtools/skeletons/config-python/doc/autodocs/ trunk/devtools/devtools/skeletons/config-python/doc/autodocs/.cvsignore trunk/devtools/devtools/skeletons/config-python/doc/autodocs/Makefile.am trunk/devtools/devtools/skeletons/config-python/package/ trunk/devtools/devtools/skeletons/config-python/package/.cvsignore trunk/devtools/devtools/skeletons/config-python/package/yast2-XXpkgXX.changes trunk/devtools/devtools/skeletons/config-python/src/ trunk/devtools/devtools/skeletons/config-python/src/.cvsignore trunk/devtools/devtools/skeletons/config-python/src/Makefile.am trunk/devtools/devtools/skeletons/config-python/src/XXPkgXX.py trunk/devtools/devtools/skeletons/config-python/src/XXpkgXX.desktop trunk/devtools/devtools/skeletons/config-python/src/XXpkgXX.py trunk/devtools/devtools/skeletons/config-python/src/complex.py trunk/devtools/devtools/skeletons/config-python/src/dialogs.py trunk/devtools/devtools/skeletons/config-python/src/helps.py trunk/devtools/devtools/skeletons/config-python/src/wizards.py trunk/devtools/devtools/skeletons/config-python/testsuite/ trunk/devtools/devtools/skeletons/config-python/testsuite/.cvsignore trunk/devtools/devtools/skeletons/config-python/testsuite/Makefile.am trunk/devtools/devtools/skeletons/config-python/testsuite/tests/ trunk/devtools/devtools/skeletons/config-python/testsuite/tests/.cvsignore trunk/devtools/devtools/skeletons/config-python/testsuite/tests/XXPkgXX.err trunk/devtools/devtools/skeletons/config-python/testsuite/tests/XXPkgXX.out trunk/devtools/devtools/skeletons/config-python/testsuite/tests/XXPkgXX.ycp trunk/devtools/devtools/skeletons/config-python/yast2-XXpkgXX.spec.in Added: trunk/devtools/devtools/skeletons/config-python/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/.cvsignore (added) +++ trunk/devtools/devtools/skeletons/config-python/.cvsignore Fri Nov 30 13:54:06 2007 @@ -0,0 +1,20 @@ +Makefile +Makefile.am +Makefile.am.common +Makefile.in +aclocal.m4 +config.cache +config.guess +config.h.in +config.log +config.status +config.sub +configure +configure.in +depcomp +install-sh +missing +mkinstalldirs +stamp-h +XXpkgXX.pot +autom4te.cache Added: trunk/devtools/devtools/skeletons/config-python/MAINTAINER URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/MAINTAINER (added) +++ trunk/devtools/devtools/skeletons/config-python/MAINTAINER Fri Nov 30 13:54:06 2007 @@ -0,0 +1 @@ +XXmaintainerXX <XXemailXX> Added: trunk/devtools/devtools/skeletons/config-python/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/Makefile.cvs (added) +++ trunk/devtools/devtools/skeletons/config-python/Makefile.cvs Fri Nov 30 13:54:06 2007 @@ -0,0 +1,22 @@ +# +# Makefile.cvs +# +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + +configure: all + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) + +all: + y2tool y2autoconf + y2tool y2automake + autoreconf --force --install + +install: configure + make + make install + +reconf: all + ./config.status --recheck + ./config.status Added: trunk/devtools/devtools/skeletons/config-python/RPMNAME URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/RPMNAME (added) +++ trunk/devtools/devtools/skeletons/config-python/RPMNAME Fri Nov 30 13:54:06 2007 @@ -0,0 +1 @@ +yast2-XXpkgXX Added: trunk/devtools/devtools/skeletons/config-python/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/VERSION (added) +++ trunk/devtools/devtools/skeletons/config-python/VERSION Fri Nov 30 13:54:06 2007 @@ -0,0 +1 @@ +2.15.0 Added: trunk/devtools/devtools/skeletons/config-python/agents/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/agents/.cvsignore (added) +++ trunk/devtools/devtools/skeletons/config-python/agents/.cvsignore Fri Nov 30 13:54:06 2007 @@ -0,0 +1,2 @@ +Makefile +Makefile.in Added: trunk/devtools/devtools/skeletons/config-python/agents/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/agents/Makefile.am (added) +++ trunk/devtools/devtools/skeletons/config-python/agents/Makefile.am Fri Nov 30 13:54:06 2007 @@ -0,0 +1,7 @@ +# Makefile.am for XXpkgXX/agents + +agent_SCRIPTS = + +scrconf_DATA = + +EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) Added: trunk/devtools/devtools/skeletons/config-python/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/configure.in.in (added) +++ trunk/devtools/devtools/skeletons/config-python/configure.in.in Fri Nov 30 13:54:06 2007 @@ -0,0 +1,12 @@ +## YCP module configure.in.in + +## Initialize +@YAST2-INIT-COMMON@ +@YAST2-INIT-YCP@ + +## some common checks +@YAST2-CHECKS-COMMON@ +@YAST2-CHECKS-YCP@ + +## and generate the output... +@YAST2-OUTPUT@ Added: trunk/devtools/devtools/skeletons/config-python/doc/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/doc/.cvsignore (added) +++ trunk/devtools/devtools/skeletons/config-python/doc/.cvsignore Fri Nov 30 13:54:06 2007 @@ -0,0 +1,2 @@ +Makefile +Makefile.in Added: trunk/devtools/devtools/skeletons/config-python/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/doc/Makefile.am (added) +++ trunk/devtools/devtools/skeletons/config-python/doc/Makefile.am Fri Nov 30 13:54:06 2007 @@ -0,0 +1,10 @@ +# Makefile.am for XXpkgXX/doc + +SUBDIRS = + +htmldir = $(docdir) + +doc_DATA = +html_DATA = + +EXTRA_DIST = $(doc_DATA) $(html_DATA) Added: trunk/devtools/devtools/skeletons/config-python/doc/autodocs/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/doc/autodocs/.cvsignore (added) +++ trunk/devtools/devtools/skeletons/config-python/doc/autodocs/.cvsignore Fri Nov 30 13:54:06 2007 @@ -0,0 +1,3 @@ +Makefile +Makefile.in +*.html Added: trunk/devtools/devtools/skeletons/config-python/doc/autodocs/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/doc/autodocs/Makefile.am (added) +++ trunk/devtools/devtools/skeletons/config-python/doc/autodocs/Makefile.am Fri Nov 30 13:54:06 2007 @@ -0,0 +1,3 @@ +# Makefile.am for XXpkgXX/doc/autodocs + +include $(top_srcdir)/autodocs-ycp.ami Added: trunk/devtools/devtools/skeletons/config-python/package/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/package/.cvsignore (added) +++ trunk/devtools/devtools/skeletons/config-python/package/.cvsignore Fri Nov 30 13:54:06 2007 @@ -0,0 +1,2 @@ +*.spec +*.bz2 Added: trunk/devtools/devtools/skeletons/config-python/package/yast2-XXpkgXX.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/package/yast2-XXpkgXX.changes (added) +++ trunk/devtools/devtools/skeletons/config-python/package/yast2-XXpkgXX.changes Fri Nov 30 13:54:06 2007 @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +XXdateXX - XXemailXX + +- initial version Added: trunk/devtools/devtools/skeletons/config-python/src/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/src/.cvsignore (added) +++ trunk/devtools/devtools/skeletons/config-python/src/.cvsignore Fri Nov 30 13:54:06 2007 @@ -0,0 +1,4 @@ +Makefile +Makefile.in +*.ybc +.dep Added: trunk/devtools/devtools/skeletons/config-python/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/src/Makefile.am (added) +++ trunk/devtools/devtools/skeletons/config-python/src/Makefile.am Fri Nov 30 13:54:06 2007 @@ -0,0 +1,27 @@ +# Makefile.am for XXpkgXX/src + +yncludedir = @yncludedir@/XXpkgXX + +client_DATA = \ + XXpkgXX.py + +#TODO: This must be modified to python can know from where can import! +ynclude_DATA = \ + helps.py \ + wizards.py \ + dialogs.py \ + complex.py + +desktop_DATA = \ + XXpkgXX.desktop + +module_DATA = XXPkgXX.py + +# create a symlink for local build, #145327 +XXpkgXX: + ln -sf . $@ +ycpchook = XXpkgXX + +EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) + +include $(top_srcdir)/Makefile.am.common Added: trunk/devtools/devtools/skeletons/config-python/src/XXPkgXX.py URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/src/XXPkgXX.py (added) +++ trunk/devtools/devtools/skeletons/config-python/src/XXPkgXX.py Fri Nov 30 13:54:06 2007 @@ -0,0 +1,301 @@ +#!/usr/bin/env python + +# ------------------------------------------------------------------------------ +# Copyright (c) 2006 Novell, Inc. All Rights Reserved. +# +# +# 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 Novell, Inc. +# +# To contact Novell about this file by physical or electronic mail, you may find +# current contact information at www.novell.com. +# ------------------------------------------------------------------------------ + +# File: modules/XXPkgXX3.py +# Package: Configuration of XXpkgXX +# Summary: XXPkgXX settings, input and output functions +# Authors: XXmaintainerXX <XXemailXX> +# +# $Id: XXPkgXX3.py 27914 2006-02-13 14:32:08Z locilka $ +# +# Representation of the configuration of XXpkgXX. +# Input and output routines. + + +from time import sleep +from YCPDeclarations import YCPDeclare +import ycp +from ycp import Term, Symbol, Path +from ycp import y2internal, y2security, y2error, y2warning, y2milestone, y2debug + +## + # Set textdomain + # +import gettext +gettext.install("XXpkgXX") + +ycp.import_module("Progress") +ycp.import_module("Report") +ycp.import_module("Summary") +ycp.import_module("Message") + +## + # Data was modified? + # +modified = False + +## + # +proposal_valid = False + +## + # Write only, used during autoinstallation. + # Don't run services and SuSEconfig, it's all done at one place. + # +write_only = False + +## + # Data was modified? + # @return true if modified + # +@YCPDeclare("boolean") +def Modified(): + global modified + y2debug ("modified=%d" % (modified)); + return modified + +## + # Mark as modified, for Autoyast. + # +@YCPDeclare("void", "boolean") +def SetModified(value): + global modified + modified = value + +@YCPDeclare("boolean") +def ProposalValid(): + global proposal_valid + return proposal_valid + +@YCPDeclare("void", "boolean") +def SetProposalValid(value): + global proposal_valid + proposal_valid = value + +@YCPDeclare("boolean") +def WriteOnly(): + global write_only + return write_only + +@YCPDeclare("void", "boolean") +def SetWriteOnly(value): + global write_only + write_only = value + + +# Settings: Define all variables needed for configuration of XXpkgXX +# TODO FIXME: Define all the variables necessary to hold +# TODO FIXME: the configuration here (with the appropriate +# TODO FIXME: description) +# TODO FIXME: For example: +# ## +# # List of the configured cards. +# # +# cards = [] +# +# ## +# # Some additional parameter needed for the configuration. +# # +# additional_parameter = 1 + +## + # Read all XXpkgXX settings + # @return true on success + # +@YCPDeclare("boolean") +def Read(): + global modified + + # XXPkgXX read dialog caption + caption = _("Initializing XXpkgXX Configuration") + + # TODO FIXME Set the right number of stages + steps = 4 + + sl = 0.5 + sleep(sl) + + # TODO FIXME Names of real stages + # We do not set help text here, because it was set outside + ycp.Progress.New(caption, " ", steps, [ + # Progress stage 1/3 + _("Read the database"), + # Progress stage 2/3 + _("Read the previous settings"), + # Progress stage 3/3 + _("Detect the devices") + ], [ + # Progress step 1/3 + _("Reading the database..."), + # Progress step 2/3 + _("Reading the previous settings..."), + # Progress step 3/3 + _("Detecting the devices..."), + # Progress finished + _("Finished") + ], + "" + ) + + # read database + ycp.Progress.NextStage(); + # Error message + if False: + ycp.Report.Error(_("Cannot read the database1.")) + sleep(sl) + + # read another database + ycp.Progress.NextStep() + # Error message + if False: + ycp.Report.Error(_("Cannot read the database2.")) + sleep(sl) + + # read current settings + ycp.Progress.NextStage() + # Error message + if False: + ycp.Report.Error(ycp.Message.CannotReadCurrentSettings()) + sleep(sl) + + # detect devices + ycp.Progress.NextStage() + # Error message + if False: + ycp.Report.Warning(_("Cannot detect devices.")) + sleep(sl) + + # Progress finished + ycp.Progress.NextStage() + sleep(sl) + + modified = False + + return True + +## + # Write all XXpkgXX settings + # @return true on success + # +@YCPDeclare("boolean") +def Write(): + # XXPkgXX read dialog caption + caption = _("Saving XXpkgXX Configuration") + + # TODO FIXME And set the right number of stages + steps = 2 + + sl = 0.5 + sleep(sl) + + # TODO FIXME Names of real stages + # We do not set help text here, because it was set outside + ycp.Progress.New(caption, " ", steps, [ + # Progress stage 1/2 + _("Write the settings"), + # Progress stage 2/2 + _("Run SuSEconfig") + ], [ + # Progress step 1/2 + _("Writing the settings..."), + # Progress step 2/2 + _("Running SuSEconfig..."), + # Progress finished + _("Finished") + ], + "" + ) + + # write settings + ycp.Progress.NextStage() + # Error message + if False: + ycp.Report.Error (_("Cannot write settings.")) + sleep(sl) + + # run SuSEconfig + ycp.Progress.NextStage() + # Error message + if False: + ycp.Report.Error(ycp.Message.SuSEConfigFailed()) + sleep(sl) + + # Progress finished + ycp.Progress.NextStage() + sleep(sl) + + return True + +## + # Get all XXpkgXX settings from the first parameter + # (For use by autoinstallation.) + # @param settings The YCP structure to be imported. + # @return boolean True on success + # +@YCPDeclare("boolean", "map") +def Import(map_settings): + # TODO FIXME: your code here (fill the above mentioned variables)... + return True + +## + # Dump the XXpkgXX settings to a single map + # (For use by autoinstallation.) + # @return map Dumped settings (later acceptable by Import ()) + # +@YCPDeclare("map") +def Export(): + # TODO FIXME: your code here (return the above mentioned variables)... + return {} + +## + # Create a textual summary and a list of unconfigured cards + # @return summary of the current configuration + # +@YCPDeclare("list") +def Summary(): + # TODO FIXME: your code here... + # Configuration summary text for autoyast + return [ _("Configuration summary ..."), "" ] + +## + # Create an overview table with all configured cards + # @return table items + # +@YCPDeclare("list") +def Overview(): + # TODO FIXME: your code here... + return [] + +## + # Return packages needed to be installed and removed during + # Autoinstallation to insure module has all needed software + # installed. + # @return map with 2 lists. + # +@YCPDeclare("map") +def AutoPackages(): + # TODO FIXME: your code here... + return { + "install" : [], + "remove" : [] + } + +# EOF Added: trunk/devtools/devtools/skeletons/config-python/src/XXpkgXX.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/src/XXpkgXX.desktop (added) +++ trunk/devtools/devtools/skeletons/config-python/src/XXpkgXX.desktop Fri Nov 30 13:54:06 2007 @@ -0,0 +1,24 @@ +[Desktop Entry] +Type=Application +Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Misc; + +X-KDE-ModuleType=Library +X-KDE-RootOnly=true +X-KDE-HasReadOnlyMode=true +X-KDE-Library=yast2 +X-SuSE-YaST-Call=XXpkgXX + +X-SuSE-YaST-Group=Misc +X-SuSE-YaST-Argument= +X-SuSE-YaST-RootOnly=true +X-SuSE-YaST-AutoInst= +X-SuSE-YaST-Geometry= +X-SuSE-YaST-SortKey= +X-SuSE-YaST-AutoInstResource=XXpkgXX + +Icon=yast-XXpkgXX +Exec=/sbin/yast2 XXpkgXX + +Name=XXPkgXX +GenericName=XXpkgXX +X-KDE-SubstituteUID=true Added: trunk/devtools/devtools/skeletons/config-python/src/XXpkgXX.py URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/src/XXpkgXX.py (added) +++ trunk/devtools/devtools/skeletons/config-python/src/XXpkgXX.py Fri Nov 30 13:54:06 2007 @@ -0,0 +1,102 @@ +#!/usr/bin/env python + +# ------------------------------------------------------------------------------ +# Copyright (c) 2006 Novell, Inc. All Rights Reserved. +# +# +# This program is free software; you can redistribute it andor 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 Novell, Inc. +# +# To contact Novell about this file by physical or electronic mail, you may find +# current contact information at www.novell.com. +# ------------------------------------------------------------------------------ +# + +# +# File: clientsXXpkgXX.py +# Package: Configuration of XXpkgXX +# Summary: Main file +# Authors: XXmaintainerXX <XXemailXX> +# +# $Id: XXpkgXX.ycp 27914 2006-02-13 14:32:08Z locilka $ +# +# Main file for XXpkgXX configuration. Uses all other files. +# + +import sys +import ycp +from ycp import Term, Symbol, Path +from ycp import y2internal, y2security, y2error, y2warning, y2milestone, y2debug + +import gettext +gettext.install("XXpkgXX") + +ycp.init_ui("qt") + +## +# <h3>Configuration of XXpkgXX</h3> +# + + +# The main () +y2milestone("----------------------------------------") +y2milestone("XXPkgXX module started") + +ycp.import_module("Progress") +ycp.import_module("Report") +ycp.import_module("Summary") +ycp.import_module("XXPkgXX") + +ycp.import_module("CommandLine") + +#TODO +import wizards + +cmdline_description = { + "id" : "XXpkgXX", + # Command line help text for the XXXpkgXX module + "help" : _("Configuration of XXpkgXX"), + "guihandler" : wizards.XXPkgXXSequence, + "initialize" : ycp.XXPkgXX.Read, + "finish" : ycp.XXPkgXX.Write, + "actions" : { + # FIXME TODO: fill the functionality description here + }, + "options" : { + # FIXME TODO: fill the option descriptions here + }, + "mappings" : { + # FIXME TODO: fill the mappings of actions and options here + } +} + +# TODO +# is this proposal or not? +#propose = False +#args = ycp.WFM.Args() +#if len(args) > 0): +# if ycp.isPath(ycp.WFM.Args(0)) and ycp.WFM.Args(0) == Path(".propose"): +# y2milestone("Using PROPOSE mode"); +# propose = True; + +# main ui function +ret = None + +#if propose: ret = XXPkgXXAutoSequence() +#else: ret = ycp.CommandLine.Run(cmdline_description) +#y2debug("ret=%d" % (ret)) +ycp.CommandLine.Run(cmdline_description) + +# Finish +y2milestone("XXPkgXX module finished"); +y2milestone("----------------------------------------"); + +sys.exit(ret) Added: trunk/devtools/devtools/skeletons/config-python/src/complex.py URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/src/complex.py (added) +++ trunk/devtools/devtools/skeletons/config-python/src/complex.py Fri Nov 30 13:54:06 2007 @@ -0,0 +1,206 @@ +#/* ------------------------------------------------------------------------------ +# * Copyright (c) 2006 Novell, Inc. All Rights Reserved. +# * +# * +# * 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 Novell, Inc. +# * +# * To contact Novell about this file by physical or electronic mail, you may find +# * current contact information at www.novell.com. +# * ------------------------------------------------------------------------------ +# +# +#/** +# * File: include/XXpkgXX/complex.ycp +# * Package: Configuration of XXpkgXX +# * Summary: Dialogs definitions +# * Authors: XXmaintainerXX <XXemailXX> +# * +# * $Id: complex.ycp 41350 2007-10-10 16:59:00Z dfiser $ +# */ + +import ycp +from ycp import Symbol, Term, Path +from YCPDeclarations import YCPDeclare + +## + # Set textdomain + # +import gettext +gettext.install("XXpkgXX") + +ycp.import_module("Label") +ycp.import_module("Popup") +ycp.import_module("Wizard") +ycp.import_module("Wizard_hw") +ycp.import_module("Confirm") +ycp.import_module("UI") +ycp.import_module("XXPkgXX") + +from helps import HELPS + +#include "XXpkgXX/helps.ycp"; + +#/** +# * Return a modification status +# * @return true if data was modified +# */ +def Modified(): + return ycp.XXPkgXX.Modified() + +def ReallyAbort(): + return not ycp.XXPkgXX.Modified() or ycp.Popup.ReallyAbort(True) + +def PollAbort(): + return ycp.UI.PollInput() == Symbol("abort") + +#/** +# * Read settings dialog +# * @return `abort if aborted and `next otherwise +# */ +@YCPDeclare("symbol") +def ReadDialog(): + ycp.Wizard.RestoreHelp(HELPS["read"]) + #// XXPkgXX::SetAbortFunction(PollAbort); + if not ycp.Confirm.MustBeRoot(): return Symbol("abort") + + ret = ycp.XXPkgXX.Read() + if ret: + return Symbol("next") + else: + return Symbol("abort") + +#/** +# * Write settings dialog +# * @return `abort if aborted and `next otherwise +# */ +@YCPDeclare("symbol") +def WriteDialog(): + ycp.Wizard.RestoreHelp(HELPS["write"]) + #// XXPkgXX::SetAbortFunction(PollAbort); + + ret = ycp.XXPkgXX.Write() + if ret: + return Symbol("next") + else: + return Symbol("abort") + +#/** +# * Summary dialog +# * @return dialog result +# */ +@YCPDeclare("symbol") +def SummaryDialog(): + #/* XXPkgXX summary dialog caption */ + caption = _("XXPkgXX Configuration"); + + #/* FIXME */ + summary = ycp.XXPkgXX.Summary(); + unconfigured = summary[1]; + configured = summary[0]; + + #/* Frame label */ + contents = ycp.Wizard_hw.DetectedContent(_("XXPkgXX to Configure"), + unconfigured, False, configured); + + ycp.Wizard.SetContentsButtons(caption, contents, HELPS["summary"], + ycp.Label.BackButton(), ycp.Label.FinishButton()) + + ret = None + while True: + ret = ycp.UI.UserInput() + + #/* abort? */ + if ret == Symbol("abort") or ret == Symbol("cancel") or ret == Symbol("back"): + if ReallyAbort(): break + else: continue + + #/* overview dialog */ + elif ret == Symbol("edit_button"): + ret = Symbol("overview") + break + + #/* configure the selected device */ + elif ret == Symbol("configure_button"): + #// TODO FIXME: check for change of the configuration + selected = ycp.UI.QueryWidget(Term("id", Symbol("detected_selbox")), Symbol("CurrentItem")) + if selected == Symbol("other"): + ret = Symbol("other") + else: + ret = Symbol("configure") + break + + elif ret == Symbol("next"): + break + else: + y2error("unexpected retcode: %s" % (ret)) + continue + + return ret + +#/** +# * Overview dialog +# * @return dialog result +# */ +@YCPDeclare("symbol") +def OverviewDialog(): + # XXPkgXX overview dialog caption + caption = _("XXPkgXX Overview") + + overview = ycp.XXPkgXX.Overview() + + #/* FIXME table header */ + contents = ycp.Wizard_hw.ConfiguredContent( + #/* Table header */ + Term("header", _("Number"), _("XXPkgXX")), + overview, None, None, None, None) + + contents = ycp.Wizard_hw.SpacingAround(contents, 1.5, 1.5, 1.0, 1.0); + + ycp.Wizard.SetContentsButtons(caption, contents, HELPS["overview"], + ycp.Label.BackButton(), ycp.Label.FinishButton()) + + ret = None + + while True: + ret = ycp.UI.UserInput() + + #/* abort? */ + if ret == Symbol("abort") or ret == Symbol("cancel"): + if ReallyAbort(): break + else: continue + + #/* add */ + elif ret == Symbol("add_button"): + #/* FIXME */ + ret = Symbol("add") + break + + #/* edit */ + elif ret == Symbol("edit_button"): + #/* FIXME */ + ret = Symbol("edit") + break + + #/* delete */ + elif ret == Symbol("delete_button"): + #/* FIXME */ + continue + + elif ret == Symbol("next") or ret == Symbol("back"): + break + + else: + y2error("unexpected retcode: %s", ret); + continue + + return ret + Added: trunk/devtools/devtools/skeletons/config-python/src/dialogs.py URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/src/dialogs.py (added) +++ trunk/devtools/devtools/skeletons/config-python/src/dialogs.py Fri Nov 30 13:54:06 2007 @@ -0,0 +1,111 @@ +#/* ------------------------------------------------------------------------------ +# * Copyright (c) 2006 Novell, Inc. All Rights Reserved. +# * +# * +# * 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 Novell, Inc. +# * +# * To contact Novell about this file by physical or electronic mail, you may find +# * current contact information at www.novell.com. +# * ------------------------------------------------------------------------------ +# */ +# +#/** +# * File: include/XXpkgXX/dialogs.ycp +# * Package: Configuration of XXpkgXX +# * Summary: Dialogs definitions +# * Authors: XXmaintainerXX <XXemailXX> +# * +# * $Id: dialogs.ycp 27914 2006-02-13 14:32:08Z locilka $ +# */ + +import ycp +from ycp import Symbol, Term, Path +from YCPDeclarations import YCPDeclare + +ycp.import_module("Label") +ycp.import_module("Wizard") +ycp.import_module("UI") + +## + # Set textdomain + # +import gettext +gettext.install("XXpkgXX") + +from helps import HELPS +import complex + +#/** +# * Configure1 dialog +# * @return dialog result +# */ +@YCPDeclare("symbol") +def Configure1Dialog(): + #/* XXPkgXX configure1 dialog caption */ + caption = _("XXPkgXX Configuration"); + + #/* XXPkgXX configure1 dialog contents */ + contents = Term("Label", _("First part of configuration of XXpkgXX")) + + ycp.Wizard.SetContentsButtons(caption, contents, HELPS["c1"], + ycp.Label.BackButton(), ycp.Label.NextButton()) + + ret = None + while True: + ret = ycp.UI.UserInput() + + #/* abort? */ + if ret == Symbol("abort") or ret == Symbol("cancel"): + if complex.ReallyAbort(): break + else: continue + + elif ret == Symbol("next") or ret == Symbol("back"): + break + + else: + y2error("unexpected retcode: %s", ret) + continue + + return ret + +#/** +# * Configure2 dialog +# * @return dialog result +# */ +@YCPDeclare("symbol") +def Configure2Dialog(): + #/* XXPkgXX configure2 dialog caption */ + caption = _("XXPkgXX Configuration") + + #/* XXPkgXX configure2 dialog contents */ + contents = Term("Label", _("Second part of configuration of XXpkgXX")) + + ycp.Wizard.SetContentsButtons(caption, contents, HELPS["c2"], + ycp.Label.BackButton(), ycp.Label.NextButton()) + + ret = None + while True: + ret = ycp.UI.UserInput() + + #/* abort? */ + if ret == Symbol("abort") or ret == Symbol("cancel"): + if complex.ReallyAbort(): break + else: continue + + elif ret == Symbol("next") or ret == Symbol("back"): + break + + else: + y2error("unexpected retcode: %s", ret) + continue + + return ret Added: trunk/devtools/devtools/skeletons/config-python/src/helps.py URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/src/helps.py (added) +++ trunk/devtools/devtools/skeletons/config-python/src/helps.py Fri Nov 30 13:54:06 2007 @@ -0,0 +1,118 @@ +#/* ------------------------------------------------------------------------------ +# * Copyright (c) 2006 Novell, Inc. All Rights Reserved. +# * +# * +# * 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 Novell, Inc. +# * +# * To contact Novell about this file by physical or electronic mail, you may find +# * current contact information at www.novell.com. +# * ------------------------------------------------------------------------------ +# */ +# +#/** +# * File: include/XXpkgXX/helps.ycp +# * Package: Configuration of XXpkgXX +# * Summary: Help texts of all the dialogs +# * Authors: XXmaintainerXX <XXemailXX> +# * +# * $Id: helps.ycp 27914 2006-02-13 14:32:08Z locilka $ +# */ + +## + # Set textdomain + # +import gettext +gettext.install("XXpkgXX""") + +#/** +# * All helps are here +# */ +HELPS = { + + #/* Read dialog help 1/2 */ + "read" : _("""<big>Initializing XXpkgXX Configuration</big> +Please wait... +""") + + + #/* Read dialog help 2/2 */ + _("""<big>Aborting Initialization:</big> +Safely abort the configuration utility by pressing Abort now. +"""), + + #/* Write dialog help 1/2 */ + "write" : _("""<big>Saving XXpkgXX Configuration</big> +Please wait... +""") + + + #/* Write dialog help 2/2 */ +_("""<big>Aborting Saving:</big> +Abort the save procedure by pressing Abort. +An additional dialog informs whether it is safe to do so. + +"""), + + #/* Summary dialog help 1/3 */ + "summary" : _("""<big>XXPkgXX Configuration</big> +Configure XXpkgXX here. +""") + + + #/* Summary dialog help 2/3 */ + _("""<big>Adding a XXpkgXX:</big> +Choose an XXpkgXX from the list of detected XXpkgXXs. +If your XXpkgXX was not detected, use Other (not detected). +Then press Configure. +""") + + + #/* Summary dialog help 3/3 */ + _("""<big>Editing or Deleting:</big> +If you press Edit, an additional dialog in which to change +the configuration opens. +"""), + + #/* Ovreview dialog help 1/3 */ + "overview" : _("""<big>XXPkgXX Configuration Overview</big> +Obtain an overview of installed XXpkgXXs. Additionally +edit their configurations. +""") + + + #/* Ovreview dialog help 2/3 */ +_("""<big>Adding a XXpkgXX:</big> +Press Add to configure a XXpkgXX.""") + + + #/* Ovreview dialog help 3/3 */ +_("""<big>Editing or Deleting:</big> +Choose a XXpkgXX to change or remove. +Then press Edit or Delete as desired. +"""), + + #/* Configure1 dialog help 1/2 */ + "c1" : _("""<big>Configuration Part One</big> +Press Next to continue. + """) + + + #/* Configure1 dialog help 2/2 */ +_("""<big>Selecting Something</big> +It is not possible. You must code it first. :-) +"""), + + #/* Configure2 dialog help 1/2 */ + "c2" : _("""<big>Configuration Part Two</big> +Press Next to continue. + +""") + + + #/* Configure2 dialog help 2/2 */ +_("""<big>Selecting Something</big> +It is not possible. You must code it first. :-) +"""), + +} Added: trunk/devtools/devtools/skeletons/config-python/src/wizards.py URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/src/wizards.py (added) +++ trunk/devtools/devtools/skeletons/config-python/src/wizards.py Fri Nov 30 13:54:06 2007 @@ -0,0 +1,174 @@ +#/* ------------------------------------------------------------------------------ +# * Copyright (c) 2006 Novell, Inc. All Rights Reserved. +# * +# * +# * 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 Novell, Inc. +# * +# * To contact Novell about this file by physical or electronic mail, you may find +# * current contact information at www.novell.com. +# * ------------------------------------------------------------------------------ +# */ +# +#/** +# * File: include/XXpkgXX/wizards.ycp +# * Package: Configuration of XXpkgXX +# * Summary: Wizards definitions +# * Authors: XXmaintainerXX <XXemailXX> +# * +# * $Id: wizards.ycp 27914 2006-02-13 14:32:08Z locilka $ +# */ + +import ycp +from ycp import Symbol, Path, Term + +ycp.import_module("Sequencer2") +ycp.import_module("Wizard") +ycp.import_module("UI") + +import complex +import dialogs + +## + # Set textdomain + # +import gettext +gettext.install("XXpkgXX") + + +#/** +# * Add a configuration of XXpkgXX +# * @return sequence result +# */ +def AddSequence(): + # FIXME: adapt to your needs + aliases = { + "config1" : dialogs.Configure1Dialog, + "config2" : dialogs.Configure2Dialog, + } + + # FIXME: adapt to your needs + sequence = { + "ws_start" : "config1", + "config1" : { + Symbol("abort") : Symbol("abort"), + Symbol("next") : "config2" + }, + "config2" : { + Symbol("abort") : Symbol("abort"), + Symbol("next") : Symbol("next") + } + } + + return ycp.Sequencer2.Run(aliases, sequence); + +#/** +# * Main workflow of the XXpkgXX configuration +# * @return sequence result +# */ +def MainSequence(): + # FIXME: adapt to your needs + aliases = { + "summary" : complex.SummaryDialog, + "overview" : complex.OverviewDialog, + "configure" : [AddSequence, True ], + "add" : [AddSequence, True ], + "edit" : [AddSequence, True ] + } + + # FIXME: adapt to your needs + sequence = { + "ws_start" : "summary", + "summary" : { + Symbol("abort") : Symbol("abort"), + Symbol("next") : Symbol("next"), + Symbol("overview") : "overview", + Symbol("configure") : "configure", + Symbol("other") : "configure", + }, + "overview" : { + Symbol("abort") : Symbol("abort"), + Symbol("next") : Symbol("next"), + Symbol("add") : "add", + Symbol("edit") : "edit", + }, + "configure" : { + Symbol("abort") : Symbol("abort"), + Symbol("next") : "summary", + }, + "add" : { + Symbol("abort") : Symbol("abort"), + Symbol("next") : "overview", + }, + "edit" : { + Symbol("abort") : Symbol("abort"), + Symbol("next") : "overview", + } + } + + ret = ycp.Sequencer2.Run(aliases, sequence); + + return ret + +#/** +# * Whole configuration of XXpkgXX +# * @return sequence result +# */ +def XXPkgXXSequence(): + aliases = { + "read" : [complex.ReadDialog, True ], + "main" : MainSequence, + "write" : [complex.WriteDialog, True ] + } + + sequence = { + "ws_start" : "read", + "read" : { + Symbol("abort") : Symbol("abort"), + Symbol("next") : "main" + }, + "main" : { + Symbol("abort") : Symbol("abort"), + Symbol("next") : "write" + }, + "write" : { + Symbol("abort") : Symbol("abort"), + Symbol("next") : Symbol("next") + } + } + + ycp.Wizard.CreateDialog() + + ret = ycp.Sequencer2.Run(aliases, sequence) + + ycp.UI.CloseDialog() + return ret + +#/** +# * Whole configuration of XXpkgXX but without reading and writing. +# * For use with autoinstallation. +# * @return sequence result +# */ +def XXPkgXXAutoSequence(): + # Initialization dialog caption + caption = _("XXPkgXX Configuration"); + # Initialization dialog contents + contents = Term("Label", _("Initializing...")); + + ycp.Wizard.CreateDialog() + ycp.Wizard.SetContentsButtons(caption, contents, "", + ycp.Label.BackButton(), ycp.Label.NextButton()) + + ret = MainSequence() + + ycp.UI.CloseDialog() + return ret + Added: trunk/devtools/devtools/skeletons/config-python/testsuite/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/testsuite/.cvsignore (added) +++ trunk/devtools/devtools/skeletons/config-python/testsuite/.cvsignore Fri Nov 30 13:54:06 2007 @@ -0,0 +1,11 @@ +Makefile +Makefile.in +site.exp +*.sum +*.log +tmp.out* +tmp.err* +tmp.log* +config +run +*.test Added: trunk/devtools/devtools/skeletons/config-python/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/testsuite/Makefile.am (added) +++ trunk/devtools/devtools/skeletons/config-python/testsuite/Makefile.am Fri Nov 30 13:54:06 2007 @@ -0,0 +1,21 @@ +# +# Makefile.am for .../testsuite +# +# Do not edit this file (Makefile.am) as it will be overwritten! +# + +AUTOMAKE_OPTIONS = dejagnu +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) + +testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite + +all-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) + +clean-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean + +check-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check + +# EOF Added: trunk/devtools/devtools/skeletons/config-python/testsuite/tests/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== (empty) Added: trunk/devtools/devtools/skeletons/config-python/testsuite/tests/XXPkgXX.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== (empty) Added: trunk/devtools/devtools/skeletons/config-python/testsuite/tests/XXPkgXX.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/testsuite/tests/XXPkgXX.out (added) +++ trunk/devtools/devtools/skeletons/config-python/testsuite/tests/XXPkgXX.out Fri Nov 30 13:54:06 2007 @@ -0,0 +1,2 @@ +Dump XXPkgXX::Modified +Return false Added: trunk/devtools/devtools/skeletons/config-python/testsuite/tests/XXPkgXX.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/testsuite/tests/XXPkgXX.ycp (added) +++ trunk/devtools/devtools/skeletons/config-python/testsuite/tests/XXPkgXX.ycp Fri Nov 30 13:54:06 2007 @@ -0,0 +1,13 @@ +{ + +// testedfiles: XXPkgXX.ycp + +include "testsuite.ycp"; +TESTSUITE_INIT([], nil); + +import "XXPkgXX"; + +DUMP("XXPkgXX::Modified"); +TEST(``(XXPkgXX::Modified()), [], nil); + +} Added: trunk/devtools/devtools/skeletons/config-python/yast2-XXpkgXX.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config-python/yast2-XXpkgXX.spec.in (added) +++ trunk/devtools/devtools/skeletons/config-python/yast2-XXpkgXX.spec.in Fri Nov 30 13:54:06 2007 @@ -0,0 +1,31 @@ +@HEADER-COMMENT@ + +@HEADER@ +Requires: yast2 +BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite + +BuildArchitectures: noarch + +Summary: Configuration of XXpkgXX + +%description +- + +@PREP@ + +@BUILD@ + +@INSTALL@ + +@CLEAN@ + +%files +%defattr(-,root,root) +%dir @yncludedir@/XXpkgXX +@yncludedir@/XXpkgXX/* +@clientdir@/XXpkgXX.ycp +@clientdir@/XXpkgXX_*.ycp +@moduledir@/XXPkgXX.* +@moduledir@/XXPkgXX2.* +@desktopdir@/XXpkgXX.desktop +%doc @docdir@ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42552 - in /branches/tmp/coolo/qt4-port/src: ./ pkg/
by coolo＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: coolo Date: Fri Nov 30 13:18:22 2007 New Revision: 42552 URL: http://svn.opensuse.org/viewcvs/yast?rev=42552&view=rev Log: compile some more Modified: branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.h branches/tmp/coolo/qt4-port/src/YQOptionalWidgetFactory.cc branches/tmp/coolo/qt4-port/src/YQPackageSelectorPlugin.cc branches/tmp/coolo/qt4-port/src/YQPartitionSplitter.cc branches/tmp/coolo/qt4-port/src/YQProgressBar.cc branches/tmp/coolo/qt4-port/src/YQRadioButton.cc branches/tmp/coolo/qt4-port/src/YQRichText.cc branches/tmp/coolo/qt4-port/src/YQSelectionBox.cc branches/tmp/coolo/qt4-port/src/YQSlider.cc branches/tmp/coolo/qt4-port/src/YQTable.cc branches/tmp/coolo/qt4-port/src/YQTree.cc branches/tmp/coolo/qt4-port/src/YQUI_builtins.cc branches/tmp/coolo/qt4-port/src/YQUI_core.cc branches/tmp/coolo/qt4-port/src/YQUI_widgets.cc branches/tmp/coolo/qt4-port/src/YQUI_x11.cc branches/tmp/coolo/qt4-port/src/YQWidgetCaption.cc branches/tmp/coolo/qt4-port/src/YQWidgetFactory.cc branches/tmp/coolo/qt4-port/src/YQWizard.cc branches/tmp/coolo/qt4-port/src/YQWizardButton.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgDiskUsageList.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.h branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchList.h branches/tmp/coolo/qt4-port/src/pkg/YQPkgRepoList.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgVersionsView.h Modified: branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQMult… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.cc Fri Nov 30 13:18:22 2007 @@ -16,6 +16,7 @@ /-*/ +#define QT3_SUPPORT 1 #include <limits.h> #include <qstring.h> @@ -55,15 +56,15 @@ YUI_CHECK_NEW( _caption ); layout->addWidget( _caption ); - _qt_listView = new QTreeWidget( this ); + _qt_listView = new Q3ListView( this ); YUI_CHECK_NEW( _qt_listView ); layout->addWidget( _qt_listView ); _qt_listView->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); - _qt_listView->setHeaderLabels( QStringList("") ); // QListView doesn't have one single column by default! - _qt_listView->setSorting(0, false ); -// FIXME _qt_listView->header()->setStretchEnabled( true ); -// FIXME _qt_listView->header()->hide(); + _qt_listView->addColumn( "" ); // QListView doesn't have one single column by default! + _qt_listView->setSorting( 0, false ); + _qt_listView->header()->setStretchEnabled( true ); + _qt_listView->header()->hide(); _caption->setBuddy( _qt_listView ); // Very small default size if specified @@ -110,7 +111,7 @@ // Take care of the QListView's keyboard focus if ( ! _qt_listView->selectedItem() ) - msbItem->setSelected( true ); + _qt_listView->setSelected( msbItem, true ); } @@ -130,7 +131,7 @@ YQSignalBlocker sigBlocker( _qt_listView ); YMultiSelectionBox::deselectAllItems(); - QTreeWidgetItemIterator it( _qt_listView ); + Q3ListViewItemIterator it( _qt_listView ); while ( *it ) { @@ -179,7 +180,7 @@ // For the purpose of this function, QListView::currentItem() is the // minimum requirement. - QTreeWidgetItem * currentQItem = _qt_listView->currentItem(); + Q3ListViewItem * currentQItem = _qt_listView->currentItem(); if ( currentQItem ) { @@ -213,7 +214,7 @@ YQMultiSelectionBoxItem * msbItem = findItem( yItem ); if ( msbItem ) - msbItem->setSelected( true ); + _qt_listView->setSelected( msbItem, true ); // This does NOT change the item's check box! // (see explanations in YQMultiSelectionBox::currentItem() avove) @@ -226,14 +227,14 @@ { _caption->setEnabled( enabled ); _qt_listView->setEnabled( enabled ); - //FIXME _qt_listView->triggerUpdate(); + _qt_listView->triggerUpdate(); YWidget::setEnabled( enabled ); } int YQMultiSelectionBox::preferredWidth() { - int hintWidth = !_caption->isHidden() ? + int hintWidth = _caption->isShown() ? _caption->sizeHint().width() + frameWidth() : 0; return max( 80, hintWidth ); @@ -242,7 +243,7 @@ int YQMultiSelectionBox::preferredHeight() { - int hintHeight = !_caption->isHidden() ? _caption->sizeHint().height() : 0; + int hintHeight = _caption->isShown() ? _caption->sizeHint().height() : 0; int visibleLines = shrinkable() ? SHRINKABLE_VISIBLE_LINES : DEFAULT_VISIBLE_LINES; hintHeight += visibleLines * _qt_listView->fontMetrics().lineSpacing(); hintHeight += _qt_listView->frameWidth() * 2; @@ -301,7 +302,7 @@ YQMultiSelectionBox::findItem( YItem * wantedItem ) { // FIXME: Don't search through all items, use the YItem::data() pointer instead - QTreeWidgetItemIterator it( _qt_listView ); + Q3ListViewItemIterator it( _qt_listView ); while ( *it ) { @@ -325,9 +326,9 @@ YQMultiSelectionBoxItem::YQMultiSelectionBoxItem( YQMultiSelectionBox * parent, - QTreeWidget * listView, + Q3ListView * listView, YItem * yItem ) - : QTreeWidgetItem( listView, fromUTF8( yItem->label() ) ) + : Q3CheckListItem( listView, fromUTF8( yItem->label() ), Q3CheckListItem::CheckBox ) , _yItem( yItem ) , _multiSelectionBox( parent ) { @@ -342,7 +343,7 @@ { _yItem->setSelected( newState ); _multiSelectionBox->sendValueChanged(); - //FIXME Q3CheckListItem::stateChange( newState ); + Q3CheckListItem::stateChange( newState ); } Modified: branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQMult… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.h (original) +++ branches/tmp/coolo/qt4-port/src/YQMultiSelectionBox.h Fri Nov 30 13:18:22 2007 @@ -21,7 +21,8 @@ #define YQMultiSelectionBox_h #include <QFrame> -#include <QTreeWidgetItem> +#include <QColorGroup> +#include <Q3CheckListItem> #include <qlistview.h> #include "YMultiSelectionBox.h" @@ -163,19 +164,19 @@ YQWidgetCaption * _caption; - QTreeWidget * _qt_listView; + Q3ListView * _qt_listView; }; -class YQMultiSelectionBoxItem: public QTreeWidgetItem +class YQMultiSelectionBoxItem: public Q3CheckListItem { public: /** * Constructor. **/ YQMultiSelectionBoxItem( YQMultiSelectionBox * parent, - QTreeWidget * listView, + Q3ListView * listView, YItem * yItem ); /** Modified: branches/tmp/coolo/qt4-port/src/YQOptionalWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQOpti… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQOptionalWidgetFactory.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQOptionalWidgetFactory.cc Fri Nov 30 13:18:22 2007 @@ -16,6 +16,8 @@ /-*/ +#define QT3_SUPPORT + #include "YQOptionalWidgetFactory.h" #include "YQUI.h" #include "YUIException.h" Modified: branches/tmp/coolo/qt4-port/src/YQPackageSelectorPlugin.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQPack… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQPackageSelectorPlugin.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQPackageSelectorPlugin.cc Fri Nov 30 13:18:22 2007 @@ -18,6 +18,8 @@ /-*/ +#define QT3_SUPPORT 1 + #include "YQPackageSelectorPlugin.h" #define y2log_component "qt-ui" #include <ycp/y2log.h> Modified: branches/tmp/coolo/qt4-port/src/YQPartitionSplitter.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQPart… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQPartitionSplitter.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQPartitionSplitter.cc Fri Nov 30 13:18:22 2007 @@ -16,6 +16,7 @@ /-*/ +#define QT3_SUPPORT #define y2log_component "qt-ui" #include <ycp/y2log.h> Modified: branches/tmp/coolo/qt4-port/src/YQProgressBar.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQProg… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQProgressBar.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQProgressBar.cc Fri Nov 30 13:18:22 2007 @@ -49,7 +49,7 @@ _caption = new YQWidgetCaption( this, label ); YUI_CHECK_NEW( _caption ); layout->addWidget( _caption ); - + _qt_progressbar = new QProgressBar( this ); _qt_progressbar->setRange(0, maxValue); YUI_CHECK_NEW( _qt_progressbar ); @@ -90,7 +90,7 @@ int YQProgressBar::preferredWidth() { - int hintWidth = _caption->isShown() ? + int hintWidth = !_caption->isHidden() ? _caption->sizeHint().width() + layout()->margin() : 0; return max( 200, hintWidth ); Modified: branches/tmp/coolo/qt4-port/src/YQRadioButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQRadi… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQRadioButton.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQRadioButton.cc Fri Nov 30 13:18:22 2007 @@ -16,6 +16,7 @@ /-*/ +#define QT3_SUPPORT #include <qradiobutton.h> #include <QMouseEvent> @@ -54,7 +55,7 @@ QBoxLayout * layout = new QBoxLayout( this, QBoxLayout::LeftToRight ); _qt_radioButton = new QRadioButton( fromUTF8( label ), this ); - + layout->addSpacing( SPACING ); layout->addWidget( _qt_radioButton ); layout->addSpacing( SPACING ); @@ -73,7 +74,7 @@ _qt_radioButton->setFont( useBold ? YQUI::yqApp()->boldFont() : YQUI::yqApp()->currentFont() ); - + YRadioButton::setUseBoldFont( useBold ); } Modified: branches/tmp/coolo/qt4-port/src/YQRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQRich… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQRichText.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQRichText.cc Fri Nov 30 13:18:22 2007 @@ -16,10 +16,12 @@ /-*/ +#define QT3_SUPPORT #define y2log_component "qt-ui" #include <ycp/y2log.h> +#include <QColorGroup> #include <qtextbrowser.h> #include <qscrollbar.h> #include <qregexp.h> Modified: branches/tmp/coolo/qt4-port/src/YQSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQSele… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQSelectionBox.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQSelectionBox.cc Fri Nov 30 13:18:22 2007 @@ -16,6 +16,7 @@ /-*/ +#define QT3_SUPPORT #include <qstring.h> #include <qlabel.h> @@ -187,7 +188,7 @@ int YQSelectionBox::preferredWidth() { - int hintWidth = _caption->isShown() ? + int hintWidth = !_caption->isHidden() ? _caption->sizeHint().width() + frameWidth() : 0; return max( 80, hintWidth ); @@ -196,7 +197,7 @@ int YQSelectionBox::preferredHeight() { - int hintHeight = _caption->isShown() ? _caption->sizeHint().height() : 0; + int hintHeight = !_caption->isHidden() ? _caption->sizeHint().height() : 0; int visibleLines = shrinkable() ? SHRINKABLE_VISIBLE_LINES : DEFAULT_VISIBLE_LINES; hintHeight += visibleLines * _qt_listBox->fontMetrics().lineSpacing(); hintHeight += _qt_listBox->frameWidth() * 2; @@ -316,7 +317,8 @@ void YQSelectionBox::returnDelayed() { y2debug( "Starting selbox timer" ); - _timer.start( 250, true ); // millisec, singleShot + _timer.setSingleShot( true ); + _timer.start( 250 ); // millisec } Modified: branches/tmp/coolo/qt4-port/src/YQSlider.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQSlid… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQSlider.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQSlider.cc Fri Nov 30 13:18:22 2007 @@ -16,7 +16,7 @@ /-*/ - +#define QT3_SUPPORT #include <qslider.h> #include <qspinbox.h> #include <qlabel.h> @@ -54,7 +54,7 @@ _caption = new YQWidgetCaption( this, label ); YUI_CHECK_NEW( _caption ); layout->addWidget( _caption ); - + _hbox = new QFrame( this ); YUI_CHECK_NEW( _hbox ); layout->addWidget( _hbox ); @@ -76,7 +76,7 @@ { _caption->setAlignment( Qt::AlignRight ); } - + _qt_slider = new QSlider( minValue, maxValue, 1, // pageStep initialValue, @@ -92,7 +92,7 @@ layout->addWidget( _qt_spinBox ); } YUI_CHECK_NEW( _qt_spinBox ); - + _qt_spinBox->setValue( initialValue ); _caption->setBuddy( _qt_spinBox ); @@ -137,7 +137,7 @@ { if ( notify() ) YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::ValueChanged ) ); - + emit valueChanged( newValue ); } @@ -155,8 +155,8 @@ int YQSlider::preferredWidth() { - int hintWidth = _caption->isShown() ? _caption->sizeHint().width() : 0; - + int hintWidth = !_caption->isHidden() ? _caption->sizeHint().width() : 0; + // Arbitrary value - there is no really good default return max( 200, hintWidth ); } Modified: branches/tmp/coolo/qt4-port/src/YQTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQTabl… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQTable.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQTable.cc Fri Nov 30 13:18:22 2007 @@ -56,7 +56,7 @@ { //FIXME _qt_listView->addColumn( fromUTF8( header( i ) ) ); - int qt_alignment = Qt::Left; + int qt_alignment = Qt::AlignLeft; switch ( alignment( i ) ) { Modified: branches/tmp/coolo/qt4-port/src/YQTree.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQTree… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQTree.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQTree.cc Fri Nov 30 13:18:22 2007 @@ -16,7 +16,8 @@ /-*/ - +#define QT3_SUPPORT +#include <QColorGroup> #include <q3header.h> #include <qlabel.h> #include <q3vbox.h> @@ -213,7 +214,7 @@ int YQTree::preferredWidth() { - int hintWidth = _caption->isShown() ? _caption->sizeHint().width() : 0; + int hintWidth = !_caption->isHidden() ? _caption->sizeHint().width() : 0; return max( 200, hintWidth ); } @@ -223,7 +224,7 @@ // 300 is an arbitrary value. Use a MinSize or MinHeight widget to set a // size that is useful for the application. - int hintHeight = _caption->isShown() ? _caption->sizeHint().height() : 0; + int hintHeight = !_caption->isHidden() ? _caption->sizeHint().height() : 0; return 300 + hintHeight; } Modified: branches/tmp/coolo/qt4-port/src/YQUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQUI_b… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQUI_builtins.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQUI_builtins.cc Fri Nov 30 13:18:22 2007 @@ -17,6 +17,7 @@ Textdomain "packages-qt" /-*/ +#define QT3_SUPPORT #define USE_QT_CURSORS 1 #define FORCE_UNICODE_FONT 0 Modified: branches/tmp/coolo/qt4-port/src/YQUI_core.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQUI_c… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQUI_core.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQUI_core.cc Fri Nov 30 13:18:22 2007 @@ -16,6 +16,7 @@ /-*/ +#define QT3_SUPPORT #include <rpc/types.h> // MAXHOSTNAMELEN #include <dlfcn.h> #include <libintl.h> Modified: branches/tmp/coolo/qt4-port/src/YQUI_widgets.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQUI_w… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQUI_widgets.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQUI_widgets.cc Fri Nov 30 13:18:22 2007 @@ -15,6 +15,7 @@ Author: Stefan Hundhammer <sh(a)suse.de> /-*/ +#define QT3_SUPPORT #define y2log_component "qt-ui" #include <ycp/y2log.h> Modified: branches/tmp/coolo/qt4-port/src/YQUI_x11.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQUI_x… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQUI_x11.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQUI_x11.cc Fri Nov 30 13:18:22 2007 @@ -18,7 +18,7 @@ /-*/ - +#define QT3_SUPPORT #include <qevent.h> #include <qcursor.h> #include <q3widgetstack.h> @@ -28,6 +28,7 @@ #include <qregexp.h> #include <qlocale.h> #include <qmessagebox.h> +#include <QColorGroup> #include <QtGui/qdesktopwidget.h> @@ -316,7 +317,7 @@ if ( button == QMessageBox::Yes ) { - const char * command = + const char * command = _leftHandedMouse ? "xmodmap -e \"pointer = 1 2 3\"": // switch back to right-handed mouse "xmodmap -e \"pointer = 3 2 1\""; // switch to left-handed mouse @@ -324,7 +325,7 @@ _leftHandedMouse = ! _leftHandedMouse; // might be set repeatedly! _askedForLeftHandedMouse = false; // give the user a chance to switch back y2milestone( "Switching mouse buttons: %s", command ); - + system( command ); } else if ( button == 1 ) // No Modified: branches/tmp/coolo/qt4-port/src/YQWidgetCaption.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQWidg… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQWidgetCaption.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQWidgetCaption.cc Fri Nov 30 13:18:22 2007 @@ -76,12 +76,12 @@ { if ( textIsEmpty ) { - if ( isShown() ) + if ( !isHidden() ) hide(); } else { - if ( ! isShown() ) + if ( isHidden() ) show(); } } Modified: branches/tmp/coolo/qt4-port/src/YQWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQWidg… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQWidgetFactory.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQWidgetFactory.cc Fri Nov 30 13:18:22 2007 @@ -16,7 +16,8 @@ /-*/ - +#define QT3_SUPPORT +#include <QColorGroup> #include "YQWidgetFactory.h" #include "YQUI.h" #include "YUIException.h" @@ -223,7 +224,7 @@ { YQIntField * intField = new YQIntField( parent, label, minVal, maxVal, initialVal ); YUI_CHECK_NEW( intField ); - + return intField; } Modified: branches/tmp/coolo/qt4-port/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQWiza… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQWizard.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQWizard.cc Fri Nov 30 13:18:22 2007 @@ -18,6 +18,7 @@ /-*/ +#define QT3_SUPPORT #include "YQWizard.h" #define y2log_component "qt-wizard" @@ -1788,7 +1789,7 @@ void YQWizard::hideReleaseNotesButton() { - if ( _releaseNotesButton && _releaseNotesButton->isShown() ) + if ( _releaseNotesButton && !_releaseNotesButton->isHidden() ) _releaseNotesButton->hide(); } Modified: branches/tmp/coolo/qt4-port/src/YQWizardButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQWiza… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQWizardButton.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQWizardButton.cc Fri Nov 30 13:18:22 2007 @@ -36,14 +36,14 @@ { QPushButton * button = new QPushButton( fromUTF8( label ), buttonParent ); Q_CHECK_PTR( button ); - + setQPushButton( button ); setWidgetRep( button ); connect( button, SIGNAL( clicked() ), this, SIGNAL( clicked() ) ); - + // This widget itself will never be visible, only its button - which is not // a child of this widget. QWidget::hide(); @@ -74,7 +74,7 @@ bool YQWizardButton::isShown() const { if ( qPushButton() ) - return qPushButton()->isShown(); + return !qPushButton()->isHidden(); else return false; } @@ -90,7 +90,7 @@ { // This widget doesn't have a YWidget-based visual representation, it's // only a YWidget for shortcut checking etc. - + return 0; } @@ -99,7 +99,7 @@ { // This widget doesn't have a YWidget-based visual representation, it's // only a YWidget for shortcut checking etc. - + return 0; } Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgDiskUsageList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgDiskUsageList.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgDiskUsageList.cc Fri Nov 30 13:18:22 2007 @@ -18,6 +18,7 @@ /-*/ +#define QT3_SUPPORT #define y2log_component "qt-pkg" #include <ycp/y2log.h> Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgObjList.h Fri Nov 30 13:18:22 2007 @@ -58,6 +58,8 @@ **/ virtual ~YQPkgObjList(); + // avoiding warning about virtuals + using QTreeView::selectionChanged; public: @@ -249,7 +251,6 @@ **/ virtual void selectionChangedInternal( QTreeWidgetItem * item ); - signals: Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchList.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgPatchList.h Fri Nov 30 13:18:22 2007 @@ -24,6 +24,7 @@ #include "YQPkgObjList.h" #include "YQPkgSelMapper.h" //Added by qt3to4: +#include <Q3ListViewItem> #include <qevent.h> #include <q3popupmenu.h> Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgRepoList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgRepoList.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgRepoList.cc Fri Nov 30 13:18:22 2007 @@ -26,6 +26,7 @@ #include <ycp/y2log.h> #include <zypp/RepoManager.h> +#include <Q3ListView> #include "YQPkgRepoList.h" #include "YQi18n.h" #include "utf8.h" @@ -243,7 +244,7 @@ if ( urlCol() >= 0 ) { zypp::Url repoUrl; - + if ( ! repo.info().baseUrlsEmpty() ) repoUrl = *repo.info().baseUrlsBegin(); Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgVersionsView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgVersionsView.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgVersionsView.h Fri Nov 30 13:18:22 2007 @@ -22,7 +22,7 @@ #include "QY2ListView.h" #include "YQZypp.h" - +#include <Q3ListViewItem> class QTabWidget; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42551 - /trunk/ncurses/src/pkg/NCPkgPopupDeps.cc
by sh-sh-sh＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: sh-sh-sh Date: Fri Nov 30 12:28:03 2007 New Revision: 42551 URL: http://svn.opensuse.org/viewcvs/yast?rev=42551&view=rev Log: Exchanged outdated (and now no longer existing) way to replace items with the newer (and much simpler) way. PLEASE TEST Modified: trunk/ncurses/src/pkg/NCPkgPopupDeps.cc Modified: trunk/ncurses/src/pkg/NCPkgPopupDeps.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgPopupDeps.c… ============================================================================== --- trunk/ncurses/src/pkg/NCPkgPopupDeps.cc (original) +++ trunk/ncurses/src/pkg/NCPkgPopupDeps.cc Fri Nov 30 12:28:03 2007 @@ -299,14 +299,15 @@ return false; unsigned int size = problems.size (); - solutionw->clearItems (); if ( index < 0 || (unsigned int)index >= size ) return false; - YCPList items; - - + solutionw->startMultipleChanges(); +#warning FIXME: is this necessary if the next step is deleteAllItems()? + solutionw->clearItems (); + solutionw->deleteAllItems(); + zypp::ResolverProblem_Ptr problem = problems[index].first; zypp::ProblemSolution_Ptr user_solution = problems[index].second; @@ -322,15 +323,14 @@ UIMIL << " SOL " << (*ii)->description () << endl; UIMIL << " : " << (*ii)->details () << endl; - YCPList termargs; - termargs->add (YCPString ((*ii)->description ())); // label - termargs->add (YCPBoolean (user_solution == *ii)); // selected + solutionw->addItem( new YItem ( (*ii)->description(), // label + (user_solution == *ii) ) ); // selected + UIMIL << "usr: " << user_solution << " cur: " << *ii << endl; - - items->add (YCPTerm (YUISymbol_item, termargs)); } - solutionw->changeWidget (YCPSymbol (YUIProperty_Items), - items); + + solutionw->doneMultipleChanges(); + return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42550 - /trunk/ncurses/src/pkg/NCPackageSelector.cc
by sh-sh-sh＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: sh-sh-sh Date: Fri Nov 30 12:27:06 2007 New Revision: 42550 URL: http://svn.opensuse.org/viewcvs/yast?rev=42550&view=rev Log: Removed #warning about disabled milestone logging: Only adds to gcc warnings, and nobody seemed to be interested in this logging for months anyway Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelecto… ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.cc (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.cc Fri Nov 30 12:27:06 2007 @@ -3111,8 +3111,6 @@ zypp::ByteCount diff = 0; for (it = b; it != e; ++it) { -#warning gcc complains here - disabled milestone logging for now - // UIMIL << *it << endl; diff += (it->pkg_size - it->used_size) * 1024; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42549 - /trunk/ncurses/src/NCWidget.cc
by sh-sh-sh＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: sh-sh-sh Date: Fri Nov 30 12:25:43 2007 New Revision: 42549 URL: http://svn.opensuse.org/viewcvs/yast?rev=42549&view=rev Log: YContainerWidget is now completely gone Modified: trunk/ncurses/src/NCWidget.cc Modified: trunk/ncurses/src/NCWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCWidget.cc?rev=4254… ============================================================================== --- trunk/ncurses/src/NCWidget.cc (original) +++ trunk/ncurses/src/NCWidget.cc Fri Nov 30 12:25:43 2007 @@ -22,7 +22,6 @@ #include "tnode.h" #include "NCWidget.h" #include "YWidget.h" -#include "YContainerWidget.h" //#if 0 #undef DBG_CLASS -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42548 - /trunk/ncurses/src/NCPushButton.cc
by sh-sh-sh＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: sh-sh-sh Date: Fri Nov 30 12:25:25 2007 New Revision: 42548 URL: http://svn.opensuse.org/viewcvs/yast?rev=42548&view=rev Log: removed cruft (gcc complains about unused var - and is perfectly right) Modified: trunk/ncurses/src/NCPushButton.cc Modified: trunk/ncurses/src/NCPushButton.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPushButton.cc?rev=… ============================================================================== --- trunk/ncurses/src/NCPushButton.cc (original) +++ trunk/ncurses/src/NCPushButton.cc Fri Nov 30 12:25:25 2007 @@ -62,7 +62,6 @@ int NCPushButton::preferredWidth() { wsze defsize = wGetDefsze(); - int width = defsize.W; return wGetDefsze().W; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42547 - /trunk/ncurses/src/NCMultiSelectionBox.h
by sh-sh-sh＠svn.opensuse.org 30 Nov '07

30 Nov '07

Author: sh-sh-sh Date: Fri Nov 30 12:25:05 2007 New Revision: 42547 URL: http://svn.opensuse.org/viewcvs/yast?rev=42547&view=rev Log: Don't make all the methods that make up that widget's functionality unaccessible by making them protected Modified: trunk/ncurses/src/NCMultiSelectionBox.h Modified: trunk/ncurses/src/NCMultiSelectionBox.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCMultiSelectionBox.… ============================================================================== --- trunk/ncurses/src/NCMultiSelectionBox.h (original) +++ trunk/ncurses/src/NCMultiSelectionBox.h Fri Nov 30 12:25:05 2007 @@ -102,18 +102,13 @@ void toggleCurrentItem(); - protected: + public: virtual void startMultipleChanges() { startMultidraw(); } virtual void doneMultipleChanges() { stopMultidraw(); } - protected: - virtual const char * location() const { return "NCMultiSelectionBox"; } - virtual NCPad * CreatePad(); - virtual void wRecoded(); - virtual void addItem( YItem * item ); virtual void deleteAllItems(); @@ -122,6 +117,11 @@ virtual void deselectAllItems(); + protected: + + virtual NCPad * CreatePad(); + virtual void wRecoded(); + public: -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0