September 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r40747 - in /trunk/network: VERSION package/yast2-network.changes src/clients/save_network.ycp
by mzugec＠svn.opensuse.org 04 Sep '07

04 Sep '07

Author: mzugec Date: Tue Sep 4 15:16:07 2007 New Revision: 40747 URL: http://svn.opensuse.org/viewcvs/yast?rev=40747&view=rev Log: WLAN Installation - save data from install.inf (#223570) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/save_network.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=40747&r1=407… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue Sep 4 15:16:07 2007 @@ -1 +1 @@ -2.15.72 +2.15.73 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 Tue Sep 4 15:16:07 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Sep 4 15:14:46 CEST 2007 - mzugec(a)suse.cz + +- WLAN Installation - save data from install.inf (#223570) +- 2.15.73 + +------------------------------------------------------------------- Mon Sep 3 14:43:39 CEST 2007 - mzugec(a)suse.cz - install smartlink-softmodem package for devices with *ttySL* Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network… ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Tue Sep 4 15:16:07 2007 @@ -91,6 +91,13 @@ ReadInstallInfItem(install_inf, "QETH_LAYER2_SUPPORT", "Layer2"); ReadInstallInfItem(install_inf, "LLADDR", "OSAHWAddr"); + ReadInstallInfItem(install_inf, "WlanESSID", "WESSID"); + ReadInstallInfItem(install_inf, "WlanAuth", "WAuth"); + ReadInstallInfItem(install_inf, "WlanKey", "WKey"); + ReadInstallInfItem(install_inf, "WlanKeyType", "WkeyType"); + ReadInstallInfItem(install_inf, "WlanKeyLen", "WkeyLen"); + + /* Split network device */ string netdevice = InstallInf["netdevice"]:""; if(netdevice != "") { @@ -184,10 +191,21 @@ SCR::Execute(.target.bash_output, "sed -i s/\"DHCLIENT_SET_HOSTNAME=.*\"/'DHCLIENT_SET_HOSTNAME=\"yes\"'/g /etc/sysconfig/network/dhcp"); } + // wlan devices + if (size(InstallInf["WESSID"]:"")>0 || size(InstallInf["WAuth"]:"")>0 || size(InstallInf["WKey"]:"")>0 || size(InstallInf["WKeyType"]:"")>0 || size(InstallInf["WKeyLen"]:"")>0){ + network_configuration = sformat("%1WIRELESS_ESSID='%2'\n", network_configuration, InstallInf["WESSID"]:""); + network_configuration = sformat("%1WIRELESS_AUTH_MODE='%2'\n", network_configuration, InstallInf["WAuth"]:""); + network_configuration = sformat("%1WIRELESS_AUTH_MODE='%2'\n", network_configuration, InstallInf["WAuth"]:""); + network_configuration = sformat("%1WIRELESS_KEY_LENGTH='%2'\n", network_configuration, InstallInf["WKeyLen"]:""); + if (size(InstallInf["WKeyType"]:"")>0 && size(InstallInf["WKey"]:"")>0) + network_configuration = sformat("%1WIRELESS_KEY_0='%2:%3'\n", network_configuration, substring(InstallInf["WKeyType"]:"", 0, 1), InstallInf["WKey"]:""); + } + + // if available, write MTU if (size(InstallInf["mtu"]:"")>0) network_configuration = sformat("%1MTU='%2'\n", network_configuration, InstallInf["mtu"]:""); - + // for queth devices (s390) if (size(InstallInf["LLADDR"]:"")>0) network_configuration = sformat("%1LLADDR='%2'\n", network_configuration, InstallInf["LLADDR"]:""); -- 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] r40746 - in /trunk/metapackage: package/yast2-metapackage-handler.changes src/yast2-metapackage-handler-ymu.desktop src/yast2-metapackage-handler.desktop
by mvidner＠svn.opensuse.org 04 Sep '07

