November 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41936 - /trunk/devtools/devtools/bin/gen_logic_deps_nodes
by locilka＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: locilka Date: Fri Nov 9 16:30:00 2007 New Revision: 41936 URL: http://svn.opensuse.org/viewcvs/yast?rev=41936&view=rev Log: Added TODO Modified: trunk/devtools/devtools/bin/gen_logic_deps_nodes Modified: trunk/devtools/devtools/bin/gen_logic_deps_nodes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/gen_logic_… ============================================================================== --- trunk/devtools/devtools/bin/gen_logic_deps_nodes (original) +++ trunk/devtools/devtools/bin/gen_logic_deps_nodes Fri Nov 9 16:30:00 2007 @@ -25,6 +25,9 @@ # --> Testing.txt # --> Testing.png # +# ==TODO== +# Nicer 'regexptouse' :)? +# USE_FILE=$1 -- 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] r41935 - in /trunk/devtools: VERSION devtools/bin/Makefile.am devtools/bin/gen_logic_deps devtools/bin/gen_logic_deps_nodes package/yast2-devtools.changes
by locilka＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: locilka Date: Fri Nov 9 16:29:19 2007 New Revision: 41935 URL: http://svn.opensuse.org/viewcvs/yast?rev=41935&view=rev Log: - Added new gen_logic_deps script for generating dependency graphs. - Added new gen_logic_deps_nodes script for picking up just nodes we are interested in. - 2.16.2 Added: trunk/devtools/devtools/bin/gen_logic_deps (with props) trunk/devtools/devtools/bin/gen_logic_deps_nodes (with props) Modified: trunk/devtools/VERSION trunk/devtools/devtools/bin/Makefile.am trunk/devtools/package/yast2-devtools.changes Modified: trunk/devtools/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/VERSION?rev=41935&r1=41… ============================================================================== --- trunk/devtools/VERSION (original) +++ trunk/devtools/VERSION Fri Nov 9 16:29:19 2007 @@ -1 +1 @@ -2.16.1 +2.16.2 Modified: trunk/devtools/devtools/bin/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/Makefile.a… ============================================================================== --- trunk/devtools/devtools/bin/Makefile.am (original) +++ trunk/devtools/devtools/bin/Makefile.am Fri Nov 9 16:29:19 2007 @@ -29,7 +29,9 @@ y2makeall \ y2makepot \ check_icons \ - check_deps + check_deps \ + gen_logic_deps \ + gen_logic_deps_nodes EXTRA_DIST = $(bin_SCRIPTS) $(ybin_SCRIPTS) $(pkgdata_SCRIPTS) version.in Added: trunk/devtools/devtools/bin/gen_logic_deps URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/gen_logic_… ============================================================================== --- trunk/devtools/devtools/bin/gen_logic_deps (added) +++ trunk/devtools/devtools/bin/gen_logic_deps Fri Nov 9 16:29:19 2007 @@ -0,0 +1,172 @@ +#!/usr/bin/perl -w + +# +# ==Authors== +# Lukas Ocilka <locilka(a)suse.cz> +# +# ==About== +# Script generates all logic dependencies between YaST modules. +# It uses another script from devtools 'check_deps'. +# This script needs to be called in the root of YaST SVN because +# directories are used for generating RPM names. +# +# Script generates input file for 'dot' program (/usr/bin/dot, graphviz.rpm) +# +# ==Usage== +# cd /...../source/; # copy of YaST trunk or any branch +# /usr/share/YaST2/data/devtools/bin/gen_logic_deps [rpm_root [show_base]] > dot-in.txt +# dot -Tpng -oGraph.png dot-in.txt +# display Graph.png +# +# ==Examples== +# * /usr/share/YaST2/data/devtools/bin/gen_logic_deps > dot-in.txt +# - uses "/" as a default --root for RPM queries +# - doesn't include yast2.rpm +# +# * /usr/share/YaST2/data/devtools/bin/gen_logic_deps / yes > dot-in.txt +# - uses "/" as a default --root for RPM queries +# - includes yast2.rpm in the output +# +# ==Output== +# digraph "YaST RPM dependencies" { +# [...] +# "yast2-repair (0)" -> "yast2 (81)" [ color="black" ] +# "yast2-repair (0)" -> "yast2-bootloader (9)" [ color="black" ] +# "yast2-repair (0)" -> "yast2-storage (13)" [ color="black" ] +# [...] +# } +# +# And what does it mean :)? +# * 'yast2-repair' requires 'yast2' +# * 'yast2-repair' requires 'yast2-bootloader' +# * 'yast2-repair' requires 'yast2-storage' +# * 'yast2' is required by 81 YaST RPMs +# * 'yast2-bootloader' is requierd by 9 YaST RPMs +# * 'yast2-storage' is requierd by 13 YaST RPMs +# * 'yast2-repair' is not required by any YaST RPM +# + +# change this for debugging purpose, scripts exists after checking 'n' directories +my $max_dirs_at_once = 9999; + +my $wd = `pwd`; +chop $wd; +warn "Working dir: '".$wd."'\n"; + +# RPM-root, first commandline parameter or "/" +my $root = $ARGV[0] || "/"; + +# Show yast2.rpm-related deps, second commandline parameter, default false +# anything == true +$show_base = 0; +if (defined $ARGV[1]) { + $show_base = 1; +} + +warn "Root: ".$root."\n"; + +$reqrpms = {}; + +my $rpms_of_files = {}; + +# how many times is a package required +my $all_RPM_req = {}; + +sub CheckDir ($) { + my $dir = shift; + + my $RPM_deps = {}; + + my $lines_s = `cd $wd/$dir; /usr/share/YaST2/data/devtools/bin/check_deps . . '$root'`; + + # try to imagine the RPM name + if ($dir =~ /autoinstallation/) { + $dir = "autoyast2-installation"; + } elsif ($dir =~ /autoyast2/) { + $dir = "autoyast2"; + } elsif ($dir eq "yast2") { + $dir = "yast2"; + } else { + $dir = 'yast2-'.$dir; + } + + warn "\tIdentified as: ".$dir."\n"; + + my @lines = split (/\n/, $lines_s); + foreach my $line (@lines) { + next if ($line !~ /^([^ \t]+)[ \t]+File: (.*)$/); + + my $yast_rpm = $1; + my $yast_module = $2; + + ### do not report dependency on yast2.rpm + ### if not explicitely requested + next if ($show_base == 0 && $yast_rpm eq 'yast2'); + ### do not report itself + next if ($yast_rpm eq $dir); + + push @{$reqrpms->{$yast_rpm}}, $dir; + + $RPM_deps->{$yast_rpm} = 1; + } + + foreach my $key (keys (%{$RPM_deps})) { + warn "\t* RPM ".$dir." requires ".$key."\n"; + if (! defined $all_RPM_req->{$key}) { + $all_RPM_req->{$key} = 0; + } + ++$all_RPM_req->{$key}; + } +} + +opendir (DIR, $wd) || do { + warn "Cannot open directory ".$wd.": ".$!; + exit 2; +}; + +foreach my $dir (readdir (DIR)) { + # not a directory + next if (! -d $dir); + next if ($dir =~ /^\./); + # blacklist + next if ($dir =~ /^(qt|gtk|cim|xml|core|ncurses|pkg-bindings|liby2util|perl-bindings|packagemanager-test|devtools|ruby-bindings|y2pmsh)$/); + next if ($max_dirs_at_once <= 0); + --$max_dirs_at_once; + + warn "Checking dir: '".$dir."'\n"; + CheckDir ($dir); +} + +closedir (DIR); + +warn " \n"; +warn " \n"; + +my $print_it_arrows = {}; +my $print_key = ""; + +sub HowManyTimesRequired ($) { + my $rpm = shift || ""; + + if (! defined $all_RPM_req->{$rpm}) { + return 0; + } else { + return $all_RPM_req->{$rpm}; + } +} + +foreach my $key (sort ({@{$reqrpms->{$b}} <=> @{$reqrpms->{$a}}} keys %{$reqrpms})) { + foreach my $module (sort {$a cmp $b} (@{$reqrpms->{$key}})) { + $print_it_arrows->{"\t\"".$module." (".HowManyTimesRequired($module).")\" -> \"".$key." (".HowManyTimesRequired($key).")\" [ color=\"black\" ]\n"} = 1; + } +} + +print "digraph \"YaST RPM dependencies\" {\n\n"; + +foreach my $key (sort {$a cmp $b} (keys %{$print_it_arrows})) { + print $key; +} + +print "\n}\n"; + +exit 0; \ No newline at end of file Added: trunk/devtools/devtools/bin/gen_logic_deps_nodes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/gen_logic_… ============================================================================== --- trunk/devtools/devtools/bin/gen_logic_deps_nodes (added) +++ trunk/devtools/devtools/bin/gen_logic_deps_nodes Fri Nov 9 16:29:19 2007 @@ -0,0 +1,70 @@ +#!/bin/bash + +# ==Authors== +# Lukas Ocilka <locilka(a)suse.cz> +# +# ==About== +# A very simple script for getting only those dependency-nodes we are +# interested in. It uses output of another script 'gen_logic_deps' +# as its input. Greps nodes and generates a PNG graph. +# +# ==Usage== +# ./gen_logic_deps_nodes file_to_read regexptouse file_to_write [without_zero_deps] +# +# * file_to_read - output from 'gen_logic_deps' script +# * regexptouse - part of 'sed' regexp :) e.g., "yast2-network\|yast2-country" +# * file_to_write - script creates thise files ${file_to_write}.txt, ${file_to_write}.png +# * without_zero_deps - if defined nodes with (0) are not visible +# +# ==Examples== +# /usr/share/YaST2/data/devtools/bin/gen_logic_deps_nodes dot-in.txt "yast2-country" Testing +# --> Testing.txt +# --> Testing.png +# +# /usr/share/YaST2/data/devtools/bin/gen_logic_deps_nodes dot-in.txt "yast2-country" Testing without +# --> Testing.txt +# --> Testing.png +# + +USE_FILE=$1 + +NODES_INCLUDED=$2 + +SAVE_TO_FILE=$3 + +GREP_ZERODEPS=$4 + +if [ "${USE_FILE}" == "" ]; then + echo "No input file defined"; + exit 1; +else + echo "Using file: "${USE_FILE} +fi + +if [ "${NODES_INCLUDED}" == "" ]; then + echo "No nodes defined"; + exit 1; +else + echo "Using nodes: "${NODES_INCLUDED} +fi + +if [ "${SAVE_TO_FILE}" == "" ]; then + echo "No file to save to defined"; + exit 1; +else + echo "Writing to: "${SAVE_TO_FILE}.txt +fi + +echo +echo "grep command: >>>${\|}\|${NODES_INCLUDED}$<<<"; + +if [ "${GREP_ZERODEPS}" == "" ]; then + grep "${\|}\|${NODES_INCLUDED}$" ${USE_FILE} > ${SAVE_TO_FILE}.txt; +else + echo "Grepping out zero-deps"; + grep "${\|}\|${NODES_INCLUDED}$" ${USE_FILE} | grep -v "(0)" > ${SAVE_TO_FILE}.txt; +fi + +echo +echo "See ${SAVE_TO_FILE}.png file" +dot -Tpng -o${SAVE_TO_FILE}.png ${SAVE_TO_FILE}.txt Modified: trunk/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.… ============================================================================== --- trunk/devtools/package/yast2-devtools.changes (original) +++ trunk/devtools/package/yast2-devtools.changes Fri Nov 9 16:29:19 2007 @@ -1,8 +1,12 @@ ------------------------------------------------------------------- Fri Nov 9 11:10:19 CET 2007 - locilka(a)suse.cz -- Addded new check_deps script for basic checking of imported +- Added new check_deps script for basic checking of imported YCP or Perl (YaST) modules. +- Added new gen_logic_deps script for generating dependency graphs. +- Added new gen_logic_deps_nodes script for picking up just nodes + we are interested in. +- 2.16.2 ------------------------------------------------------------------- Wed Oct 10 14:34:01 CEST 2007 - mvidner(a)suse.cz -- 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] r41934 - in /branches/tmp/sh/mod-ui: core/libyui/src/ qt/src/
by sh-sh-sh＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: sh-sh-sh Date: Fri Nov 9 16:07:11 2007 New Revision: 41934 URL: http://svn.opensuse.org/viewcvs/yast?rev=41934&view=rev Log: ported YQBarGraph Added: branches/tmp/sh/mod-ui/core/libyui/src/YColor.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am branches/tmp/sh/mod-ui/core/libyui/src/YBarGraph.cc branches/tmp/sh/mod-ui/core/libyui/src/YBarGraph.h branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.cc branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.h branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.h branches/tmp/sh/mod-ui/core/libyui/src/YOptionalWidgetFactory.cc branches/tmp/sh/mod-ui/core/libyui/src/YOptionalWidgetFactory.h branches/tmp/sh/mod-ui/core/libyui/src/YUI.h branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc branches/tmp/sh/mod-ui/core/libyui/src/YUI_special_widgets.cc branches/tmp/sh/mod-ui/qt/src/YQBarGraph.cc branches/tmp/sh/mod-ui/qt/src/YQBarGraph.h branches/tmp/sh/mod-ui/qt/src/YQOptionalWidgetFactory.cc branches/tmp/sh/mod-ui/qt/src/YQOptionalWidgetFactory.h branches/tmp/sh/mod-ui/qt/src/YQUI.h branches/tmp/sh/mod-ui/qt/src/YQUI_widgets.cc Modified: branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog Fri Nov 9 16:07:11 2007 @@ -404,3 +404,17 @@ * Renamed YTime -> YTimeField * Renamed YDate -> YDateField + +* Ported YTimeField +* Ported YDateField + + +2007-11-06 sh(a)suse.de + +* Ported default function key handling + + +2007-11-09 sh(a)suse.de + +* Ported YBarGraph + Modified: branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am Fri Nov 9 16:07:11 2007 @@ -98,6 +98,7 @@ Y2CCUI.h \ YApplication.h \ YBothDim.h \ + YColor.h \ YCPDialogParser.h \ YCPItem.h \ YCPItemParser.h \ Modified: branches/tmp/sh/mod-ui/core/libyui/src/YBarGraph.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YBarGraph.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YBarGraph.cc Fri Nov 9 16:07:11 2007 @@ -20,25 +20,241 @@ #include <stdio.h> #define y2log_component "ui" -#include <stdio.h> #include <ycp/y2log.h> -#include <ycp/YCPInteger.h> -#include <ycp/YCPList.h> -#include <ycp/YCPString.h> -#include <ycp/YCPSymbol.h> -#include <ycp/YCPBoolean.h> #include "YUISymbols.h" #include "YBarGraph.h" +#define CHECK_INDEX(index) \ + do \ + { \ + if ( (index) < 0 || \ + (index) >= (int) priv->segments.size() ) \ + { \ + YUI_THROW( YUIIndexOutOfRangeException( \ + (index), /* current */ \ + 0, /* min */ \ + (int) priv->segments.size() - 1 ) ); /* max */ \ + } \ + } while( 0 ) + + + +struct YBarGraphPrivate +{ + YBarGraphPrivate() + : updatesPending( false ) + , postponeUpdates( false ) + {} + + vector<YBarGraphSegment> segments; + bool updatesPending; + bool postponeUpdates; +}; + + -YBarGraph::YBarGraph( const YWidgetOpt & opt ) - :YWidget( opt ) + +YBarGraph::YBarGraph( YWidget * parent ) + :YWidget( parent ) + , priv( new YBarGraphPrivate() ) { + YUI_CHECK_NEW( priv ); setDefaultStretchable( YD_HORIZ, true ); } +YBarGraph::~YBarGraph() +{ + // NOP +} + + +void +YBarGraph::updateDisplay() +{ + priv->updatesPending = true; + + if ( ! priv->postponeUpdates ) + { + doUpdate(); + priv->updatesPending = false; + } +} + + +void +YBarGraph::addSegment( const YBarGraphSegment & segment ) +{ + priv->segments.push_back( segment ); + updateDisplay(); +} + + +void +YBarGraph::deleteAllSegments() +{ + priv->segments.clear(); + updateDisplay(); +} + + +const YBarGraphSegment & +YBarGraph::segment( int segmentIndex ) const +{ + CHECK_INDEX( segmentIndex ); + + return priv->segments[ segmentIndex ]; +} + + +int +YBarGraph::segments() +{ + return (int) priv->segments.size(); +} + + +void +YBarGraph::setValue( int segmentIndex, int newValue ) +{ + CHECK_INDEX( segmentIndex ); + + priv->segments[ segmentIndex ].setValue( newValue ); + updateDisplay(); +} + + +void +YBarGraph::setLabel( int segmentIndex, const string & newLabel ) +{ + CHECK_INDEX( segmentIndex ); + + priv->segments[ segmentIndex ].setLabel( newLabel ); + updateDisplay(); +} + + +void +YBarGraph::setSegmentColor( int segmentIndex, const YColor & color ) +{ + CHECK_INDEX( segmentIndex ); + + if ( color.isUndefined() ) + YUI_THROW( YUIException( "Invalid YColor" ) ); + + priv->segments[ segmentIndex ].setSegmentColor( color ); + updateDisplay(); +} + + +void +YBarGraph::setTextColor( int segmentIndex, const YColor & color ) +{ + CHECK_INDEX( segmentIndex ); + + if ( color.isUndefined() ) + YUI_THROW( YUIException( "Invalid YColor" ) ); + + priv->segments[ segmentIndex ].setTextColor( color ); + updateDisplay(); +} + + +const YPropertySet & +YBarGraph::propertySet() +{ + static YPropertySet propSet; + + if ( propSet.isEmpty() ) + { + /* + * @property list<integer> Values The numerical value for each segment. + * @property list<string> Labels Text label for each segment ('\n' allowed). + * Use %1 as a placeholder for the current value. + */ + propSet.add( YProperty( YUIProperty_Values, YOtherProperty ) ); + propSet.add( YProperty( YUIProperty_Labels, YOtherProperty ) ); + propSet.add( YWidget::propertySet() ); + } + + return propSet; +} + + +bool +YBarGraph::setProperty( const string & propertyName, const YPropertyValue & val ) +{ + propertySet().check( propertyName, val.type() ); // throws exceptions if not found or type mismatch + + if ( propertyName == YUIProperty_Values ) return false; // Needs special handling + else if ( propertyName == YUIProperty_Labels ) return false; // Needs special handling + else + { + YWidget::setProperty( propertyName, val ); + } + + return true; // success -- no special handling necessary +} + + +YPropertyValue +YBarGraph::getProperty( const string & propertyName ) +{ + propertySet().check( propertyName ); // throws exceptions if not found + + if ( propertyName == YUIProperty_Values ) return YPropertyValue( YOtherProperty ); + else if ( propertyName == YUIProperty_Labels ) return YPropertyValue( YOtherProperty ); + else + { + return YWidget::getProperty( propertyName ); + } +} + + + + +YBarGraphMultiUpdate::YBarGraphMultiUpdate( YBarGraph * barGraph ) + : _barGraph ( barGraph ) +{ + YUI_CHECK_PTR( barGraph ); + + _barGraph->priv->postponeUpdates = true; +} + + +YBarGraphMultiUpdate::~YBarGraphMultiUpdate() +{ + _barGraph->priv->postponeUpdates = false; + + if ( _barGraph->priv->updatesPending ) + _barGraph->updateDisplay(); +} + + + + + + + + + + + + + + + + + + + + + +#if 0 + + + YCPValue YBarGraph::changeWidget( const YCPSymbol & property, const YCPValue & newValue ) { string s = property->symbol(); @@ -90,57 +306,6 @@ } -int YBarGraph::segments() -{ - return _values.size(); -} - - -int YBarGraph::value( int n ) -{ - if ( n >= 0 && n < (int) _values.size() ) - { - return _values[n]; - } - else - { - y2error( "YBarGraph::value(): Invalid index %d ( 0 <= n <= %zd", - n, _values.size() ); - - return -1; - } -} - - -string YBarGraph::label( int n ) -{ - if ( n >= 0 && n < (int) _labels.size() ) - { - return _labels[n]; - } - else - { - if ( n >= 0 && n < (int) _values.size() ) - { - // If an existing segment doesn't have a label, use its value - // as fallback - - char buffer[ 20 ]; - sprintf( buffer, "%d", _values[n] ); - - return string( buffer ); - } - else - { - y2error( "YBarGraph::label(): Invalid index %d ( 0 <= n <= %zd", - n, _labels.size() ); - } - - return string(); - } -} - - void YBarGraph::parseValuesList( const YCPList & newVal ) { @@ -207,13 +372,4 @@ } -/* - * Default update method - does nothing. - * Overwrite this to do the actual visual update. - */ - -void YBarGraph::doUpdate() -{ - // NOP -} - +#endif Modified: branches/tmp/sh/mod-ui/core/libyui/src/YBarGraph.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YBarGraph.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YBarGraph.h Fri Nov 9 16:07:11 2007 @@ -19,73 +19,295 @@ #ifndef YBarGraph_h #define YBarGraph_h -#include <ycp/YCPList.h> #include "YWidget.h" +#include "YColor.h" + + +class YBarGraphPrivate; +class YBarGraphSegment; class YBarGraph : public YWidget { + friend class YBarGraphMultiUpdate; + protected: /** - * Constructor + * Constructor. **/ - YBarGraph( const YWidgetOpt & opt ); - + YBarGraph( YWidget * parent ); public: /** - * Returns a descriptive name of this widget class for logging, + * Destructor. + **/ + virtual ~YBarGraph(); + + /** + * Return a descriptive name of this widget class for logging, * debugging etc. **/ virtual const char * widgetClass() const { return "YBarGraph"; } /** - * Returns the current number of bar segments, i.e. the nuber of values. + * Add one segment. + * + * If the segment's background and text colors are not explicitly + * specified, the YBarGraph widget will assign them from a list of (at + * least 5 different) color sets. + * + * When adding multiple segments, use a YBarGraphMultiUpdate object for + * improved performance to hold back display updates until all segments are + * added. + **/ + void addSegment( const YBarGraphSegment & segment ); + + /** + * Delete all segments. + **/ + void deleteAllSegments(); + + /** + * Return the current number of segments. **/ int segments(); /** - * Returns the value of segment no. n - * or -1 if there are not that many segments. + * Return the segment with the specified index (from 0 on). + * + * This will throw an exception if there are not this many segments. + **/ + const YBarGraphSegment & segment( int segmentIndex ) const; + + /** + * Set the value of the segment with the specifie index (from 0 on). + * + * This will throw an exception if there are not this many segments. + * + * Note: Use a YBarGraphMultiUpdate object for improved performance + * when doing multiple changes at the same time. **/ - int value( int n ); + void setValue( int segmentIndex, int newValue ); /** - * Returns the label of segment no. n - * or an empty string if there are not that many segments - * or the specified segment doesn't have a label. + * Set the label of the segment with the specified index (from 0 on). + * Use %1 as a placeholder for the current value. + * + * This will throw an exception if there are not this many segments. + * + * Note: Use a YBarGraphMultiUpdate object for improved performance + * when doing multiple changes at the same time. **/ - string label( int n ); + void setLabel( int segmentIndex, const string & newLabel ); /** - * Parse and store new values. + * Set the background color of the segment with the specified index + * (from 0 on). + * + * This will throw an exception if there are not this many segments + * or if the color is undefined. **/ - void parseValuesList( const YCPList & newValues ); + void setSegmentColor( int segmentIndex, const YColor & color ); + /** + * Set the text color of the segment with the specified index + * (from 0 on). + * + * This will throw an exception if there are not this many segments + * or if the color is undefined. + **/ + void setTextColor( int segmentIndex, const YColor & color ); + + /** + * Set a property. + * Reimplemented from YWidget. + * + * This function may throw YUIPropertyExceptions. + * + * This function returns 'true' if the value was successfully set and + * 'false' if that value requires special handling (not in error cases: + * those are covered by exceptions). + **/ + virtual bool setProperty( const string & propertyName, + const YPropertyValue & val ); /** - * Parse and store new labels. + * Get a property. + * Reimplemented from YWidget. + * + * This method may throw YUIPropertyExceptions. **/ - void parseLabelsList( const YCPList & newLabels ); + virtual YPropertyValue getProperty( const string & propertyName ); /** - * Perform a display update after values and/or labels have changed. - * Overwrite this method and do your actual drawing here. + * Return this class's property set. + * This also initializes the property upon the first call. + * + * Reimplemented from YWidget. **/ - virtual void doUpdate(); + virtual const YPropertySet & propertySet(); + protected: + /** + * Perform a display update after any change to any of the segments. + * + * Derived classes are required to implement this. + **/ + virtual void doUpdate() = 0; + private: + /** + * Conditionally perform display update if not currently postponed. + **/ + void updateDisplay(); + + ImplPtr<YBarGraphPrivate> priv; +}; + + + + +/** + * Helper class to describe one segment of a YBarGraph. + **/ +class YBarGraphSegment +{ +public: + /** + * Constructor. + * + * 'value' is the initial value of this segment. + * + * 'label' is the label text in the segment. + * Use %1 as a placeholder for the current value. + * + * 'segmentColor' is the background color of this segment. + * + * 'textColor' is the color for the label text. + * + * The YBarGraph widget will automatically assign some default colors (one + * of at least 5 different ones) if none are specified. + **/ + YBarGraphSegment( int value = 0, + const string & label = string(), + const YColor & segmentColor = YColor(), + const YColor & textColor = YColor() ) + : _value( value ) + , _label( label ) + , _segmentColor( segmentColor ) + , _textColor( textColor ) + {} /** - * Set specific widget properties. - * Inherited from YWidget. + * Return the current value of this segment. **/ - YCPValue changeWidget( const YCPSymbol & property, const YCPValue & newValue ); + int value() const { return _value; } + + /** + * Set the value of this segment. + **/ + void setValue( int newValue ) { _value = newValue; } + + /** + * Return the current text label of this segment. + * Any %1 placeholder will be returned as %1 (not expanded). + **/ + string label() const { return _label; } + + /** + * Set the text label of this segment. + * Use %1 as a placeholder for the current value. + **/ + void setLabel( const string & newLabel ) { _label = newLabel; } + + /** + * Return the segment background color. + **/ + YColor segmentColor() const { return _segmentColor; } + + /** + * Return 'true' if this segment's background color is defined, + * i.e. it has a real RGB value and was not just created with the default + * constructor. + **/ + bool hasSegmentColor() const { return _segmentColor.isDefined(); } + + /** + * Set this segment's background color. + **/ + void setSegmentColor( const YColor & color ) { _segmentColor = color; } + + /** + * Return this segment's text color. + **/ + YColor textColor() const { return _textColor; } + + /** + * Return 'true' if this segment's text color is defined, + * i.e. it has a real RGB value and was not just created with the default + * constructor. + **/ + bool hasTextColor() const { return _textColor.isDefined(); } + + /** + * Set this segment's text color. + **/ + void setTextColor( const YColor & color ) { _textColor = color; } + + +private: + + int _value; + string _label; + YColor _segmentColor; + YColor _textColor; +}; + + + +/** + * Helper class for multiple updates to a YBarGraph widget: + * This will hold back display updates until this object goes out of scope. + **/ +class YBarGraphMultiUpdate +{ +public: + /** + * Constructor. + * + * This will make the corresponding YBarGraph widget hold back any + * pending display updates (due to changed values, labels, or colors) until + * this object is destroyed (goes out of scope). + * + * Create objects of this class on the stack (as local variables) and + * simply let them go out of scope. + * + * Example: + * + * { + * YBarGraphMultiUpdate multiUpdate( myBarGraph ); + * myBarGraph->setValue( 0, 42 ); // No display update yet + * myBarGraph->setValue( 1, 84 ); // No display update yet + * myBarGraph->setValue( 2, 21 ); // No display update yet + * + * } // multiUpdate goes out of scope, will trigger display update now + * + **/ + YBarGraphMultiUpdate( YBarGraph * barGraph ); + + /** + * Destructor. + * + * This will trigger display updates of the corresponding YBarGraph widget + * if any are necessary. + **/ + ~YBarGraphMultiUpdate(); + +private: - vector<int> _values; - vector<string> _labels; + YBarGraph * _barGraph; }; Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc Fri Nov 9 16:07:11 2007 @@ -2549,26 +2549,50 @@ } rejectAllOptions( term,optList ); - YBarGraph *barGraph; - if ( YUI::ui()->hasBarGraph() ) - { - barGraph = dynamic_cast <YBarGraph *> ( YUI::ui()->createBarGraph( parent, opt ) ); - assert( barGraph ); + YBarGraph * barGraph = YUI::optionalWidgetFactory()->createBarGraph( parent ); + YBarGraphMultiUpdate multiUpdate( barGraph ); // Hold back display updates + + YCPList valuesList = term->value( argnr )->asList(); + YCPList labelsList; + + if ( numArgs > 1 ) + labelsList = term->value( argnr+1 )->asList(); - barGraph->parseValuesList( term->value( argnr )->asList() ); + int segments = valuesList->size(); + + if ( labelsList->size() > segments ) + segments = labelsList->size(); + + for ( int i=0; i < segments; i++ ) + { + int value = 0; - if ( numArgs > 1 ) + if ( i < valuesList->size() ) { - barGraph->parseLabelsList( term->value( argnr+1 )->asList() ); + if ( valuesList->value(i)->isInteger() ) + value = valuesList->value(i)->asInteger()->value(); + else + { + ycperror( "YBarGraph value #%d should be integer, not %s", + i, valuesList->value(i)->toString().c_str() ); + } } - barGraph->doUpdate(); - } - else - { - y2error( "This UI does not support the BarGraph widget." ); - return 0; + string label; + + if ( i < labelsList->size() ) + { + if ( labelsList->value(i)->isString() ) + label = labelsList->value(i)->asString()->value(); + else + { + ycperror( "YBarGraph label #%d should be integer, not %s", + i, labelsList->value(i)->toString().c_str() ); + } + } + + barGraph->addSegment( YBarGraphSegment( value, label ) ); } return barGraph; Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.cc Fri Nov 9 16:07:11 2007 @@ -46,6 +46,7 @@ #include "YCPTreeItemWriter.h" #include "YCPValueWidgetID.h" +#include "YBarGraph.h" #include "YCheckBox.h" #include "YComboBox.h" #include "YMenuButton.h" @@ -76,9 +77,14 @@ if ( trySetTableValue ( widget, val ) ) return true; if ( trySetComboBoxValue ( widget, val ) ) return true; } - if ( propertyName == YUIProperty_Values ) + else if ( propertyName == YUIProperty_Values ) { if ( trySetMultiProgressMeterValues ( widget, val ) ) return true; + if ( trySetBarGraphValues ( widget, val ) ) return true; + } + else if ( propertyName == YUIProperty_Labels ) + { + if ( trySetBarGraphLabels ( widget, val ) ) return true; } else if ( propertyName == YUIProperty_CurrentItem ) { @@ -149,6 +155,10 @@ val = tryGetTableValue ( widget ); if ( ! val.isNull() ) return val; val = tryGetComboBoxValue ( widget ); if ( ! val.isNull() ) return val; } + else if ( propertyName == YUIProperty_Values ) + { + val = tryGetBarGraphValues ( widget ); if ( ! val.isNull() ) return val; + } else if ( propertyName == YUIProperty_CurrentItem ) { val = tryGetSelectionBoxValue ( widget ); if ( ! val.isNull() ) return val; @@ -184,6 +194,10 @@ val = tryGetTreeItems ( widget ); if ( ! val.isNull() ) return val; val = tryGetSelectionWidgetItems( widget ); if ( ! val.isNull() ) return val; } + else if ( propertyName == YUIProperty_Labels ) + { + val = tryGetBarGraphLabels ( widget ); if ( ! val.isNull() ) return val; + } y2error( "Can't handle property %s::%s - returning 'nil'", widget->widgetClass(), propertyName.c_str() ); @@ -651,6 +665,98 @@ } +bool +YCPPropertyHandler::trySetBarGraphValues( YWidget * widget, const YCPValue & val ) +{ + YBarGraph * barGraph = dynamic_cast<YBarGraph *> (widget); + + if ( ! barGraph ) + return false; + + string msg = "Expected a list of integers"; + + if ( ! val->isList() ) + { + YUI_THROW( YUIBadPropertyArgException( YProperty( YUIProperty_Values, + YOtherProperty ), + widget, msg ) ); + } + + YBarGraphMultiUpdate multiUpdate( barGraph ); + + YCPList valuesList = val->asList(); + + for ( int i=0; i < valuesList->size(); i++ ) + { + if ( valuesList->value(i)->isInteger() ) + { + if ( i < barGraph->segments() ) + barGraph->setValue( i, valuesList->value(i)->asInteger()->value() ); + else + { + ycperror( "Ignoring excess BarGraph value #%i (only %d segments!)", + i, barGraph->segments() ); + } + } + else + { + YUI_THROW( YUIBadPropertyArgException( YProperty( YUIProperty_Values, + YOtherProperty ), + widget, msg ) ); + } + } + + return true; +} + + +bool +YCPPropertyHandler::trySetBarGraphLabels( YWidget * widget, const YCPValue & val ) +{ + YBarGraph * barGraph = dynamic_cast<YBarGraph *> (widget); + + if ( ! barGraph ) + return false; + + string msg = "Expected a list of strings"; + + if ( ! val->isList() ) + { + YUI_THROW( YUIBadPropertyArgException( YProperty( YUIProperty_Values, + YOtherProperty ), + widget, msg ) ); + } + + YBarGraphMultiUpdate multiUpdate( barGraph ); + + YCPList labelsList = val->asList(); + + for ( int i=0; i < labelsList->size(); i++ ) + { + if ( labelsList->value(i)->isString() ) + { + if ( i < barGraph->segments() ) + barGraph->setLabel( i, labelsList->value(i)->asString()->value() ); + else + { + ycperror( "Ignoring excess BarGraph label #%i (only %d segments!)", + i, barGraph->segments() ); + } + } + else + { + YUI_THROW( YUIBadPropertyArgException( YProperty( YUIProperty_Values, + YOtherProperty ), + widget, msg ) ); + } + } + + return true; +} + + + + //------------------------------------------------------------------------------ @@ -1050,4 +1156,38 @@ } +YCPValue +YCPPropertyHandler::tryGetBarGraphValues( YWidget * widget ) +{ + YBarGraph * barGraph = dynamic_cast<YBarGraph *> (widget); + + if ( ! barGraph ) + return YCPNull(); + + YCPList result; + + for ( int i=0; i < barGraph->segments(); i++ ) + result->add( YCPInteger( barGraph->segment(i).value() ) ); + + return result; +} + + +YCPValue +YCPPropertyHandler::tryGetBarGraphLabels( YWidget * widget ) +{ + YBarGraph * barGraph = dynamic_cast<YBarGraph *> (widget); + + if ( ! barGraph ) + return YCPNull(); + + YCPList result; + + for ( int i=0; i < barGraph->segments(); i++ ) + result->add( YCPString( barGraph->segment(i).label() ) ); + + return result; +} + + Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.h Fri Nov 9 16:07:11 2007 @@ -106,6 +106,8 @@ static bool trySetMultiSelectionBoxSelectedItems ( YWidget * widget, const YCPValue & val ); static bool trySetMultiSelectionBoxCurrentItem ( YWidget * widget, const YCPValue & val ); static bool trySetMultiProgressMeterValues ( YWidget * widget, const YCPValue & val ); + static bool trySetBarGraphValues ( YWidget * widget, const YCPValue & val ); + static bool trySetBarGraphLabels ( YWidget * widget, const YCPValue & val ); /** * All trySet..() functions try to dynamic_cast 'widget' to the expected @@ -129,6 +131,8 @@ static YCPValue tryGetTreeItems ( YWidget * widget ); static YCPValue tryGetMenuButtonItems ( YWidget * widget ); static YCPValue tryGetSelectionWidgetItems ( YWidget * widget ); + static YCPValue tryGetBarGraphValues ( YWidget * widget ); + static YCPValue tryGetBarGraphLabels ( YWidget * widget ); /** Added: branches/tmp/sh/mod-ui/core/libyui/src/YColor.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YColor.h (added) +++ branches/tmp/sh/mod-ui/core/libyui/src/YColor.h Fri Nov 9 16:07:11 2007 @@ -0,0 +1,85 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YColor.h + + Author: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + +#ifndef YColor_h + +typedef unsigned char uchar; + + +/** + * Helper class to define an RGB color. + **/ +class YColor +{ +public: + /** + * Constructor. + **/ + YColor( uchar red, uchar green, uchar blue ) + : _red ( red ) + , _green( green ) + , _blue ( blue ) + , _undef( false ) + {} + + /** + * Default constructor: Create "undefined" color. + **/ + YColor() + : _red( 0 ), _green( 0 ), _blue( 0 ) + , _undef( true ) + {} + + /** + * Return the red component (0: none, 255: bright red). + **/ + uchar red() const { return _red; } + + /** + * Return the green component (0: none, 255: bright green). + **/ + uchar green() const { return _green; } + + /** + * Return the blue component (0: none, 255: bright blue). + **/ + uchar blue() const { return _blue; } + + /** + * Return 'true' if this color is undefined. + **/ + bool isUndefined() const { return _undef; } + + /** + * Return 'true' if this color is defined. + **/ + bool isDefined() const { return ! _undef; } + +private: + + uchar _red; + uchar _green; + uchar _blue; + + bool _undef; +}; + + +#define YColor_h + +#endif // YColor_h Modified: branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.h Fri Nov 9 16:07:11 2007 @@ -19,7 +19,6 @@ #ifndef YContainerWidget_h #define YContainerWidget_h -#include <ycp/YCPMap.h> #include "YWidget.h" /** Modified: branches/tmp/sh/mod-ui/core/libyui/src/YOptionalWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YOptionalWidgetFactory.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YOptionalWidgetFactory.cc Fri Nov 9 16:07:11 2007 @@ -135,7 +135,7 @@ } YBarGraph * -YOptionalWidgetFactory::createBarGraph( YWidget * parent, const vector<int> & values, const vector<string> & labels ) +YOptionalWidgetFactory::createBarGraph( YWidget * parent ) { THROW_UNSUPPORTED( "YBarGraph" ); } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YOptionalWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YOptionalWidgetFactory.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YOptionalWidgetFactory.h Fri Nov 9 16:07:11 2007 @@ -85,7 +85,7 @@ virtual YTimeField * createTimeField ( YWidget * parent, const string & label ); virtual bool hasBarGraph(); - virtual YBarGraph * createBarGraph ( YWidget * parent, const vector<int> & values, const vector<string> & labels ); + virtual YBarGraph * createBarGraph ( YWidget * parent ); virtual bool hasPatternSelector(); virtual YWidget * createPatternSelector ( YWidget * parent, long modeFlags = 0 ); Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUI.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUI.h Fri Nov 9 16:07:11 2007 @@ -473,16 +473,6 @@ virtual bool hasDownloadProgress() { return false; } /** - * Creates a BarGraph widget. - * - * This is a special widget that the UI may or may not support. - * Overwrite this method at your own discretion. - * If you do, remember to overwrite the has...() method as well! - **/ - virtual YWidget * createBarGraph( YWidget *parent, YWidgetOpt & opt ); - virtual bool hasBarGraph() { return false; } - - /** * Creates a DumbTab. * * This is a special widget that the UI may or may not support. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc Fri Nov 9 16:07:11 2007 @@ -85,7 +85,7 @@ string symbol = widget->symbol(); if ( symbol == YUISpecialWidget_DummySpecialWidget ) hasWidget = fact->hasDummySpecialWidget(); - else if ( symbol == YUISpecialWidget_BarGraph ) hasWidget = hasBarGraph(); + else if ( symbol == YUISpecialWidget_BarGraph ) hasWidget = fact->hasBarGraph(); else if ( symbol == YUISpecialWidget_DumbTab ) hasWidget = hasDumbTab(); else if ( symbol == YUISpecialWidget_DownloadProgress ) hasWidget = hasDownloadProgress(); else if ( symbol == YUISpecialWidget_HMultiProgressMeter ) hasWidget = fact->hasMultiProgressMeter(); Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUI_special_widgets.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUI_special_widgets.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUI_special_widgets.cc Fri Nov 9 16:07:11 2007 @@ -20,15 +20,9 @@ #define y2log_component "ui" #include <ycp/y2log.h> -#include <ycp/YCPMap.h> #include "YUI.h" -#include "YUISymbols.h" -#include "YLabel.h" #include "YWidget.h" -#include "YWidgetFactory.h" - -#include "YBarGraph.h" #include "YDumbTab.h" #include <assert.h> @@ -61,14 +55,6 @@ * has...() method as well! */ -YWidget * YUI::createBarGraph( YWidget *parent, YWidgetOpt & opt ) -{ - y2error( "Default createBarGraph() method called - " - "forgot to call HasSpecialWidget()?" ); - - return 0; -} - YWidget * YUI::createDumbTab( YWidget *parent, YWidgetOpt & opt ) { Modified: branches/tmp/sh/mod-ui/qt/src/YQBarGraph.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQBarGra… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQBarGraph.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQBarGraph.cc Fri Nov 9 16:07:11 2007 @@ -20,61 +20,227 @@ #define y2log_component "qt-ui" #include <ycp/y2log.h> +#include <algorithm> +#include <qpainter.h> +#include <qnamespace.h> + #include "utf8.h" #include "YQUI.h" #include "YQBarGraph.h" -YQBarGraph::YQBarGraph( QWidget * parent, const YWidgetOpt & opt ) - : QWidget( parent ) - , YBarGraph( opt ) +#define YQBarGraphOuterMargin YQWidgetMargin +#define YQBarGraphLabelHorizontalMargin 1 +#define YQBarGraphLabelVerticalMargin 2 +#define YQBarGraphMinWidth 80 +#define YQBarGraphMinHeight 30 + + + +YQBarGraph::YQBarGraph( YWidget * parent ) + : QFrame( (QWidget *) parent->widgetRep() ) + , YBarGraph( parent ) { setWidgetRep( this ); - _barGraph = new QY2BarGraph( this ); - _barGraph->move( YQWidgetMargin, YQWidgetMargin ); } -void YQBarGraph::doUpdate() +YQBarGraph::~YQBarGraph() { - QString msg; + // NOP +} + - _barGraph->setSegments( segments() ); +void +YQBarGraph::doUpdate() +{ + QFrame::update(); // triggers drawContents() +} + + +void +YQBarGraph::drawContents( QPainter * painter ) +{ + unsigned nextDefaultColor = 0; + int totalWidth = contentsRect().width() - 2*YQBarGraphOuterMargin; + int segHeight = contentsRect().height() - 2*YQBarGraphOuterMargin; + int x_off = YQBarGraphOuterMargin; + int y_off = YQBarGraphOuterMargin; + int valueTotal = 0; for ( int i=0; i < segments(); i++ ) + valueTotal += segment(i).value(); + + if ( valueTotal == 0 ) // Avoid division by zero + return; + + for ( int i=0; i < segments(); i++ ) + { + const YBarGraphSegment & seg = segment(i); + int segWidth = ( (long) totalWidth * seg.value() ) / valueTotal; + + if ( i == segments()-1 ) + { + // Compensate for rounding errors: + // The last segment gets all leftover pixels from the previous ones. + + segWidth = totalWidth - x_off + YQBarGraphOuterMargin; + } + + + // + // Fill the segment + // + + YColor segmentColor = seg.segmentColor(); + YColor textColor = seg.textColor(); + + if ( segmentColor.isUndefined() || textColor.isUndefined() ) + { + // If any of the colors is undefined, use the next default color + // for both so some contrast is ensured. + + segmentColor = defaultSegmentColor( nextDefaultColor ); + textColor = defaultTextColor ( nextDefaultColor++ ); + } + + painter->setBrush( QColor( segmentColor.red(), + segmentColor.green(), + segmentColor.blue() ) ); + painter->setPen( Qt::NoPen ); + painter->drawRect( x_off, y_off, segWidth+2, segHeight+2 ); + + + // + // Draw the label + // + + painter->setPen( Qt::SolidLine ); + painter->setPen( QColor( textColor.red(), + textColor.green(), + textColor.blue() ) ); + QString txt = seg.label(); + + if ( txt.contains( "%1" ) ) + txt = txt.arg( seg.value() ); // substitute variable + + painter->drawText( x_off + YQBarGraphLabelHorizontalMargin, + y_off + YQBarGraphLabelVerticalMargin, + segWidth - 2 * YQBarGraphLabelHorizontalMargin + 1, + segHeight - 2 * YQBarGraphLabelVerticalMargin + 1, + AlignCenter, txt ); + + // Prepare for the next segment + + x_off += segWidth; + } +} + + +YColor +YQBarGraph::defaultSegmentColor( unsigned index ) +{ + switch( index % 8 ) { - _barGraph->setValue( i, value(i) ); - _barGraph->setLabel( i, fromUTF8( label(i) ) ); + case 0: return YColor( 0, 0, 128 ); // dark blue + case 1: return YColor( 64, 200, 255 ); // medium blue + case 2: return YColor( 255, 255, 255 ); // white + case 3: return YColor( 0, 153, 153 ); // cadet blue + case 4: return YColor( 150, 255, 255 ); // cyan + case 5: return YColor( 100, 100, 100 ); // medium grey + case 6: return YColor( 0, 200, 100 ); // medium green + case 7: return YColor( 0, 100, 76 ); // dark green } - _barGraph->update(); + return YColor( 255, 255, 255 ); // just to make gcc happy } -void YQBarGraph::setEnabled( bool enabled ) +YColor +YQBarGraph::defaultTextColor( unsigned index ) { - _barGraph->setEnabled( enabled ); + YColor black = YColor( 0, 0, 0 ); + YColor white = YColor( 255, 255, 255 ); + + switch( index % 8 ) + { + case 0: return white; + case 1: return black; + case 2: return black; + case 3: return black; + case 4: return black; + case 5: return white; + case 6: return black; + case 7: return white; + } + + return black; // just to make gcc happy +} + + +void +YQBarGraph::setEnabled( bool enabled ) +{ + QFrame::setEnabled( enabled ); YWidget::setEnabled( enabled ); } -int YQBarGraph::preferredWidth() +int +YQBarGraph::preferredWidth() { - return _barGraph->sizeHint().width() + 2*YQWidgetMargin; + int width = 0; + QFontMetrics metrics = fontMetrics(); + + for ( int i=0; i < segments(); i++ ) + { + QString txt = segment(i).label(); + + if ( txt.contains( "%1" ) ) + txt = txt.arg( segment(i).value() ); + + QSize segSize = metrics.size( 0, txt ); + width += segSize.width(); + } + + width += 2 * YQBarGraphLabelHorizontalMargin; + width += frameWidth(); + width += 2 * YQBarGraphOuterMargin; + width = max( width, YQBarGraphMinWidth ); + + return width; } -int YQBarGraph::preferredHeight() +int +YQBarGraph::preferredHeight() { - return _barGraph->sizeHint().height() + 2*YQWidgetMargin; + int height = YQBarGraphMinHeight; + QFontMetrics metrics = fontMetrics(); + + for ( int i=0; i < segments(); i++ ) + { + QString txt = segment(i).label(); + + if ( txt.contains( "%1" ) ) + txt = txt.arg( segment(i).value() ); + + QSize segSize = metrics.size( 0, txt ); + height = max( height, segSize.height() ); + } + + height += 2 * YQBarGraphLabelVerticalMargin; + height += frameWidth(); + height += 2 * YQBarGraphOuterMargin; + height = max( height, YQBarGraphMinHeight ); + + return height; } -void YQBarGraph::setSize( int newWidth, int newHeight ) +void +YQBarGraph::setSize( int newWidth, int newHeight ) { - _barGraph->move( YQWidgetMargin, YQWidgetMargin ); - _barGraph->resize( newWidth - 2*YQWidgetMargin, - newHeight - 2*YQWidgetMargin ); resize( newWidth, newHeight ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQBarGraph.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQBarGra… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQBarGraph.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQBarGraph.h Fri Nov 9 16:07:11 2007 @@ -20,13 +20,13 @@ #ifndef YQBarGraph_h #define YQBarGraph_h -#include <ycp/YCPString.h> - -#include "QY2BarGraph.h" +#include "qframe.h" #include "YBarGraph.h" +class QPainter; + -class YQBarGraph : public QWidget, public YBarGraph +class YQBarGraph : public QFrame, public YBarGraph { Q_OBJECT @@ -35,7 +35,19 @@ /** * Constructor. **/ - YQBarGraph( QWidget * parent, const YWidgetOpt & opt ); + YQBarGraph( YWidget * parent ); + + /** + * Destructor. + **/ + virtual ~YQBarGraph(); + + /** + * Perform a visual update on the screen. + * + * Implemented from YBarGraph. + **/ + virtual void doUpdate(); /** * Set enabled/disabled state. @@ -65,17 +77,26 @@ **/ virtual void setSize( int newWidth, int newHeight ); + +protected: + /** - * Perform a visual update on the screen. - * Inherited from YBarGraph. + * Draw the contents. + * + * Reimplemented from QFrame. **/ - void doUpdate(); + virtual void drawContents( QPainter * painter ); - -protected: + /** + * Return one from a set of default segment background colors. + **/ + YColor defaultSegmentColor( unsigned index ); - - QY2BarGraph * _barGraph; + /** + * Return one from a set of default text colors. This text color is + * guaranteed to contrast with the defaultSegmentColor with the same index. + **/ + YColor defaultTextColor( unsigned index ); }; Modified: branches/tmp/sh/mod-ui/qt/src/YQOptionalWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQOption… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQOptionalWidgetFactory.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQOptionalWidgetFactory.cc Fri Nov 9 16:07:11 2007 @@ -132,13 +132,16 @@ bool YQOptionalWidgetFactory::hasBarGraph() { - return false; + return true; } YQBarGraph * -YQOptionalWidgetFactory::createBarGraph( YWidget * parent, const vector<int> & values, const vector<string> & labels ) +YQOptionalWidgetFactory::createBarGraph( YWidget * parent ) { - THROW_UNSUPPORTED( "YQBarGraph" ); + YQBarGraph * barGraph = new YQBarGraph( parent ); + YUI_CHECK_NEW( barGraph ); + + return barGraph; } Modified: branches/tmp/sh/mod-ui/qt/src/YQOptionalWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQOption… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQOptionalWidgetFactory.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQOptionalWidgetFactory.h Fri Nov 9 16:07:11 2007 @@ -79,7 +79,7 @@ virtual YQTimeField * createTimeField ( YWidget * parent, const string & label ); virtual bool hasBarGraph(); - virtual YQBarGraph * createBarGraph ( YWidget * parent, const vector<int> & values, const vector<string> & labels ); + virtual YQBarGraph * createBarGraph ( YWidget * parent ); virtual bool hasPatternSelector(); virtual YQPatternSelector * createPatternSelector ( YWidget * parent, long modeFlags = 0 ); Modified: branches/tmp/sh/mod-ui/qt/src/YQUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQUI.h?r… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQUI.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQUI.h Fri Nov 9 16:07:11 2007 @@ -432,10 +432,6 @@ /*** Widget creation methods for optional widgets, all reimplemented from YUI ***/ - bool hasBarGraph(); - YWidget * createBarGraph ( YWidget * parent, YWidgetOpt & opt); - - bool hasDownloadProgress(); YWidget * createDownloadProgress ( YWidget * parent, YWidgetOpt & opt, Modified: branches/tmp/sh/mod-ui/qt/src/YQUI_widgets.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQUI_wid… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQUI_widgets.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQUI_widgets.cc Fri Nov 9 16:07:11 2007 @@ -52,17 +52,6 @@ //========= Optional widgets ================================================== -bool YQUI::hasBarGraph() -{ - return true; -} - -YWidget * YQUI::createBarGraph( YWidget * parent, YWidgetOpt & opt) -{ - return new YQBarGraph( (QWidget *) ( parent->widgetRep() ), opt ); -} - - bool YQUI::hasDownloadProgress() { 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] r41933 - in /trunk/core: VERSION base/tools/devtools/generateYCPWrappers libyui/src/Y2UINamespace.h package/yast2-core.changes
by mvidner＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: mvidner Date: Fri Nov 9 16:04:35 2007 New Revision: 41933 URL: http://svn.opensuse.org/viewcvs/yast?rev=41933&view=rev Log: Allow nil in UI::ChangeWidget again (#340523). Improved error reporting for cases where it is rightly disallowed. Modified: trunk/core/VERSION trunk/core/base/tools/devtools/generateYCPWrappers trunk/core/libyui/src/Y2UINamespace.h trunk/core/package/yast2-core.changes Modified: trunk/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=41933&r1=41932&… ============================================================================== --- trunk/core/VERSION (original) +++ trunk/core/VERSION Fri Nov 9 16:04:35 2007 @@ -1 +1 @@ -2.16.2 +2.16.3 Modified: trunk/core/base/tools/devtools/generateYCPWrappers URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/base/tools/devtools/generat… ============================================================================== --- trunk/core/base/tools/devtools/generateYCPWrappers (original) +++ trunk/core/base/tools/devtools/generateYCPWrappers Fri Nov 9 16:04:35 2007 @@ -1,5 +1,10 @@ #!/usr/bin/perl -w +# example: +# /* TYPEINFO: boolean (symbol, symbol, any) */ +# YCPValue ChangeWidget ( const YCPSymbol & widget_id, const YCPSymbol & property, const YCPValue & /*nil*/ new_value ); + + my $header_file = shift; my $call_file = shift; my $register_file = shift; @@ -50,6 +55,11 @@ open ( CALL, "> $call_file" ) or die "Cannot open output file"; open ( REGISTER, "> $register_file" ) or die "Cannot open output file"; +my $generated = "\t// This file is generated by generateYCPwrappers from $header_file\n\n"; +print CALL $generated; +print REGISTER $generated; + +print CALL "\t\tstatic const char * err_fmt = \"Parameter %d is nil, %s is required\";\n"; my $position = 0; while (@exports) @@ -66,21 +76,23 @@ while (@params) { - my @par = split (" ", shift (@params) ); - my $type = $par [0]; - if ( $type =~ /const/ ) - { - $type = $par [1]; - } - $type =~ s/^YCP(\w+)&?/$1/; - - push (@tests, "if (m_param$paramcount->isVoid()) {y2error(\"ERROR: Parameter $paramcount is nil, ".$type." is required\"); return YCPVoid();}"); - - $type = "m_param" . $paramcount . "->as" . $type . "()" ; - push @cppparams, $type; - $paramcount++; + my $par = shift (@params); + $par =~ m{(const\s*)?YCP(\w+)\s*(&\s*)?(/\*nil\*/)?}; + my $type = $2; + if (defined $4) { # #340523 + push (@tests, "// m_param$paramcount may be nil"); + } + else { + push (@tests, "if (m_param$paramcount->isVoid()) {ycp2error(err_fmt, $paramcount, \"$type\"); return YCPVoid();}"); + + } + $type = "m_param" . $paramcount . "->as" . $type . "()" ; + push @cppparams, $type; + $paramcount++; } - print CALL "\t\tcase $position: ". join (" ", @tests) . " return m_instance->$func_name (" . join (", ", @cppparams) . "); \n" ; + print CALL "\t\tcase $position: // $func_name\n" . + "\t\t\t". join ("\n\t\t\t", @tests) . "\n" . + "\t\t\treturn m_instance->$func_name (" . join (", ", @cppparams) . "); \n" ; print REGISTER "\tenterSymbol (new SymbolEntry (this, $position, " ; print REGISTER "\"$func_name\", SymbolEntry::c_function, Type::fromSignature (\"$signature\") ) );\n"; @@ -91,7 +103,3 @@ close ( CALL ); close ( REGISTER ); - - -0 - Modified: trunk/core/libyui/src/Y2UINamespace.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/Y2UINamespace.h?… ============================================================================== --- trunk/core/libyui/src/Y2UINamespace.h (original) +++ trunk/core/libyui/src/Y2UINamespace.h Fri Nov 9 16:04:35 2007 @@ -180,17 +180,14 @@ /* TYPEINFO: boolean() */ YCPValue CloseDialog(); - // TODO DECL_NIL? /* TYPEINFO: boolean (symbol, symbol, any) */ - YCPValue ChangeWidget ( const YCPSymbol & widget_id, const YCPSymbol & property, const YCPValue & new_value ); + YCPValue ChangeWidget ( const YCPSymbol & widget_id, const YCPSymbol & property, const YCPValue & /*nil*/ new_value ); - // TODO DECL_NIL? /* TYPEINFO: boolean (term, symbol, any) */ - YCPValue ChangeWidget ( const YCPTerm & widget_id, const YCPSymbol & property, const YCPValue & new_value ); + YCPValue ChangeWidget ( const YCPTerm & widget_id, const YCPSymbol & property, const YCPValue & /*nil*/ new_value ); - // TODO DECL_NIL? /* TYPEINFO: boolean (term, term, any) */ - YCPValue ChangeWidget ( const YCPTerm & widget_id, const YCPTerm & property, const YCPValue & new_value ); + YCPValue ChangeWidget ( const YCPTerm & widget_id, const YCPTerm & property, const YCPValue & /*nil*/ new_value ); /* TYPEINFO: any (symbol, symbol) */ YCPValue QueryWidget ( const YCPSymbol & widget_id, const YCPSymbol & property ); Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Fri Nov 9 16:04:35 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Nov 9 16:04:19 CET 2007 - mvidner(a)suse.cz + +- Allow nil in UI::ChangeWidget again (#340523). Improved error + reporting for cases where it is rightly disallowed. +- 2.16.3 + +------------------------------------------------------------------- Fri Nov 2 14:03:37 CET 2007 - mvidner(a)suse.cz - Do not look for YCP scripts under the current working -- 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] r41932 - /trunk/network/src/modules/InternetDevices.ycp
by locilka＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: locilka Date: Fri Nov 9 15:15:00 2007 New Revision: 41932 URL: http://svn.opensuse.org/viewcvs/yast?rev=41932&view=rev Log: Added InternetDevices :)) Added: trunk/network/src/modules/InternetDevices.ycp Added: trunk/network/src/modules/InternetDevices.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/InternetDevi… ============================================================================== --- trunk/network/src/modules/InternetDevices.ycp (added) +++ trunk/network/src/modules/InternetDevices.ycp Fri Nov 9 15:15:00 2007 @@ -0,0 +1,87 @@ +/** + * File: modules/InternetDevices.ycp + * Package: Network configuration + * Summary: Internet connection and YOU during the installation + * Authors: Michal Svec <msvec(a)suse.cz> + * Arvin Schnell <arvin(a)suse.de> + * + * $Id:$ + */ + +{ + +module "InternetDevices"; + +import "Internet"; +import "NetworkDevices"; + +/** + * Reset values. + */ +define void Reset() { + Internet::device = ""; + Internet::type = ""; + Internet::logfile = ""; + Internet::provider = ""; + Internet::password = ""; + Internet::demand = false; + Internet::askpassword = nil; + Internet::capi_adsl = false; + Internet::capi_isdn = false; +} + +/** + * Set device from argument as default network device + */ +global define void SetDevice(string dev){ + Internet::device=dev; + NetworkDevices::Select(Internet::device); + Internet::type = NetworkDevices::FastestType(Internet::device); + Internet::provider = NetworkDevices::Current["PROVIDER"]:""; + + if (Internet::provider != "") { + import "Provider"; + + Provider::Read(); + Provider::Select(Internet::provider); + + Internet::demand = Provider::Current["DEMAND"]:"no" == "yes"; + Internet::password = Provider::Current["PASSWORD"]:""; + Internet::askpassword = Provider::Current["ASKPASSWORD"]:"no" == "yes"; + Internet::capi_adsl = Provider::Current["PPPMODE"]:"pppoe" == "capi-adsl"; + Internet::capi_isdn = Provider::Current["PPPMODE"]:"ippp" == "capi-isdn"; + } + + /* Set logfile */ + if (Internet::type == "dsl" || Internet::type == "modem" || (Internet::type == "isdn" && Internet::capi_isdn)) + Internet::logfile = "/var/log/smpppd/ifcfg-" + Internet::device + ".log"; + +} + +/** + * Find the fastest connection to the Internet + * @return true if a "good" connection was found + */ +global define boolean FindFastest() { + + Reset(); + + NetworkDevices::Read(); + Internet::device = NetworkDevices::Fastest(); + + if ((string)SCR::Read(.sysconfig.network.config.NETWORKMANAGER)=="yes" && Internet::device == "") + { + Internet::device = Internet::GetDevices ()[0]:""; + } + + y2milestone("fastest=%1", Internet::device); + + /* No fallback since there are devices that must not be tested (e.g. lo) */ + if (Internet::device == "") return false; + + SetDevice (Internet::device); + return true; +} + +/* EOF */ +} -- 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] r41931 - /tags/branch-SLE-10-SP2-2_13_100/network/
by kmachalkova＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: kmachalkova Date: Fri Nov 9 14:59:52 2007 New Revision: 41931 URL: http://svn.opensuse.org/viewcvs/yast?rev=41931&view=rev Log: Created tag branch-SLE-10-SP2-2_13_100 for network Added: tags/branch-SLE-10-SP2-2_13_100/network/ - copied from r41930, branches/SuSE-SLE-10-SP2-Branch/network/ -- 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] r41930 - /tags/branch-SLE-10-SP2-2_13_100/
by kmachalkova＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: kmachalkova Date: Fri Nov 9 14:59:50 2007 New Revision: 41930 URL: http://svn.opensuse.org/viewcvs/yast?rev=41930&view=rev Log: Created tag branch-SLE-10-SP2-2_13_100 Added: tags/branch-SLE-10-SP2-2_13_100/ -- 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] r41929 - in /branches/SuSE-SLE-10-SP2-Branch/network: VERSION package/yast2-network.changes
by kmachalkova＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: kmachalkova Date: Fri Nov 9 14:59:41 2007 New Revision: 41929 URL: http://svn.opensuse.org/viewcvs/yast?rev=41929&view=rev Log: version 2.13.100 Modified: branches/SuSE-SLE-10-SP2-Branch/network/VERSION branches/SuSE-SLE-10-SP2-Branch/network/package/yast2-network.changes Modified: branches/SuSE-SLE-10-SP2-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/networ… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/network/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/network/VERSION Fri Nov 9 14:59:41 2007 @@ -1 +1 @@ -2.13.99 +2.13.100 Modified: branches/SuSE-SLE-10-SP2-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/networ… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/network/package/yast2-network.changes Fri Nov 9 14:59:41 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Nov 9 14:54:20 CET 2007 - kmachalkova(a)suse.cz + +- host.rnc modified to accept empty <host> section as a valid one +- Filter out host IPs with empty hostname so that valid autoyast + profile is created (both #335120) +- 2.13.100 + +------------------------------------------------------------------- Mon Oct 22 10:41:37 CEST 2007 - mzugec(a)suse.cz - allow user to change CCW of qeth devices - CHAN IDS (#306291) -- 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] r41928 - in /trunk/network: VERSION package/yast2-network.changes
by kmachalkova＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: kmachalkova Date: Fri Nov 9 14:57:11 2007 New Revision: 41928 URL: http://svn.opensuse.org/viewcvs/yast?rev=41928&view=rev Log: Version 2.16.7 Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=41928&r1=419… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Fri Nov 9 14:57:11 2007 @@ -1 +1 @@ -2.16.6 +2.16.7 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Nov 9 14:57:11 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Nov 9 14:45:11 CET 2007 - kmachalkova(a)suse.cz + +- host.rnc modified to accept empty <host> section as a valid one +- Filter out host IPs with empty hostname so that valid autoyast + profile is created (both #335120) +- 2.16.7 + +------------------------------------------------------------------- Fri Nov 2 14:18:37 CET 2007 - locilka(a)suse.cz - YCP Module Internet moved to yast2.rpm to break several -- 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] r41927 - /tags/stable-2_16_7/network/
by kmachalkova＠svn.opensuse.org 09 Nov '07

09 Nov '07

Author: kmachalkova Date: Fri Nov 9 14:55:11 2007 New Revision: 41927 URL: http://svn.opensuse.org/viewcvs/yast?rev=41927&view=rev Log: Created tag stable-2_16_7 for network Added: tags/stable-2_16_7/network/ - copied from r41926, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0