December 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r42679 - /tags/branch-SLE-10-SP2-2_13_29/http-server/
by mzugec＠svn.opensuse.org 04 Dec '07

04 Dec '07

Author: mzugec Date: Tue Dec 4 18:23:02 2007 New Revision: 42679 URL: http://svn.opensuse.org/viewcvs/yast?rev=42679&view=rev Log: Created tag branch-SLE-10-SP2-2_13_29 for http-server Added: tags/branch-SLE-10-SP2-2_13_29/http-server/ - copied from r42678, branches/SuSE-SLE-10-SP2-Branch/http-server/ -- 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] r42678 - /tags/branch-SLE-10-SP2-2_13_29/
by mzugec＠svn.opensuse.org 04 Dec '07

04 Dec '07

Author: mzugec Date: Tue Dec 4 18:23:01 2007 New Revision: 42678 URL: http://svn.opensuse.org/viewcvs/yast?rev=42678&view=rev Log: Created tag branch-SLE-10-SP2-2_13_29 Added: tags/branch-SLE-10-SP2-2_13_29/ -- 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] r42677 - in /branches/SuSE-SLE-10-SP2-Branch/http-server: VERSION package/yast2-http-server.changes src/HttpServerWidgets.ycp
by mzugec＠svn.opensuse.org 04 Dec '07

04 Dec '07

Author: mzugec Date: Tue Dec 4 18:22:53 2007 New Revision: 42677 URL: http://svn.opensuse.org/viewcvs/yast?rev=42677&view=rev Log: into IP addresses include also IPs from dhcp interfaces improved vhost validation for name-based vhost (#342844) Modified: branches/SuSE-SLE-10-SP2-Branch/http-server/VERSION branches/SuSE-SLE-10-SP2-Branch/http-server/package/yast2-http-server.changes branches/SuSE-SLE-10-SP2-Branch/http-server/src/HttpServerWidgets.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/http-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/http-s… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/http-server/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/http-server/VERSION Tue Dec 4 18:22:53 2007 @@ -1 +1 @@ -2.13.28 +2.13.29 Modified: branches/SuSE-SLE-10-SP2-Branch/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/http-s… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/http-server/package/yast2-http-server.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/http-server/package/yast2-http-server.changes Tue Dec 4 18:22:53 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Dec 4 18:22:19 CET 2007 - mzugec(a)suse.cz + +- into IP addresses include also IPs from dhcp interfaces +- improved vhost validation for name-based vhost (#342844) +- 2.13.29 + +------------------------------------------------------------------- Wed Nov 21 16:58:26 CET 2007 - mzugec(a)suse.cz - mark texts in HTTPDModules.pm to translation (#181133) Modified: branches/SuSE-SLE-10-SP2-Branch/http-server/src/HttpServerWidgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/http-s… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/http-server/src/HttpServerWidgets.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/http-server/src/HttpServerWidgets.ycp Tue Dec 4 18:22:53 2007 @@ -1017,8 +1017,6 @@ if (! validate_servername(servername)) return false; -// if (! validate_serverip("", "ipaddress", nil)) return false; - if ( size(admin) == 0 ) { // translators: error popup @@ -1106,6 +1104,30 @@ return nil; } +global boolean validateVhostRes(string key, map event) ``{ + string vhost=(string)UI::QueryWidget(`id( `virtual_host ), `Value); + if (size(vhost)==0) { + Popup::Error(_("Name for VirtualHost ID can't be empty.")); + return false; + } + + // for name-based vhost only IP address is allowed + // or regexp (* or *:port) or list of IP addresses + if (UI::QueryWidget(`resolution, `Value)==`name_based) { + // regexp matches '*' and '*:80' + if (regexpmatch(vhost, "^\\*$\|^\\*:[[:digit:]]\+$")) return true; + boolean ok=true; + foreach(string ip, splitstring(vhost, " "), { + if (!IP::Check4(ip)) ok=false; + }); + if (!ok) Popup::Warning(_("To use name-based virtual hosting, +you must designate the IP address on the server +that will be accepting requests for the hosts. +Also * for all addresses and *:port are acceptable.")); + return ok; + } + return true; +} string dns_zone = ""; @@ -1583,6 +1605,8 @@ ))), "init" : initVhostRes, "handle" : handleVhostRest, + "validate_type" : `function, + "validate_function" : validateVhostRes, "help" : HELPS["vhost_res"]:"" ], "vhost_details" : $[ -- 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] r42676 - /tags/stable-2_15_8/http-server/
by mzugec＠svn.opensuse.org 04 Dec '07

04 Dec '07

Author: mzugec Date: Tue Dec 4 17:43:11 2007 New Revision: 42676 URL: http://svn.opensuse.org/viewcvs/yast?rev=42676&view=rev Log: Created tag stable-2_15_8 for http-server Added: tags/stable-2_15_8/http-server/ - copied from r42675, trunk/http-server/ -- 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] r42675 - in /trunk/http-server: VERSION package/yast2-http-server.changes src/HttpServer.ycp src/HttpServerWidgets.ycp src/dialogs.ycp src/wizards.ycp
by mzugec＠svn.opensuse.org 04 Dec '07

04 Dec '07