04 Sep '07

Author: mvidner Date: Tue Sep 4 13:57:08 2007 New Revision: 40746 URL: http://svn.opensuse.org/viewcvs/yast?rev=40746&view=rev Log: .desktop files have to contain NoDisplay=true, not Hidden=true (merged stbinner's change from autobuild) Modified: trunk/metapackage/package/yast2-metapackage-handler.changes trunk/metapackage/src/yast2-metapackage-handler-ymu.desktop trunk/metapackage/src/yast2-metapackage-handler.desktop Modified: trunk/metapackage/package/yast2-metapackage-handler.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/package/yast2-metapa… ============================================================================== --- trunk/metapackage/package/yast2-metapackage-handler.changes (original) +++ trunk/metapackage/package/yast2-metapackage-handler.changes Tue Sep 4 13:57:08 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Sep 4 10:06:32 CEST 2007 - stbinner(a)suse.de + +- .desktop files have to contain NoDisplay=true, not Hidden=true + +------------------------------------------------------------------- Mon Sep 3 14:16:44 CEST 2007 - mvidner(a)suse.cz - Added associations for Firefox, via shared-mime-info (#295677). Modified: trunk/metapackage/src/yast2-metapackage-handler-ymu.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/src/yast2-metapackag… ============================================================================== --- trunk/metapackage/src/yast2-metapackage-handler-ymu.desktop (original) +++ trunk/metapackage/src/yast2-metapackage-handler-ymu.desktop Tue Sep 4 13:57:08 2007 @@ -11,5 +11,5 @@ MimeType=text/x-suse-ymu Categories=SystemSetup # thx Beineri -Hidden=True +NoDisplay=true X-KDE-StartupNotify=false Modified: trunk/metapackage/src/yast2-metapackage-handler.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/src/yast2-metapackag… ============================================================================== --- trunk/metapackage/src/yast2-metapackage-handler.desktop (original) +++ trunk/metapackage/src/yast2-metapackage-handler.desktop Tue Sep 4 13:57:08 2007 @@ -11,5 +11,5 @@ MimeType=text/x-suse-ymp Categories=SystemSetup # thx Beineri -Hidden=True +NoDisplay=true X-KDE-StartupNotify=false -- 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] r40745 - /trunk/mail/package/yast2-mail.changes
by varkoly＠svn.opensuse.org 04 Sep '07

04 Sep '07

Author: varkoly Date: Tue Sep 4 11:15:26 2007 New Revision: 40745 URL: http://svn.opensuse.org/viewcvs/yast?rev=40745&view=rev Log: new changes Modified: trunk/mail/package/yast2-mail.changes Modified: trunk/mail/package/yast2-mail.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/package/yast2-mail.changes?… ============================================================================== --- trunk/mail/package/yast2-mail.changes (original) +++ trunk/mail/package/yast2-mail.changes Tue Sep 4 11:15:26 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Sep 4 11:15:17 CEST 2007 - varkoly(a)suse.de + +- #291378 - Enable Virus scanning does not install clamav +- #266883 - yast2-mail attempts to parse the package database everytime although I have not selected to install more stuff. +- #304707 - yast2 mail gives error + +------------------------------------------------------------------- Sun Aug 12 15:15:38 CEST 2007 - varkoly(a)suse.de - add versions to the provides/obsoletes -- 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] r40744 - /tags/stable-2_15_21/mail/
by varkoly＠svn.opensuse.org 04 Sep '07

04 Sep '07

Author: varkoly Date: Tue Sep 4 11:00:03 2007 New Revision: 40744 URL: http://svn.opensuse.org/viewcvs/yast?rev=40744&view=rev Log: Created tag stable-2_15_21 for mail Added: tags/stable-2_15_21/mail/ - copied from r40743, trunk/mail/ -- 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] r40743 - /trunk/mail/VERSION
by varkoly＠svn.opensuse.org 04 Sep '07