Author: mzugec Date: Tue Dec 4 17:43:00 2007 New Revision: 42675 URL: http://svn.opensuse.org/viewcvs/yast?rev=42675&view=rev Log: into IP addresses include also IPs from dhcp interfaces improved vhost validation for name-based vhost (#342844) Modified: trunk/http-server/VERSION trunk/http-server/package/yast2-http-server.changes trunk/http-server/src/HttpServer.ycp trunk/http-server/src/HttpServerWidgets.ycp trunk/http-server/src/dialogs.ycp trunk/http-server/src/wizards.ycp Modified: trunk/http-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/VERSION?rev=42675&r1… ============================================================================== --- trunk/http-server/VERSION (original) +++ trunk/http-server/VERSION Tue Dec 4 17:43:00 2007 @@ -1 +1 @@ -2.15.7 +2.15.8 Modified: trunk/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/package/yast2-http-s… ============================================================================== --- trunk/http-server/package/yast2-http-server.changes (original) +++ trunk/http-server/package/yast2-http-server.changes Tue Dec 4 17:43:00 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Dec 4 17:41:00 CET 2007 - mzugec(a)suse.cz + +- into IP addresses include also IPs from dhcp interfaces +- improved vhost validation for name-based vhost (#342844) +- 2.15.8 + +------------------------------------------------------------------- Wed Aug 22 14:46:04 CEST 2007 - mzugec(a)suse.cz - don't forget values for vhost when go next-back (#299223) Modified: trunk/http-server/src/HttpServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/HttpServer.ycp?r… ============================================================================== --- trunk/http-server/src/HttpServer.ycp (original) +++ trunk/http-server/src/HttpServer.ycp Tue Dec 4 17:43:00 2007 @@ -245,6 +245,8 @@ // add DHCP ones, if we can find out the current IP devs = NetworkDevices::Locate("BOOTPROTO", "dhcp"); foreach(string dev, devs, { +/* +y2internal("dhcp devs %1", devs); // first, convert to the current name map output = (map)SCR::Execute (.target.bash_output, "/sbin/getcfg-interface " + dev); @@ -254,8 +256,8 @@ } string device = output["stdout"]:""; - - output = (map)SCR::Execute (.target.bash_output, "/sbin/ifconfig "+device, $["LC_MESSAGES":"C"] ); +*/ + map output = (map)SCR::Execute (.target.bash_output, "/sbin/ifconfig "+dev, $["LC_MESSAGES":"C"] ); if (output["exit"]:-1 == 0) { // lookup the correct line first Modified: trunk/http-server/src/HttpServerWidgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/HttpServerWidget… ============================================================================== --- trunk/http-server/src/HttpServerWidgets.ycp (original) +++ trunk/http-server/src/HttpServerWidgets.ycp Tue Dec 4 17:43:00 2007 @@ -1042,19 +1042,19 @@ global define void storeVhostId (string opt_id, map event) ``{ } -define string changeVHostPopup(){ +define string changeVHostPopup(string value){ string vhost=""; - string servername = ""; foreach(integer num, map<string,any> row, host_options, {if (row["KEY"]:"" == "ServerName") servername = row["VALUE"]:"";}); list items = maplist( string ip, string dev, HttpServer::ip2device, ``(ip) ); UI::OpenDialog( `RadioButtonGroup(`id(`rb), `VBox( - `Left(`RadioButton(`id(`ms),`opt(`notify), "", true)), + `Left( `RadioButton(`id(`all_addr),`opt(`notify), _("All addresses (*)"), true)), + `Left(`RadioButton(`id(`multiselect),`opt(`notify), "")), `MultiSelectionBox( `id(`ipaddress), _("IP Adresses"), items ) , - `Left(`RadioButton(`id(`sn),`opt(`notify), "")), - `TextEntry(`id(`serv_name), _("ServerName"), servername) + `Left(`RadioButton(`id(`custom),`opt(`notify), "")), + `TextEntry(`id(`serv_name), _("ServerName")) , `VSpacing(), `HBox( @@ -1064,27 +1064,49 @@ ) ) ); + if (value=="*" || value=="") UI::ChangeWidget(`serv_name, `Value, value); + else { + list<term> it=[]; + foreach(string ip, (list<string>)items, { + it=add(it, `item(`id(ip), ip, contains(splitstring(value, " "), ip)) ); + }); + boolean unknown = false; + foreach(string ip, splitstring(value, " "), { + if (!contains(items, ip)) unknown = true; + }); + if (unknown){ + UI::ChangeWidget(`serv_name, `Value, value); + UI::ChangeWidget(`rb, `CurrentButton, `custom); + } else { + UI::ChangeWidget(`ipaddress, `Items, it); + UI::ChangeWidget(`rb, `CurrentButton, `multiselect); + } + } symbol ret = nil; do{ - if(UI::QueryWidget(`id(`rb), `CurrentButton)==`ms){ - UI::ChangeWidget(`id(`ipaddress), `Enabled, true); - UI::ChangeWidget(`id(`serv_name), `Enabled, false); - }else{ - UI::ChangeWidget(`id(`ipaddress), `Enabled, false); - UI::ChangeWidget(`id(`serv_name), `Enabled, true); - } + symbol rb = (symbol)UI::QueryWidget(`id(`rb), `CurrentButton); + UI::ChangeWidget(`id(`ipaddress), `Enabled, rb==`multiselect); + UI::ChangeWidget(`id(`serv_name), `Enabled, rb==`custom); ret = (symbol) UI::UserInput(); } while( ret != `ok && ret != `cancel ); if( ret == `ok ) { - if(UI::QueryWidget(`id(`rb), `CurrentButton)==`ms){ + switch((symbol)UI::QueryWidget(`id(`rb), `CurrentButton)){ + case `all_addr: + vhost="*"; + break; + case `multiselect: list<string> selected=(list<string>)UI::QueryWidget(`id(`ipaddress), `SelectedItems); - if (size(selected)==size(items)) vhost="*"; - else vhost = mergestring(selected, " "); - } else { - vhost=(string)UI::QueryWidget(`id(`serv_name), `Value); - } - } else vhost=""; + vhost = mergestring(selected, " "); + break; + case `custom: + vhost=(string)UI::QueryWidget(`id(`serv_name), `Value); + break; + default: + vhost=""; + y2warning("unrecognized selection"); + } + } UI::CloseDialog(); return vhost; } @@ -1092,7 +1114,7 @@ global define symbol handleVhostRest (string key, map event){ if (event["EventReason"]:""=="Activated" && event["ID"]:nil ==`change_vhost){ - string vhost = changeVHostPopup(); + string vhost = changeVHostPopup((string)UI::QueryWidget(`virtual_host, `Value)); if (size(vhost)>0) UI::ChangeWidget(`id(`virtual_host), `Value, vhost); } return nil; @@ -1105,6 +1127,22 @@ Popup::Error(_("Name for VirtualHost ID can't be empty.")); return false; } + + // for name-based vhost only IP address is allowed + // or regexp (* or *:port) or list of IP addresses + if (UI::QueryWidget(`resolution, `Value)==`name_based) { + // regexp matches '*' and '*:80' + if (regexpmatch(vhost, "^\\*$\|^\\*:[[:digit:]]\+$")) return true; + boolean ok=true; + foreach(string ip, splitstring(vhost, " "), { + if (!IP::Check4(ip)) ok=false; + }); + if (!ok) Popup::Warning(_("To use name-based virtual hosting, +you must designate the IP address on the server +that will be accepting requests for the hosts. +Also * for all addresses and *:port are acceptable.")); + return ok; + } return true; } Modified: trunk/http-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/dialogs.ycp?rev=… ============================================================================== --- trunk/http-server/src/dialogs.ycp (original) +++ trunk/http-server/src/dialogs.ycp Tue Dec 4 17:43:00 2007 @@ -129,6 +129,7 @@ contents = CWM::PrepareDialog(contents, w); Wizard::SetContentsButtons(caption, contents, help, Label::BackButton (), Label::FinishButton ()); + Wizard::RestoreAbortButton(); Wizard::DisableBackButton(); symbol ret = CWM::Run(w, $[`abort:ReallyAbort ]); Modified: trunk/http-server/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/wizards.ycp?rev=… ============================================================================== --- trunk/http-server/src/wizards.ycp (original) +++ trunk/http-server/src/wizards.ycp Tue Dec 4 17:43:00 2007 @@ -91,9 +91,11 @@ `add : "add-vh", ], "add-vh" : $[ + `abort : `abort, `next : "overview" //`next ], "edit-vh" : $[ + `abort : `abort, `next : "overview" //`next ], "setvhost": $[ -- 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] r42674 - in /branches/tmp/coolo/qt4-port/src: CMakeLists.txt QY2DiskUsageList.cc QY2DiskUsageList.h pkg/YQPackageSelector.cc pkg/YQPackageSelector.h pkg/YQPackageSelectorBase.cc
by dmacvicar＠svn.opensuse.org 04 Dec '07

04 Dec '07

Author: dmacvicar Date: Tue Dec 4 17:42:34 2007 New Revision: 42674 URL: http://svn.opensuse.org/viewcvs/yast?rev=42674&view=rev Log: - trying to get disk usage to paint something, no sucess yet - package selector still looks like tetris Modified: branches/tmp/coolo/qt4-port/src/CMakeLists.txt branches/tmp/coolo/qt4-port/src/QY2DiskUsageList.cc branches/tmp/coolo/qt4-port/src/QY2DiskUsageList.h branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.cc branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.h branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.cc Modified: branches/tmp/coolo/qt4-port/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/CMakeL… ============================================================================== --- branches/tmp/coolo/qt4-port/src/CMakeLists.txt (original) +++ branches/tmp/coolo/qt4-port/src/CMakeLists.txt Tue Dec 4 17:42:34 2007 @@ -50,7 +50,7 @@ INSTALL(TARGETS py2qt4 LIBRARY DESTINATION ${YAST_PLUGIN_DIR} ) -#ADD_SUBDIRECTORY(pkg) +ADD_SUBDIRECTORY(pkg) #SET_TARGET_PROPERTIES( y2lang_qt4 PROPERTIES PREFIX "" ) Modified: branches/tmp/coolo/qt4-port/src/QY2DiskUsageList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/QY2Dis… ============================================================================== --- branches/tmp/coolo/qt4-port/src/QY2DiskUsageList.cc (original) +++ branches/tmp/coolo/qt4-port/src/QY2DiskUsageList.cc Tue Dec 4 17:42:34 2007 @@ -23,7 +23,95 @@ #include "QY2DiskUsageList.h" #include "YQi18n.h" -#include "qpainter.h" +#include <QPainter> + + +/** + * Stolen from KDirStat::KDirTreeView with the author's permission. + **/ +QColor +contrastingColor( const QColor & desiredColor, + const QColor & contrastColor ) +{ + if ( desiredColor != contrastColor ) + { + return desiredColor; + } + + if ( contrastColor != contrastColor.light() ) + { + // try a little lighter + return contrastColor.light(); + } + else + { + // try a little darker + return contrastColor.dark(); + } +} + +/** + * Interpolate ( translate ) a value 'from' in the range between 'minFrom' + * and 'maxFrom' to a range between 'minTo' and 'maxTo'. + **/ +static int +interpolate( int from, + int minFrom, int maxFrom, + int minTo, int maxTo ) +{ + if ( minFrom > maxFrom ) + { + // Swap min/max values + + int tmp = maxFrom; + maxFrom = minFrom; + minFrom = tmp; + } + + long x = from - minFrom; + x *= maxTo - minTo; + x /= maxFrom - minFrom; + x += minTo; + + if ( minTo < maxTo ) + { + if ( x < minTo ) x = minTo; + if ( x > maxTo ) x = maxTo; + } + else + { + if ( x < maxTo ) x = maxTo; + if ( x > minTo ) x = minTo; + } + + return (int) x; +} + +/** + * Interpolate ( in the HSV color space ) a color between 'minColor' and + * 'maxColor' for a current value 'val' so that 'minVal' corresponds to + * 'minColor' and 'maxVal' to 'maxColor'. + * + * Returns the interpolated color. + **/ +static QColor +interpolateColor( int val, + int minVal, + int maxVal, + const QColor & minColor, + const QColor & maxColor ) +{ + int minH, maxH; + int minS, maxS; + int minV, maxV; + + minColor.getHsv( &minH, &minS, &minV ); + maxColor.getHsv( &maxH, &maxS, &maxV ); + + return QColor::fromHsv( interpolate( val, minVal, maxVal, minH, maxH ), + interpolate( val, minVal, maxVal, minS, maxS ), + interpolate( val, minVal, maxVal, minV, maxV ) ); +} QY2DiskUsageList::QY2DiskUsageList( QWidget * parent, bool addStdColumns ) @@ -73,7 +161,39 @@ } +void QY2DiskUsageList::drawRow( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const +{ + if ( index.column() == percentageBarCol() ) + { + QColor background = option.palette.color(QPalette::Base); + painter->setBackground( background ); + + QY2DiskUsageListItem *item = dynamic_cast<QY2DiskUsageListItem *>(itemFromIndex(index)); + if ( item ) + { + item->paintPercentageBar( item->usedPercent(), + painter, + option, + interpolateColor( item->usedPercent(), + 60, 95, + QColor( 0, 0x80, 0 ), // Medium dark green + QColor( 0xFF, 0, 0 ) ), // Bright red + background.dark( 115 ) ); + } + } + else + { + //QColorGroup cg( colorGroup ); + + //if ( usedSize() > totalSize() ) + // cg.setColor( QColorGroup::Text, Qt::red ); // Set red text foreground + + // Intentionally bypassing the direct parent class method, use the grandparent's: + // Don't let QY2ListViewItem::_textColor / _backgroundColor interfere with our colors. + QTreeWidget::drawRow( painter, option, index ); + } +} @@ -209,210 +329,94 @@ return QY2ListViewItem::compare( otherListViewItem, col, ascending ); } -/* -void -QY2DiskUsageListItem::paintCell( QPainter * painter, - const QColorGroup & colorGroup, - int column, - int width, - int alignment ) -{ - if ( column == percentageBarCol() ) - { - QColor background = colorGroup.base(); - painter->setBackgroundColor( background ); - - paintPercentageBar( usedPercent(), - painter, - _diskUsageList->treeStepSize() * depth(), - width, - interpolateColor( usedPercent(), - 60, 95, - QColor( 0, 0x80, 0 ), // Medium dark green - QColor( 0xFF, 0, 0 ) ), // Bright red - background.dark( 115 ) ); - - } - else - { - QColorGroup cg( colorGroup ); - - if ( usedSize() > totalSize() ) - cg.setColor( QColorGroup::Text, Qt::red ); // Set red text foreground - - // Intentionally bypassing the direct parent class method, use the grandparent's: - // Don't let QY2ListViewItem::_textColor / _backgroundColor interfere with our colors. - - Q3ListViewItem::paintCell( painter, cg, column, width, alignment ); - } -} -*/ - /** * Stolen from KDirStat::KDirTreeView with the author's permission. **/ void QY2DiskUsageListItem::paintPercentageBar( float percent, QPainter * painter, - int indent, - int width, + QStyleOptionViewItem option, const QColor & fillColor, const QColor & barBackground ) { -// if ( percent > 100.0 ) percent = 100.0; -// if ( percent < 0.0 ) percent = 0.0; -// int penWidth = 2; -// int extraMargin = 3; -// int x = 0; /*FIXME _diskUsageList->itemMargin(); */ -// int y = extraMargin; -// int w = width - 2; /*FIXME * _diskUsageList->horizontalOffset(); */ -// int h = height() - 2; /*FIXME * extraMargin; */ -// int fillWidth; -// -// painter->eraseRect( 0, 0, width, height() ); -// w -= indent; -// x += indent; -// -// if ( w > 0 ) -// { -// QPen pen( painter->pen() ); -// pen.setWidth(0); -// painter->setPen( pen ); -// painter->setBrush( Qt::NoBrush ); -// fillWidth = (int) ( ( w - 2 * penWidth ) * percent / 100.0 ); -// -// -// // Fill bar background. -// -// painter->fillRect( x + penWidth, y + penWidth, -// w - 2 * penWidth + 1, h - 2 * penWidth + 1, -// barBackground ); -// /* -// * Notice: The Xlib XDrawRectangle() function always fills one -// * pixel less than specified. Altough this is very likely just a -// * plain old bug, it is documented that way. Obviously, Qt just -// * maps the fillRect() call directly to XDrawRectangle() so they -// * inherited that bug ( although the Qt doc stays silent about -// * it ). So it is really necessary to compensate for that missing -// * pixel in each dimension. -// * -// * If you don't believe it, see for yourself. -// * Hint: Try the xmag program to zoom into the drawn pixels. -// **/ -// -// // Fill the desired percentage. -// -// painter->fillRect( x + penWidth, y + penWidth, -// fillWidth+1, h - 2 * penWidth+1, -// fillColor ); -// -// -// // Draw 3D shadows. -// -// pen.setColor( contrastingColor ( Qt::black, -// painter->backgroundColor() ) ); -// painter->setPen( pen ); -// painter->drawLine( x, y, x+w, y ); -// painter->drawLine( x, y, x, y+h ); -// -// pen.setColor( contrastingColor( barBackground.dark(), -// painter->backgroundColor() ) ); -// painter->setPen( pen ); -// painter->drawLine( x+1, y+1, x+w-1, y+1 ); -// painter->drawLine( x+1, y+1, x+1, y+h-1 ); -// -// pen.setColor( contrastingColor( barBackground.light(), -// painter->backgroundColor() ) ); -// painter->setPen( pen ); -// painter->drawLine( x+1, y+h, x+w, y+h ); -// painter->drawLine( x+w, y, x+w, y+h ); -// -// pen.setColor( contrastingColor( Qt::white, -// painter->backgroundColor() ) ); -// painter->setPen( pen ); -// painter->drawLine( x+2, y+h-1, x+w-1, y+h-1 ); -// painter->drawLine( x+w-1, y+1, x+w-1, y+h-1 ); -// } + if ( percent > 100.0 ) percent = 100.0; + if ( percent < 0.0 ) percent = 0.0; + int penWidth = 2; + int extraMargin = 3; + int x = 0; /*FIXME _diskUsageList->itemMargin(); */ + int y = extraMargin; + int w = option.rect.width() - 2; /*FIXME * _diskUsageList->horizontalOffset(); */ + int h = option.rect.height() - 2; /*FIXME * extraMargin; */ + int fillWidth; + + painter->eraseRect( 0, 0, option.rect.width(), option.rect.height() ); + int indent=0; + w -= indent; + x += indent; + + if ( w > 0 ) + { + QPen pen( painter->pen() ); + pen.setWidth(0); + painter->setPen( pen ); + painter->setBrush( Qt::NoBrush ); + fillWidth = (int) ( ( w - 2 * penWidth ) * percent / 100.0 ); + + + // Fill bar background. + + painter->fillRect( x + penWidth, y + penWidth, + w - 2 * penWidth + 1, h - 2 * penWidth + 1, + barBackground ); + /* + * Notice: The Xlib XDrawRectangle() function always fills one + * pixel less than specified. Altough this is very likely just a + * plain old bug, it is documented that way. Obviously, Qt just + * maps the fillRect() call directly to XDrawRectangle() so they + * inherited that bug ( although the Qt doc stays silent about + * it ). So it is really necessary to compensate for that missing + * pixel in each dimension. + * + * If you don't believe it, see for yourself. + * Hint: Try the xmag program to zoom into the drawn pixels. + **/ + + // Fill the desired percentage. + + painter->fillRect( x + penWidth, y + penWidth, + fillWidth+1, h - 2 * penWidth+1, + fillColor ); + + + // Draw 3D shadows. + + pen.setColor( contrastingColor ( Qt::black, + painter->background().color() ) ); + painter->setPen( pen ); + painter->drawLine( x, y, x+w, y ); + painter->drawLine( x, y, x, y+h ); + + pen.setColor( contrastingColor( barBackground.dark(), + painter->background().color() ) ); + painter->setPen( pen ); + painter->drawLine( x+1, y+1, x+w-1, y+1 ); + painter->drawLine( x+1, y+1, x+1, y+h-1 ); + + pen.setColor( contrastingColor( barBackground.light(), + painter->background().color() ) ); + painter->setPen( pen ); + painter->drawLine( x+1, y+h, x+w, y+h ); + painter->drawLine( x+w, y, x+w, y+h ); + + pen.setColor( contrastingColor( Qt::white, + painter->background().color() ) ); + painter->setPen( pen ); + painter->drawLine( x+2, y+h-1, x+w-1, y+h-1 ); + painter->drawLine( x+w-1, y+1, x+w-1, y+h-1 ); + } } -/** - * Stolen from KDirStat::KDirTreeView with the author's permission. - **/ -QColor -QY2DiskUsageListItem::contrastingColor( const QColor & desiredColor, - const QColor & contrastColor ) -{ - if ( desiredColor != contrastColor ) - { - return desiredColor; - } - - if ( contrastColor != contrastColor.light() ) - { - // try a little lighter - return contrastColor.light(); - } - else - { - // try a little darker - return contrastColor.dark(); - } -} - - -QColor -QY2DiskUsageListItem::interpolateColor( int val, - int minVal, - int maxVal, - const QColor & minColor, - const QColor & maxColor ) -{ - int minH, maxH; - int minS, maxS; - int minV, maxV; - - minColor.getHsv( &minH, &minS, &minV ); - maxColor.getHsv( &maxH, &maxS, &maxV ); - - return QColor::fromHsv( interpolate( val, minVal, maxVal, minH, maxH ), - interpolate( val, minVal, maxVal, minS, maxS ), - interpolate( val, minVal, maxVal, minV, maxV ) ); -} - - -int -QY2DiskUsageListItem::interpolate( int from, - int minFrom, int maxFrom, - int minTo, int maxTo ) -{ - if ( minFrom > maxFrom ) - { - // Swap min/max values - - int tmp = maxFrom; - maxFrom = minFrom; - minFrom = tmp; - } - - long x = from - minFrom; - x *= maxTo - minTo; - x /= maxFrom - minFrom; - x += minTo; - - if ( minTo < maxTo ) - { - if ( x < minTo ) x = minTo; - if ( x > maxTo ) x = maxTo; - } - else - { - if ( x < maxTo ) x = maxTo; - if ( x > minTo ) x = minTo; - } - - return (int) x; -} Modified: branches/tmp/coolo/qt4-port/src/QY2DiskUsageList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/QY2Dis… ============================================================================== --- branches/tmp/coolo/qt4-port/src/QY2DiskUsageList.h (original) +++ branches/tmp/coolo/qt4-port/src/QY2DiskUsageList.h Tue Dec 4 17:42:34 2007 @@ -64,6 +64,8 @@ int deviceNameCol() const { return _deviceNameCol; } + virtual void drawRow ( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const; + protected: int _nameCol; @@ -227,6 +229,7 @@ int width, int alignment ); */ + public: /** * Paint a percentage bar into a @ref QListViewItem cell. * 'width' is the width of the entire cell. @@ -236,39 +239,11 @@ **/ void paintPercentageBar( float percent, QPainter * painter, - int indent, - int width, + QStyleOptionViewItem option, const QColor & fillColor, const QColor & barBackground ); - /** - * Return a color that contrasts to 'contrastColor'. - * - * Stolen from KDirStat::KDirTreeView with the author's permission. - **/ - QColor contrastingColor ( const QColor & desiredColor, - const QColor & contrastColor ); - - /** - * Interpolate ( in the HSV color space ) a color between 'minColor' and - * 'maxColor' for a current value 'val' so that 'minVal' corresponds to - * 'minColor' and 'maxVal' to 'maxColor'. - * - * Returns the interpolated color. - **/ - virtual QColor interpolateColor( int val, - int minVal, - int maxVal, - const QColor & minColor, - const QColor & maxColor ); - - /** - * Interpolate ( translate ) a value 'from' in the range between 'minFrom' - * and 'maxFrom' to a range between 'minTo' and 'maxTo'. - **/ - int interpolate( int from, - int minFrom, int maxFrom, - int minTo, int maxTo ); + protected: // Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.cc Tue Dec 4 17:42:34 2007 @@ -28,6 +28,8 @@ #include <fstream> #include <boost/bind.hpp> +#include <QHBoxLayout> +#include <QVBoxLayout> #include <QAction> #include <QShortcut> #include <QApplication> @@ -213,13 +215,20 @@ void YQPackageSelector::basicLayout() { - layoutMenuBar( this ); + + layoutMenuBar(layout()); QSplitter * outer_splitter = new QSplitter( Qt::Horizontal, this ); + QVBoxLayout *layout = new QVBoxLayout(outer_splitter); + outer_splitter->setLayout(layout); + Q_CHECK_PTR( outer_splitter ); - QWidget * left_pane = layoutLeftPane ( outer_splitter ); - QWidget * right_pane = layoutRightPane( outer_splitter ); + QWidget * left_pane = layoutLeftPane ( outer_splitter->layout() ); + this->layout()->addWidget(left_pane); + + QWidget * right_pane = layoutRightPane( outer_splitter->layout() ); + this->layout()->addWidget(right_pane); outer_splitter->setResizeMode( left_pane, QSplitter::KeepSize ); outer_splitter->setResizeMode( right_pane, QSplitter::Stretch ); @@ -227,21 +236,29 @@ QWidget * -YQPackageSelector::layoutLeftPane( QWidget * parent ) +YQPackageSelector::layoutLeftPane( QLayout *parent_layout ) { - QSplitter * splitter = new QSplitter( Qt::Vertical, parent ); + QSplitter * splitter = new QSplitter( Qt::Vertical, this ); Q_CHECK_PTR( splitter ); splitter->setMargin( MARGIN ); + parent_layout->addWidget(splitter); - Q3VBox * upper_vbox = new Q3VBox( splitter ); + QWidget * upper_vbox = new QWidget( splitter ); + QVBoxLayout *layout = new QVBoxLayout(upper_vbox); + upper_vbox->setLayout(layout); + Q_CHECK_PTR( upper_vbox ); - layoutFilters( upper_vbox ); + layoutFilters( upper_vbox->layout() ); addVSpacing( upper_vbox, MARGIN ); - Q3VBox * lower_vbox = new Q3VBox( splitter ); + QWidget * lower_vbox = new QWidget( splitter ); + layout = new QVBoxLayout(lower_vbox); + lower_vbox->setLayout(layout); + addVSpacing( lower_vbox, MARGIN ); _diskUsageList = new YQPkgDiskUsageList( lower_vbox ); Q_CHECK_PTR( _diskUsageList ); + layout->addWidget(_diskUsageList); splitter->setResizeMode( upper_vbox, QSplitter::Stretch ); splitter->setResizeMode( lower_vbox, QSplitter::KeepSize ); @@ -251,11 +268,11 @@ void -YQPackageSelector::layoutFilters( QWidget * parent ) +YQPackageSelector::layoutFilters( QLayout *parent_layout ) { - _filters = new QY2ComboTabWidget( _( "Fi&lter:" ), parent ); + _filters = new QY2ComboTabWidget( _( "Fi&lter:" ), this ); Q_CHECK_PTR( _filters ); - + parent_layout->addWidget(_filters); // // Update problem view @@ -266,7 +283,7 @@ if ( YQPkgUpdateProblemFilterView::haveProblematicPackages() || testMode() ) { - _updateProblemFilterView = new YQPkgUpdateProblemFilterView( parent ); + _updateProblemFilterView = new YQPkgUpdateProblemFilterView( this ); Q_CHECK_PTR( _updateProblemFilterView ); _filters->addPage( _( "Update Problems" ), _updateProblemFilterView ); } @@ -291,7 +308,7 @@ if ( ! zyppPool().empty<zypp::Pattern>() || testMode() ) { - _patternList = new YQPkgPatternList( parent, true ); + _patternList = new YQPkgPatternList( this, true ); Q_CHECK_PTR( _patternList ); _filters->addPage( _( "Patterns" ), _patternList ); @@ -316,7 +333,7 @@ if ( ! zyppPool().empty<zypp::Selection>() || testMode() ) { - _selList = new YQPkgSelList( parent, true ); + _selList = new YQPkgSelList( this, true ); Q_CHECK_PTR( _selList ); _filters->addPage( _( "Selections" ), _selList ); @@ -338,7 +355,7 @@ // RPM group tags view // - _rpmGroupTagsFilterView = new YQPkgRpmGroupTagsFilterView( parent ); + _rpmGroupTagsFilterView = new YQPkgRpmGroupTagsFilterView( this ); Q_CHECK_PTR( _rpmGroupTagsFilterView ); _filters->addPage( _( "Package Groups" ), _rpmGroupTagsFilterView ); @@ -350,7 +367,7 @@ // Languages view // - _langList = new YQPkgLangList( parent ); + _langList = new YQPkgLangList( this ); Q_CHECK_PTR( _langList ); _filters->addPage( _( "Languages" ), _langList ); @@ -367,7 +384,7 @@ // Repository view // - _repoFilterView = new YQPkgRepoFilterView( parent ); + _repoFilterView = new YQPkgRepoFilterView( this ); Q_CHECK_PTR( _repoFilterView ); _filters->addPage( _( "Repositories" ), _repoFilterView ); @@ -376,7 +393,7 @@ // Package search view // - _searchFilterView = new YQPkgSearchFilterView( parent ); + _searchFilterView = new YQPkgSearchFilterView( this ); Q_CHECK_PTR( _searchFilterView ); _filters->addPage( _( "Search" ), _searchFilterView ); @@ -385,7 +402,7 @@ // Status change view // - _statusFilterView = new YQPkgStatusFilterView( parent ); + _statusFilterView = new YQPkgStatusFilterView( this ); Q_CHECK_PTR( _statusFilterView ); _filters->addPage( _( "Installation Summary" ), _statusFilterView ); @@ -401,32 +418,44 @@ QWidget * -YQPackageSelector::layoutRightPane( QWidget * parent ) +YQPackageSelector::layoutRightPane( QLayout *parent_layout ) { - Q3VBox * right_pane_vbox = new Q3VBox( parent ); + QWidget * right_pane_vbox = new QWidget( this ); + + QVBoxLayout *layout = new QVBoxLayout(right_pane_vbox); + right_pane_vbox->setLayout(layout); + Q_CHECK_PTR( right_pane_vbox ); - right_pane_vbox->setMargin( MARGIN ); + parent_layout->addWidget(right_pane_vbox); + + layout->setMargin( MARGIN ); + QSplitter * splitter = new QSplitter( Qt::Vertical, right_pane_vbox ); Q_CHECK_PTR( splitter ); + layout->addWidget(splitter); + + QWidget * splitter_vbox = new QWidget( splitter ); + layout = new QVBoxLayout(splitter_vbox); + splitter_vbox->setLayout(layout); - Q3VBox * splitter_vbox = new Q3VBox( splitter ); Q_CHECK_PTR( splitter_vbox ); - layoutPkgList( splitter_vbox ); + layoutPkgList( right_pane_vbox->layout() ); addVSpacing( splitter_vbox, MARGIN ); - layoutDetailsViews( splitter ); + layoutDetailsViews( right_pane_vbox->layout() ); - layoutButtons( right_pane_vbox ); + layoutButtons( right_pane_vbox->layout() ); return right_pane_vbox; } void -YQPackageSelector::layoutPkgList( QWidget * parent ) +YQPackageSelector::layoutPkgList( QLayout *parent_layout ) { - _pkgList= new YQPkgList( parent ); + _pkgList= new YQPkgList( this ); + parent_layout->addWidget(_pkgList); Q_CHECK_PTR( _pkgList ); connect( _pkgList, SIGNAL( statusChanged() ), @@ -435,17 +464,23 @@ void -YQPackageSelector::layoutDetailsViews( QWidget * parent ) +YQPackageSelector::layoutDetailsViews( QLayout *parent_layout ) { bool haveInstalledPkgs = YQPkgList::haveInstalledPkgs(); - Q3VBox * details_vbox = new Q3VBox( parent ); + QWidget * details_vbox = new QWidget( this ); Q_CHECK_PTR( details_vbox ); - details_vbox->setMinimumSize( 0, 0 ); + parent_layout->addWidget(details_vbox); + + QVBoxLayout *layout = new QVBoxLayout(details_vbox); + details_vbox->setLayout(layout); + //details_vbox->setMinimumSize( 0, 0 ); addVSpacing( details_vbox, 8 ); _detailsViews = new QTabWidget( details_vbox ); + layout->addWidget(_detailsViews); + Q_CHECK_PTR( _detailsViews ); _detailsViews->setMargin( MARGIN ); @@ -543,15 +578,22 @@ void -YQPackageSelector::layoutButtons( QWidget * parent ) +YQPackageSelector::layoutButtons( QLayout *parent_layout ) { - Q3HBox * button_box = new Q3HBox( parent ); + QWidget * button_box = new QWidget( this ); Q_CHECK_PTR( button_box ); - button_box->setSpacing( SPACING ); + parent_layout->addWidget(button_box); + + QHBoxLayout *layout = new QHBoxLayout(button_box); + button_box->setLayout(layout); + + layout->setSpacing( SPACING ); // Button: Dependency check // Translators: Please keep this short! _checkDependenciesButton = new QPushButton( _( "Chec&k" ), button_box ); + layout->addWidget(_checkDependenciesButton); + Q_CHECK_PTR( _checkDependenciesButton ); _checkDependenciesButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert _normalButtonBackground = _checkDependenciesButton->paletteBackgroundColor(); @@ -564,12 +606,16 @@ // Translators: Please keep this short! _autoDependenciesCheckBox = new QCheckBox( _( "A&utocheck" ), button_box ); Q_CHECK_PTR( _autoDependenciesCheckBox ); + layout->addWidget(_autoDependenciesCheckBox); + _autoDependenciesCheckBox->setChecked( AUTO_CHECK_DEPENDENCIES_DEFAULT ); addHStretch( button_box ); QPushButton * cancel_button = new QPushButton( _( "&Cancel" ), button_box ); Q_CHECK_PTR( cancel_button ); + layout->addWidget(cancel_button); + cancel_button->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert connect( cancel_button, SIGNAL( clicked() ), @@ -578,6 +624,7 @@ QPushButton * accept_button = new QPushButton( _( "&Accept" ), button_box ); Q_CHECK_PTR( accept_button ); + layout->addWidget(accept_button); accept_button->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert connect( accept_button, SIGNAL( clicked() ), @@ -588,9 +635,10 @@ void -YQPackageSelector::layoutMenuBar( QWidget * parent ) +YQPackageSelector::layoutMenuBar( QLayout *parent_layout ) { - _menuBar = new QMenuBar( parent ); + _menuBar = new QMenuBar( this ); + parent_layout->addWidget(_menuBar); Q_CHECK_PTR( _menuBar ); _fileMenu = 0; Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.h Tue Dec 4 17:42:34 2007 @@ -202,13 +202,13 @@ void basicLayout(); - QWidget * layoutLeftPane ( QWidget * parent ); - QWidget * layoutRightPane ( QWidget * parent ); - void layoutFilters ( QWidget * parent ); - void layoutPkgList ( QWidget * parent ); - void layoutDetailsViews ( QWidget * parent ); - void layoutButtons ( QWidget * parent ); - void layoutMenuBar ( QWidget * parent ); + QWidget * layoutLeftPane ( QLayout *parent_layout ); + QWidget * layoutRightPane ( QLayout *parent_layout ); + void layoutFilters ( QLayout *parent_layout ); + void layoutPkgList ( QLayout *parent_layout ); + void layoutDetailsViews ( QLayout *parent_layout ); + void layoutButtons ( QLayout *parent_layout ); + void layoutMenuBar ( QLayout *parent_layout ); /** * Establish Qt signal / slot connections. Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.cc Tue Dec 4 17:42:34 2007 @@ -25,6 +25,7 @@ #include <ycp/y2log.h> #include <QAction> +#include <QVBoxLayout> #include "QY2LayoutUtils.h" #include "YQPackageSelectorBase.h" @@ -54,10 +55,8 @@ { setWidgetRep( this ); -// QVBoxLayout *layout = new QVBoxLayout; -// layout->addWidget(child1); -// layout->addWidget(child2); -// setLayout(layout); + QVBoxLayout *layout = new QVBoxLayout(this); + setLayout(layout); _showChangesDialog = false; _pkgConflictDialog = 0; -- 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] r42673 - /branches/tmp/coolo/qt4-port/COPYING
by coolo＠svn.opensuse.org 04 Dec '07