04 Sep '07

Author: varkoly Date: Tue Sep 4 10:59:52 2007 New Revision: 40743 URL: http://svn.opensuse.org/viewcvs/yast?rev=40743&view=rev Log: new version for STABLE Modified: trunk/mail/VERSION Modified: trunk/mail/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/VERSION?rev=40743&r1=40742&… ============================================================================== --- trunk/mail/VERSION (original) +++ trunk/mail/VERSION Tue Sep 4 10:59:52 2007 @@ -1 +1 @@ -2.15.20 +2.15.21 -- 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] r40742 - /trunk/mail/src/Mail.ycp
by varkoly＠svn.opensuse.org 04 Sep '07

04 Sep '07

Author: varkoly Date: Tue Sep 4 10:58:13 2007 New Revision: 40742 URL: http://svn.opensuse.org/viewcvs/yast?rev=40742&view=rev Log: #266883 - yast2-mail attempts to parse the package database everytime although I have not selected to install more stuff. #291378 - Enable Virus scanning does not install clamav Modified: trunk/mail/src/Mail.ycp Modified: trunk/mail/src/Mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/Mail.ycp?rev=40742&r1=4… ============================================================================== --- trunk/mail/src/Mail.ycp (original) +++ trunk/mail/src/Mail.ycp Tue Sep 4 10:58:13 2007 @@ -280,8 +280,7 @@ } } - if (size (fetchmail) > 0 && - ! Package::Installed ("fetchmail")) + if (size (fetchmail) > 0 && ! Package::Installed ("fetchmail")) { install_packages = add (install_packages, "fetchmail"); // Translators: popup message part, ends with a newline @@ -291,10 +290,14 @@ if ((postfix_mda == `cyrus) && ! Package::Installed("cyrus-imapd")) { - install_packages = add(install_packages,"cyrus-imapd"); + install_packages = add(install_packages,"cyrus-imapd"); // Translators: popup message part, ends with a newline message = message + _("Cyrus-imapd, an IMAP server, will be installed.\n"); } + if( install_packages != [] ) + { + Package::DoInstall(install_packages); + } return message; } @@ -415,8 +418,8 @@ // amavis string amavis_pkg = "amavisd-new"; amavis_allowed = PackageSystem::Installed (amavis_pkg) || - Mode::commandline () || - PackageSystem::Available (amavis_pkg); + Mode::commandline (); + // || PackageSystem::Available (amavis_pkg); use_amavis = amavis_allowed && (SCR::Read (.sysconfig.amavis.USE_AMAVIS) == "yes"); // local_domains @@ -730,10 +733,7 @@ SCR::Write (.sysconfig.amavis.USE_AMAVIS, use_amavis? "yes":"no"); // used also in WriteServices amavis_service = true; - if (amavis_service) - { - Service::Adjust ("amavis", use_amavis? "enable":"disable"); - } + Service::Adjust ("amavis", use_amavis? "enable":"disable"); // SENDMAIL_ARGS // by default they contain -q30m, not good for dial-up -- 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] r40741 - in /branches/tmp/sh/mod-ui/qt/src: QY2LayoutUtils.cc QY2LayoutUtils.h pkg/YQPkgChangesDialog.cc pkg/YQPkgConflictDialog.cc pkg/YQPkgTextDialog.cc
by sh-sh-sh＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: sh-sh-sh Date: Mon Sep 3 18:19:54 2007 New Revision: 40741 URL: http://svn.opensuse.org/viewcvs/yast?rev=40741&view=rev Log: limit to screen size for ps3 Modified: branches/tmp/sh/mod-ui/qt/src/QY2LayoutUtils.cc branches/tmp/sh/mod-ui/qt/src/QY2LayoutUtils.h branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgChangesDialog.cc branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgConflictDialog.cc branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgTextDialog.cc Modified: branches/tmp/sh/mod-ui/qt/src/QY2LayoutUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/QY2Layou… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/QY2LayoutUtils.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/QY2LayoutUtils.cc Mon Sep 3 18:19:54 2007 @@ -19,6 +19,7 @@ /-*/ +#include <qapplication.h> #include <qwidget.h> #include "QY2LayoutUtils.h" @@ -60,3 +61,26 @@ return spacer; } + +QSize +limitToScreenSize( const QWidget * widget, int width, int height ) +{ + return limitToScreenSize( widget, QSize( width, height ) ); +} + + +QSize +limitToScreenSize( const QWidget * widget, const QSize & desiredSize ) +{ + QSize availableSize = qApp->desktop()->availableGeometry( const_cast<QWidget*> (widget) ).size(); + + // Subtract WM decorations. There seems to be no reliable way to tell if + // this is necessary at all (even fvwm2 claims it is a NETWM compliant + // window manager) or how large the WM decorations are. + // For the purpose of this function, let's assume we have to subtract the + // common fvwm2 decoration size. This is simplistic and should be improved. + availableSize -= QSize( 10, 35 ); + + return desiredSize.boundedTo( availableSize ); +} + Modified: branches/tmp/sh/mod-ui/qt/src/QY2LayoutUtils.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/QY2Layou… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/QY2LayoutUtils.h (original) +++ branches/tmp/sh/mod-ui/qt/src/QY2LayoutUtils.h Mon Sep 3 18:19:54 2007 @@ -45,5 +45,10 @@ **/ QWidget * addHSpacing( QWidget * parent, int width = 8 ); +/** + * Limit a QSize to what is available on the same screen as 'widget'. + **/ +QSize limitToScreenSize( const QWidget * widget, const QSize & desiredSize ); +QSize limitToScreenSize( const QWidget * widget, int width, int height ); #endif // ifndef QY2LayoutUtils_h Modified: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgChangesDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPk… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgChangesDialog.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgChangesDialog.cc Mon Sep 3 18:19:54 2007 @@ -194,11 +194,7 @@ QSize YQPkgChangesDialog::sizeHint() const { - QRect available = qApp->desktop()->availableGeometry( (QWidget *) this ); - QSize size = QDialog::sizeHint(); - size = size.boundedTo( QSize( available.width(), available.height() ) ); - - return size; + return limitToScreenSize( this, QDialog::sizeHint() ); } Modified: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgConflictDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPk… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgConflictDialog.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgConflictDialog.cc Mon Sep 3 18:19:54 2007 @@ -207,11 +207,7 @@ QSize YQPkgConflictDialog::sizeHint() const { - QSize size( 550, 450 ); - QRect available = qApp->desktop()->availableGeometry( (QWidget *) this ); - size = size.boundedTo( QSize( available.width(), available.height() ) ); - - return size; + return limitToScreenSize( this, 550, 450 ); } Modified: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgTextDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPk… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgTextDialog.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgTextDialog.cc Mon Sep 3 18:19:54 2007 @@ -131,13 +131,15 @@ { _rejectButton = 0; } + + updateGeometry(); } QSize YQPkgTextDialog::sizeHint() const { - return QSize( 500, 450 ); + return limitToScreenSize( this, 500, 450 ); } -- 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] r40740 - /tags/stable-2_15_16/qt/
by sh-sh-sh＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: sh-sh-sh Date: Mon Sep 3 18:19:13 2007 New Revision: 40740 URL: http://svn.opensuse.org/viewcvs/yast?rev=40740&view=rev Log: Created tag stable-2_15_16 for qt Added: tags/stable-2_15_16/qt/ - copied from r40739, trunk/qt/ -- 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] r40739 - in /trunk/qt: VERSION package/yast2-qt.changes src/QY2LayoutUtils.cc src/QY2LayoutUtils.h src/pkg/YQPkgChangesDialog.cc src/pkg/YQPkgConflictDialog.cc src/pkg/YQPkgTextDialog.cc
by sh-sh-sh＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: sh-sh-sh Date: Mon Sep 3 18:18:04 2007 New Revision: 40739 URL: http://svn.opensuse.org/viewcvs/yast?rev=40739&view=rev Log: Limit pkg popups to screen size even with substandard resolutions Modified: trunk/qt/VERSION trunk/qt/package/yast2-qt.changes trunk/qt/src/QY2LayoutUtils.cc trunk/qt/src/QY2LayoutUtils.h trunk/qt/src/pkg/YQPkgChangesDialog.cc trunk/qt/src/pkg/YQPkgConflictDialog.cc trunk/qt/src/pkg/YQPkgTextDialog.cc Modified: trunk/qt/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION?rev=40739&r1=40738&r2… ============================================================================== --- trunk/qt/VERSION (original) +++ trunk/qt/VERSION Mon Sep 3 18:18:04 2007 @@ -1 +1 @@ -2.15.15 +2.15.16 Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Mon Sep 3 18:18:04 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Sep 3 18:13:36 CEST 2007 - sh(a)suse.de + +- Limit pkg popups to screen size even with substandard resolutions + (bug #300632: dialogs too big on PS3) +- V 2.15.16 + +------------------------------------------------------------------- Wed Aug 29 14:38:24 CEST 2007 - tgoettlicher(a)suse.de - wizard shows titlebar depending on existence of title-bar-gradient.png @@ -12,7 +19,6 @@ - V 2.15.14 ------------------------------------------------------------------- ->>>>>>> .r40568 Thu Aug 23 13:25:08 CEST 2007 - kmachalkova(a)suse.cz - Display repository name instead of product name in package selector Modified: trunk/qt/src/QY2LayoutUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/QY2LayoutUtils.cc?rev=407… ============================================================================== --- trunk/qt/src/QY2LayoutUtils.cc (original) +++ trunk/qt/src/QY2LayoutUtils.cc Mon Sep 3 18:18:04 2007 @@ -19,6 +19,7 @@ /-*/ +#include <qapplication.h> #include <qwidget.h> #include "QY2LayoutUtils.h" @@ -60,3 +61,26 @@ return spacer; } + +QSize +limitToScreenSize( const QWidget * widget, int width, int height ) +{ + return limitToScreenSize( widget, QSize( width, height ) ); +} + + +QSize +limitToScreenSize( const QWidget * widget, const QSize & desiredSize ) +{ + QSize availableSize = qApp->desktop()->availableGeometry( const_cast<QWidget*> (widget) ).size(); + + // Subtract WM decorations. There seems to be no reliable way to tell if + // this is necessary at all (even fvwm2 claims it is a NETWM compliant + // window manager) or how large the WM decorations are. + // For the purpose of this function, let's assume we have to subtract the + // common fvwm2 decoration size. This is simplistic and should be improved. + availableSize -= QSize( 10, 35 ); + + return desiredSize.boundedTo( availableSize ); +} + Modified: trunk/qt/src/QY2LayoutUtils.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/QY2LayoutUtils.h?rev=4073… ============================================================================== --- trunk/qt/src/QY2LayoutUtils.h (original) +++ trunk/qt/src/QY2LayoutUtils.h Mon Sep 3 18:18:04 2007 @@ -45,5 +45,10 @@ **/ QWidget * addHSpacing( QWidget * parent, int width = 8 ); +/** + * Limit a QSize to what is available on the same screen as 'widget'. + **/ +QSize limitToScreenSize( const QWidget * widget, const QSize & desiredSize ); +QSize limitToScreenSize( const QWidget * widget, int width, int height ); #endif // ifndef QY2LayoutUtils_h Modified: trunk/qt/src/pkg/YQPkgChangesDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgChangesDialog.cc… ============================================================================== --- trunk/qt/src/pkg/YQPkgChangesDialog.cc (original) +++ trunk/qt/src/pkg/YQPkgChangesDialog.cc Mon Sep 3 18:18:04 2007 @@ -194,11 +194,7 @@ QSize YQPkgChangesDialog::sizeHint() const { - QRect available = qApp->desktop()->availableGeometry( (QWidget *) this ); - QSize size = QDialog::sizeHint(); - size = size.boundedTo( QSize( available.width(), available.height() ) ); - - return size; + return limitToScreenSize( this, QDialog::sizeHint() ); } Modified: trunk/qt/src/pkg/YQPkgConflictDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgConflictDialog.c… ============================================================================== --- trunk/qt/src/pkg/YQPkgConflictDialog.cc (original) +++ trunk/qt/src/pkg/YQPkgConflictDialog.cc Mon Sep 3 18:18:04 2007 @@ -207,11 +207,7 @@ QSize YQPkgConflictDialog::sizeHint() const { - QSize size( 550, 450 ); - QRect available = qApp->desktop()->availableGeometry( (QWidget *) this ); - size = size.boundedTo( QSize( available.width(), available.height() ) ); - - return size; + return limitToScreenSize( this, 550, 450 ); } Modified: trunk/qt/src/pkg/YQPkgTextDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgTextDialog.cc?re… ============================================================================== --- trunk/qt/src/pkg/YQPkgTextDialog.cc (original) +++ trunk/qt/src/pkg/YQPkgTextDialog.cc Mon Sep 3 18:18:04 2007 @@ -141,13 +141,15 @@ { _rejectButton = 0; } + + updateGeometry(); } QSize YQPkgTextDialog::sizeHint() const { - return QSize( 500, 450 ); + return limitToScreenSize( this, 500, 450 ); } -- 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] r40738 - in /trunk/printer: src/modules/Printer.ycp src/modules/Printerlib.ycp testsuite/tests/detectPrinters.out
by mzugec＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: mzugec Date: Mon Sep 3 17:43:19 2007 New Revision: 40738 URL: http://svn.opensuse.org/viewcvs/yast?rev=40738&view=rev Log: changed testsuite output Modified: trunk/printer/src/modules/Printer.ycp trunk/printer/src/modules/Printerlib.ycp trunk/printer/testsuite/tests/detectPrinters.out Modified: trunk/printer/src/modules/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/modules/Printer.ycp?… ============================================================================== --- trunk/printer/src/modules/Printer.ycp (original) +++ trunk/printer/src/modules/Printer.ycp Mon Sep 3 17:43:19 2007 @@ -357,6 +357,7 @@ dev_name = class_dev; } } + if (dev_name==nil) dev_name=""; p = $[ "vendor" : i["sub_vendor"]:i["vendor"]:"", "device" : i["sub_device"]:i["device"]:"", Modified: trunk/printer/src/modules/Printerlib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/modules/Printerlib.y… ============================================================================== --- trunk/printer/src/modules/Printerlib.ycp (original) +++ trunk/printer/src/modules/Printerlib.ycp Mon Sep 3 17:43:19 2007 @@ -125,7 +125,9 @@ * UNIX-like device */ global list<string> GetCupsUsbDeviceInfo (string device) { + if (device=="") return []; integer pos = search(device, "lp"); + if (pos==nil) return []; string dev_num = substring (device, pos + 2); list<string> ret = []; if (dev_num != "") Modified: trunk/printer/testsuite/tests/detectPrinters.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/testsuite/tests/detectPr… ============================================================================== --- trunk/printer/testsuite/tests/detectPrinters.out (original) +++ trunk/printer/testsuite/tests/detectPrinters.out Mon Sep 3 17:43:19 2007 @@ -5,7 +5,6 @@ Read .ppd.db.vendorname "Canon" "" Read .ppd.db.modelname ["Canon", "BJC-6100"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 -Log i $["bus":"USB", "class_id":265, "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"BJC-6100", "sub_vendor":"Canon", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Canon Inc.", "vendor_id":197801] Read .ppd.db.vendorname "Canon" "" Read .ppd.db.modelname ["Canon", "BJC-6100"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 @@ -17,7 +16,6 @@ Read .ppd.db.vendorname "Canon" "" Read .ppd.db.modelname ["Canon", "BJC-6100"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 -Log i $["bus":"USB", "class_id":265, "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"BJC-6100", "sub_vendor":"Canon", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Canon Inc.", "vendor_id":197801] Read .ppd.db.vendorname "Canon" "" Read .ppd.db.modelname ["Canon", "BJC-6100"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 @@ -29,7 +27,6 @@ Execute .target.bash "grep '^usblp ' /proc/modules" 0 Read .proc.modules $["usblp":""] Execute .target.bash "\nMAIN_PID=$$\n{/bin/echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > ; kill $MAIN_PID;} &\nECHO_PID=$!\n{sleep 2s ; kill $ECHO_PID &>/dev/null ;} &" 0 -Log i $["bus":"USB", "class_id":265, "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"Epson", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Epson Inc.", "vendor_id":197801] Read .ppd.db.vendorname "Epson" "" Read .ppd.db.modelname ["Epson", "USB Printer"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 @@ -41,7 +38,6 @@ Execute .target.bash "grep '^usblp ' /proc/modules" 0 Read .proc.modules $["usblp":""] Execute .target.bash "\nMAIN_PID=$$\n{/bin/echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > ; kill $MAIN_PID;} &\nECHO_PID=$!\n{sleep 2s ; kill $ECHO_PID &>/dev/null ;} &" 0 -Log i $["bus":"USB", "class_id":265, "device_id":200786, "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"Epson", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Epson Inc.", "vendor_id":197801] Read .ppd.db.vendorname "Epson" "" Read .ppd.db.modelname ["Epson", "USB Printer"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 @@ -54,7 +50,6 @@ Execute .target.bash "grep '^usblp ' /proc/modules" 0 Read .proc.modules $["usblp":""] Execute .target.bash "\nMAIN_PID=$$\n{/bin/echo -en \"\\000\\000\\000\\033\\001\\100\\105\\112\\114\\040\\061\\062\\070\\064\\056\\064\\012\\100\\105\\112\\114\\040\\040\\040\\040\\040\\012\" > /dev/usblp0 ; kill $MAIN_PID;} &\nECHO_PID=$!\n{sleep 2s ; kill $ECHO_PID &>/dev/null ;} &" 0 -Log i $["bus":"USB", "class_id":265, "dev_name":"/dev/usblp0", "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"Stylus Photo 810", "sub_vendor":"Epson", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"Epson Inc."] Read .ppd.db.vendorname "Epson" "" Read .ppd.db.modelname ["Epson", "Stylus Photo 810"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 @@ -65,7 +60,6 @@ Read .target.size "/usr/lib/cups/backend/usb" 555 Execute .target.bash_output "/usr/lib/cups/backend/usb" $["exit":0, "stderr":"", "stdout":"direct ptal:/mlc:usb:PSC_2200_Series \"Hewlett-Packard PSC 2200 Series\" \"PTAL mlc:usb:PSC_2200_Series\"\n"] Execute .target.bash "grep '^usblp ' /proc/modules" 0 -Log i $["bus":"USB", "class_id":265, "model":"Hewlett-Packard PSC 2200 Series", "resource":$["baud":[$["speed":1500000]]], "rev":"1.03", "sub_class_id":0, "sub_device":"USB Printer", "sub_vendor":"HP", "unique_key":"Q0jS.ZoQ4aZ8KEv3", "vendor":"HP"] Read .ppd.db.vendorname "HP" "" Read .ppd.db.modelname ["HP", "USB Printer"] "" Execute .target.bash "grep '^usblp ' /proc/modules" 0 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0