04 Dec '07

Author: coolo Date: Tue Dec 4 17:30:08 2007 New Revision: 42673 URL: http://svn.opensuse.org/viewcvs/yast?rev=42673&view=rev Log: Duncan prefers playing tetris - or something along that Added: branches/tmp/coolo/qt4-port/COPYING - copied unchanged from r42569, trunk/devtools/devtools/admin/copyright/gpl/COPYING -- 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] r42672 - /trunk/pkg-bindings/src/Source.cc
by lslezak＠svn.opensuse.org 04 Dec '07

04 Dec '07

Author: lslezak Date: Tue Dec 4 17:10:17 2007 New Revision: 42672 URL: http://svn.opensuse.org/viewcvs/yast?rev=42672&view=rev Log: - fixed parameters Modified: trunk/pkg-bindings/src/Source.cc Modified: trunk/pkg-bindings/src/Source.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source.cc?rev=4… ============================================================================== --- trunk/pkg-bindings/src/Source.cc (original) +++ trunk/pkg-bindings/src/Source.cc Tue Dec 4 17:10:17 2007 @@ -632,7 +632,7 @@ ptr = this; } - YCPValue ret = SourceStartManagerImpl(source_receiver); + YCPValue ret = SourceStartManagerImpl(enable, source_receiver); if (enable->value()) { @@ -668,7 +668,7 @@ } // enable all sources and load the resolvables - success = YCPBoolean(SourceLoadImpl(source_receiver)->asBoolean()->value() && success->asBoolean()->value()); + success = YCPBoolean(SourceLoadImpl(progress)->asBoolean()->value() && success->asBoolean()->value()); } return success; -- 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] r42671 - in /trunk/samba-server: package/yast2-samba-server.changes src/dialogs.ycp src/helps.ycp
by locilka＠svn.opensuse.org 04 Dec '07

04 Dec '07

Author: locilka Date: Tue Dec 4 16:52:20 2007 New Revision: 42671 URL: http://svn.opensuse.org/viewcvs/yast?rev=42671&view=rev Log: - Merged proofread texts. Modified: trunk/samba-server/package/yast2-samba-server.changes trunk/samba-server/src/dialogs.ycp trunk/samba-server/src/helps.ycp Modified: trunk/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/package/yast2-samba… ============================================================================== --- trunk/samba-server/package/yast2-samba-server.changes (original) +++ trunk/samba-server/package/yast2-samba-server.changes Tue Dec 4 16:52:20 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Dec 4 16:51:49 CET 2007 - locilka(a)suse.cz + +- Merged proofread texts. + +------------------------------------------------------------------- Mon Oct 15 16:36:19 CEST 2007 - locilka(a)suse.cz - Correctly display user-shares status when adjusting it and Modified: trunk/samba-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/dialogs.ycp?rev… ============================================================================== --- trunk/samba-server/src/dialogs.ycp (original) +++ trunk/samba-server/src/dialogs.ycp Tue Dec 4 16:52:20 2007 @@ -406,7 +406,7 @@ if (new_share_name == "") { // TRANSLATORS: popup error message - Report::Error (_("Enter a new share name, please.")); + Report::Error (_("Please enter a new share name.")); continue; } else if (share == new_share_name) { y2milestone ("Old and new share names are the same"); @@ -414,7 +414,7 @@ } else if (SambaConfig::ShareExists (new_share_name)) { // TRANSLATORS: popup error message, %1 is a variable share name Report::Error (sformat ( - _("Share '%1' already exists.\nChoose another share name, please."), + _("Share '%1' already exists.\nPlease choose another share name."), new_share_name )); continue; Modified: trunk/samba-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/helps.ycp?rev=4… ============================================================================== --- trunk/samba-server/src/helps.ycp (original) +++ trunk/samba-server/src/helps.ycp Tue Dec 4 16:52:20 2007 @@ -186,8 +186,7 @@ "passdb_edit" : _("<big>User Authentication Information Back-Ends</big> Here, choose where the Samba server should look for the authentication information. Samba does not support multiple back-ends at once anymore, -only one is allowed. To add a new authentication source, delete the old one, -then you can add it. +only one is allowed. ") + /* passdb backend configuration dialog help 2/7 */ _("smbpasswd file is the file using the same format as -- 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] r42670 - in /trunk/pkg-bindings/src: PkgModuleFunctions.h Source.cc
by lslezak＠svn.opensuse.org 04 Dec '07

04 Dec '07

Author: lslezak Date: Tue Dec 4 16:19:32 2007 New Revision: 42670 URL: http://svn.opensuse.org/viewcvs/yast?rev=42670&view=rev Log: - Pkg::SourceStartManager - added total progress Modified: trunk/pkg-bindings/src/PkgModuleFunctions.h trunk/pkg-bindings/src/Source.cc Modified: trunk/pkg-bindings/src/PkgModuleFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgModuleFuncti… ============================================================================== --- trunk/pkg-bindings/src/PkgModuleFunctions.h (original) +++ trunk/pkg-bindings/src/PkgModuleFunctions.h Tue Dec 4 16:19:32 2007 @@ -178,6 +178,7 @@ void ProcessDone(); YCPValue SourceLoadImpl(const zypp::ProgressData::ReceiverFnc & progress = zypp::ProgressData::ReceiverFnc()); + YCPValue SourceStartManagerImpl(const YCPBoolean&, const zypp::ProgressData::ReceiverFnc & progress = zypp::ProgressData::ReceiverFnc()); // After all, APPL_HIGH might be more appropriate, because we suggest // the user what he should do and if it does not work, it's his job to Modified: trunk/pkg-bindings/src/Source.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source.cc?rev=4… ============================================================================== --- trunk/pkg-bindings/src/Source.cc (original) +++ trunk/pkg-bindings/src/Source.cc Tue Dec 4 16:19:32 2007 @@ -614,8 +614,52 @@ YCPValue PkgModuleFunctions::SourceStartManager (const YCPBoolean& enable) { + // display the progress only when 'enable' is true + if (enable->value()) + { + std::list<std::string> stages; + stages.push_back("Load Sources"); + stages.push_back("Refresh Sources"); + stages.push_back("Rebuild Cache"); + stages.push_back("Load Data"); + + // 3 steps per repository (download, cache rebuild, load resolvables) + ProcessStart("Loading the Package Manager...", stages, "help"); + + // mark refreshing as in progress now + ProcessNextStage(); + + ptr = this; + } + + YCPValue ret = SourceStartManagerImpl(source_receiver); + + if (enable->value()) + { + ProcessDone(); + ptr = NULL; + } + + return ret; +} + +/**************************************************************************************** + * @builtin SourceStartManager + * + * @short Start the source manager - restore the sources and load the resolvables + * @description + * Calls SourceRestore(), if argument enable is true SourceLoad() is called. + * @param boolean enable If true the resolvables are loaded from the enabled sources + * + * @return boolean + **/ +YCPValue +PkgModuleFunctions::SourceStartManagerImpl(const YCPBoolean& enable, const zypp::ProgressData::ReceiverFnc &progress) +{ YCPValue success = SourceRestore(); + ProcessNextStage(); + if( enable->value() ) { if (!success->asBoolean()->value()) @@ -624,7 +668,7 @@ } // enable all sources and load the resolvables - success = YCPBoolean(SourceLoad()->asBoolean()->value() && success->asBoolean()->value()); + success = YCPBoolean(SourceLoadImpl(source_receiver)->asBoolean()->value() && success->asBoolean()->value()); } return success; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0