December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r59973 - /tags/branch-Code-11-SP1-2_17_12/nfs-client/
by kmachalkova＠svn.opensuse.org 07 Dec '09

07 Dec '09

Author: kmachalkova Date: Mon Dec 7 10:53:28 2009 New Revision: 59973 URL: http://svn.opensuse.org/viewcvs/yast?rev=59973&view=rev Log: Created tag branch-Code-11-SP1-2_17_12 for nfs-client Added: tags/branch-Code-11-SP1-2_17_12/nfs-client/ (props changed) - copied from r59972, branches/SuSE-Code-11-SP1-Branch/nfs-client/ -- 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] <web-client> master : Fixed capitalization in registration module
by Martin Schmidkunz 07 Dec '09

07 Dec '09

ref: refs/heads/master commit 2a33c5f1d87cf46bf66073318801a582a8da0632 Author: Martin Schmidkunz <mschmidkunz(a)suse.de> Date: Mon Dec 7 11:33:03 2009 +0530 Fixed capitalization in registration module --- .../app/controllers/registration_controller.rb | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/registration/app/controllers/registration_controller.rb b/plugins/registration/app/controllers/registration_controller.rb index 407ef36..3e4dd7d 100644 --- a/plugins/registration/app/controllers/registration_controller.rb +++ b/plugins/registration/app/controllers/registration_controller.rb @@ -10,14 +10,14 @@ class RegistrationController < ApplicationController def initialize @trans = { 'email' => _("Email"), - 'moniker' => _("System Name"), - 'regcode-sles' => _("SLES Registration Code"), - 'regcode-sled' => _("SLED Registration Code"), - 'appliance-regcode' => _("Appliance Registration Code"), - '___getittranslated1' => _("Registration Code"), + 'moniker' => _("System name"), + 'regcode-sles' => _("SLES registration code"), + 'regcode-sled' => _("SLED registration code"), + 'appliance-regcode' => _("Appliance registration code"), + '___getittranslated1' => _("Registration code"), '___getittranslated2' => _("Hostname"), - '___getittranslated3' => _("Device Name"), - '___getittranslated4' => _("Appliance Name") } + '___getittranslated3' => _("Device name"), + '___getittranslated4' => _("Appliance name") } @trans.freeze end -- 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] <web-client> backgroud_patches_bnc550934 : Fixed capitalization in registration module
by Martin Schmidkunz 07 Dec '09

07 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit 2a33c5f1d87cf46bf66073318801a582a8da0632 Author: Martin Schmidkunz <mschmidkunz(a)suse.de> Date: Mon Dec 7 11:33:03 2009 +0530 Fixed capitalization in registration module --- .../app/controllers/registration_controller.rb | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/registration/app/controllers/registration_controller.rb b/plugins/registration/app/controllers/registration_controller.rb index 407ef36..3e4dd7d 100644 --- a/plugins/registration/app/controllers/registration_controller.rb +++ b/plugins/registration/app/controllers/registration_controller.rb @@ -10,14 +10,14 @@ class RegistrationController < ApplicationController def initialize @trans = { 'email' => _("Email"), - 'moniker' => _("System Name"), - 'regcode-sles' => _("SLES Registration Code"), - 'regcode-sled' => _("SLED Registration Code"), - 'appliance-regcode' => _("Appliance Registration Code"), - '___getittranslated1' => _("Registration Code"), + 'moniker' => _("System name"), + 'regcode-sles' => _("SLES registration code"), + 'regcode-sled' => _("SLED registration code"), + 'appliance-regcode' => _("Appliance registration code"), + '___getittranslated1' => _("Registration code"), '___getittranslated2' => _("Hostname"), - '___getittranslated3' => _("Device Name"), - '___getittranslated4' => _("Appliance Name") } + '___getittranslated3' => _("Device name"), + '___getittranslated4' => _("Appliance name") } @trans.freeze end -- 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] <web-client> master : Added easy description of GUID label
by Martin Schmidkunz 07 Dec '09

07 Dec '09

ref: refs/heads/master commit 8caa785ccfedc2f0d285e463e21aba20414daa30 Author: Martin Schmidkunz <mschmidkunz(a)suse.de> Date: Mon Dec 7 11:29:48 2009 +0530 Added easy description of GUID label --- .../app/views/administrator/index.html.erb | 1 - .../app/views/registration/index.rhtml | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/plugins/administrator/app/views/administrator/index.html.erb b/plugins/administrator/app/views/administrator/index.html.erb index a9f37aa..07512bf 100644 --- a/plugins/administrator/app/views/administrator/index.html.erb +++ b/plugins/administrator/app/views/administrator/index.html.erb @@ -77,5 +77,4 @@ <%= form_send_buttons :onclick=>"password_validation_enabled = true; alias_valid = $('#adminForm').validate().element('#administrator_aliases'); return $('#adminForm').validate().element('#administrator_confirm_password') && alias_valid;", :disabled => disabled %> <% end %> - </div> diff --git a/plugins/registration/app/views/registration/index.rhtml b/plugins/registration/app/views/registration/index.rhtml index 290b610..18f1adc 100644 --- a/plugins/registration/app/views/registration/index.rhtml +++ b/plugins/registration/app/views/registration/index.rhtml @@ -7,7 +7,7 @@ <% if @guid then %> <fieldset> <%=_("This system is registered")%> - <%=_("System's GUID:")%> <%= @guid %> + <%=_("System number (GUID)")%> <%= @guid %> <%= link_to _('Register again'), {:controller => :registration, :action =>:update}, :onclick=>"$('#progress').show()", :class => "button" %> </fieldset> <% -- 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] <web-client> backgroud_patches_bnc550934 : Added easy description of GUID label
by Martin Schmidkunz 07 Dec '09

07 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit 8caa785ccfedc2f0d285e463e21aba20414daa30 Author: Martin Schmidkunz <mschmidkunz(a)suse.de> Date: Mon Dec 7 11:29:48 2009 +0530 Added easy description of GUID label --- .../app/views/administrator/index.html.erb | 1 - .../app/views/registration/index.rhtml | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/plugins/administrator/app/views/administrator/index.html.erb b/plugins/administrator/app/views/administrator/index.html.erb index a9f37aa..07512bf 100644 --- a/plugins/administrator/app/views/administrator/index.html.erb +++ b/plugins/administrator/app/views/administrator/index.html.erb @@ -77,5 +77,4 @@ <%= form_send_buttons :onclick=>"password_validation_enabled = true; alias_valid = $('#adminForm').validate().element('#administrator_aliases'); return $('#adminForm').validate().element('#administrator_confirm_password') && alias_valid;", :disabled => disabled %> <% end %> - </div> diff --git a/plugins/registration/app/views/registration/index.rhtml b/plugins/registration/app/views/registration/index.rhtml index 290b610..18f1adc 100644 --- a/plugins/registration/app/views/registration/index.rhtml +++ b/plugins/registration/app/views/registration/index.rhtml @@ -7,7 +7,7 @@ <% if @guid then %> <fieldset> <%=_("This system is registered")%> - <%=_("System's GUID:")%> <%= @guid %> + <%=_("System number (GUID)")%> <%= @guid %> <%= link_to _('Register again'), {:controller => :registration, :action =>:update}, :onclick=>"$('#progress').show()", :class => "button" %> </fieldset> <% -- 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] r59972 - in /branches/SuSE-Code-11-SP1-Branch/qt-pkg: package/ src/
by tgoettlicher＠svn.opensuse.org 04 Dec '09

04 Dec '09

Author: tgoettlicher Date: Fri Dec 4 17:39:18 2009 New Revision: 59972 URL: http://svn.opensuse.org/viewcvs/yast?rev=59972&view=rev Log: applied latest version Modified: branches/SuSE-Code-11-SP1-Branch/qt-pkg/package/yast2-qt-pkg.changes branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQPackageSelector.cc branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQPkgGenericDetailsView.h branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQPkgPackageKitGroupsFilterView.cc branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQPkgPackageKitGroupsFilterView.h branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQPkgVersionsView.cc branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQPkgVersionsView.h branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQZypp.h Modified: branches/SuSE-Code-11-SP1-Branch/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/qt-pk… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/qt-pkg/package/yast2-qt-pkg.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/qt-pkg/package/yast2-qt-pkg.changes Fri Dec 4 17:39:18 2009 @@ -1,4 +1,22 @@ ------------------------------------------------------------------- +Fri Dec 4 16:59:59 CET 2009 - tgoettlicher(a)suse.de + +- Enabled multiple packages (fate# 305311) +- V 2.18.19 + +------------------------------------------------------------------- +Tue Dec 1 10:13:02 CET 2009 - tgoettlicher(a)suse.de + +- fixed bnc #549868: Mnemonic clash in Software Management +- fixed bnc #554473: UTF-8 Problem +- fixed bnc #558881: Broken accented chars in YaST Qt packager versions tab + +------------------------------------------------------------------- +Thu Nov 19 14:15:03 CET 2009 - tgoettlicher(a)suse.de + +- fixed orphaned packages View (bnc #551771) + +------------------------------------------------------------------- Fri Oct 23 15:56:47 UTC 2009 - dmacvicar(a)suse.de - allow repository upgrades from the user interface @@ -204,7 +222,7 @@ ------------------------------------------------------------------- Fri Jan 9 18:52:44 CET 2009 - sh(a)suse.de -- Fixed accumulated margins in "Versions" view for installed +- Fixed accmulated margins in "Versions" view for installed ------------------------------------------------------------------- Fri Jan 9 17:59:43 CET 2009 - sh(a)suse.de Modified: branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/qt-pk… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQPackageSelector.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQPackageSelector.cc Fri Dec 4 17:39:18 2009 @@ -524,6 +524,9 @@ connect( _pkgList, SIGNAL( currentItemChanged ( ZyppSel ) ), _pkgVersionsView, SLOT ( showDetailsIfVisible( ZyppSel ) ) ); + connect( _pkgList, SIGNAL( statusChanged() ), + _pkgVersionsView, SLOT ( slotRefreshDetails() ) ); + // // File List @@ -733,7 +736,7 @@ _configMenu = new QMenu( _menuBar ); YUI_CHECK_NEW( _configMenu ); action = _menuBar->addMenu( _configMenu ); - action->setText(_( "&Configuration" )); + action->setText(_( "Confi&guration" )); _configMenu->addAction( _( "&Repositories..." ), this, SLOT( repoManager() ), Qt::CTRL + Qt::Key_R ); _configMenu->addAction( _( "&Online Update..." ), this, SLOT( onlineUpdateConfiguration() ), Qt::CTRL + Qt::Key_O ); _configMenu->addAction( _( "Search Packages on &Web..." ), this, SLOT( webpinSearch() ), Qt::CTRL + Qt::Key_W ); @@ -980,6 +983,9 @@ { connect( _pkgVersionsView, SIGNAL( candidateChanged( ZyppObj ) ), _pkgList, SLOT ( updateItemData() ) ); + + connect( _pkgVersionsView, SIGNAL( multiversionSelectionChanged( ) ), + _pkgList, SLOT ( updateItemData() ) ); } @@ -1390,7 +1396,10 @@ // repository if there is a job for it if ( zypp::getZYpp()->resolver()->upgradingRepo(repo) ) { - _repoUpgradingLabel->setText(_repoUpgradingLabel->text() + _("<a href=\"repoupgraderemove:///%1\">Cancel switching</a> system packages to versions in repository %2").arg(repo.alias().c_str()).arg(repo.name().c_str())); + _repoUpgradingLabel->setText(_repoUpgradingLabel->text() + _("<a href=\"repoupgraderemove:///%1\">Cancel switching</a> system packages to versions in repository %2") + .arg(fromUTF8(repo.alias().c_str())) + .arg(fromUTF8(repo.name().c_str())) + ); } } @@ -1406,7 +1415,10 @@ ! repo.isSystemRepo() && _repoFilterView->selectedRepo() == repo ) { - _repoUpgradeLabel->setText(_repoUpgradeLabel->text() + _("<a href=\"repoupgradeadd:///%1\">Switch system packages</a> to the versions in this repository (%2)").arg(repo.alias().c_str()).arg(repo.name().c_str())); + _repoUpgradeLabel->setText(_repoUpgradeLabel->text() + _("<a href=\"repoupgradeadd:///%1\">Switch system packages</a> to the versions in this repository (%2)") + .arg(fromUTF8(repo.alias().c_str())) + .arg(fromUTF8(repo.name().c_str())) + ); } } _repoUpgradeLabel->setVisible(!_repoUpgradeLabel->text().isEmpty() && Modified: branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQPkgGenericDetailsView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/qt-pk… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQPkgGenericDetailsView.h (original) +++ branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQPkgGenericDetailsView.h Fri Dec 4 17:39:18 2009 @@ -124,6 +124,7 @@ **/ virtual void showDetails( ZyppSel selectable ) = 0; + protected slots: Modified: branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQPkgPackageKitGroupsFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/qt-pk… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQPkgPackageKitGroupsFilterView.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQPkgPackageKitGroupsFilterView.cc Fri Dec 4 17:39:18 2009 @@ -72,6 +72,7 @@ case YPKG_GROUP_SUGGESTED: return _( "Suggested Packages" ); case YPKG_GROUP_RECOMMENDED: return _( "Recommended Packages"); case YPKG_GROUP_ORPHANED: return _( "Orphaned Packages" ); + case YPKG_GROUP_MULTIVERSION: return _( "Multiversion Packages" ); // Intentionally omitting 'default' case so gcc can catch unhandled enums } @@ -118,6 +119,7 @@ case YPKG_GROUP_SUGGESTED: return( "package_edutainment_languages" ); case YPKG_GROUP_RECOMMENDED: return( "package_edutainment_languages" ); case YPKG_GROUP_ORPHANED: return( "package_edutainment_languages" ); + case YPKG_GROUP_MULTIVERSION: return( "package_edutainment_languages" ); case YPKG_GROUP_ALL: return( "package_main" ); // Intentionally omitting 'default' case so gcc can catch unhandled enums @@ -219,6 +221,8 @@ _groupsMap[ YPKG_GROUP_RECOMMENDED ] = new YQPkgPackageKitGroup( this, YPKG_GROUP_RECOMMENDED ); _groupsMap[ YPKG_GROUP_SUGGESTED ] = new YQPkgPackageKitGroup( this, YPKG_GROUP_SUGGESTED ); _groupsMap[ YPKG_GROUP_ORPHANED ] = new YQPkgPackageKitGroup( this, YPKG_GROUP_ORPHANED ); + if ( ! zypp::sat::Pool::instance().multiversionEmpty() ) + _groupsMap[ YPKG_GROUP_MULTIVERSION] = new YQPkgPackageKitGroup( this, YPKG_GROUP_MULTIVERSION ); } } @@ -334,28 +338,31 @@ return true; } - if ( selectable->candidateObj() ) + if ( selectedGroup() == YPKG_GROUP_RECOMMENDED && + zypp::PoolItem(pkg).status().isRecommended() ) { - if ( selectedGroup() == YPKG_GROUP_RECOMMENDED && - zypp::PoolItem(pkg).status().isRecommended() ) - { - emit filterMatch( selectable, pkg ); - return true; - } - if ( selectedGroup() == YPKG_GROUP_SUGGESTED && - zypp::PoolItem(pkg).status().isSuggested() ) - { - emit filterMatch( selectable, pkg ); - return true; - } - if ( selectedGroup() == YPKG_GROUP_ORPHANED && - zypp::PoolItem(pkg).status().isOrphaned() ) - { - emit filterMatch( selectable, pkg ); - return true; - } - + emit filterMatch( selectable, pkg ); + return true; } + if ( selectedGroup() == YPKG_GROUP_SUGGESTED && + zypp::PoolItem(pkg).status().isSuggested() ) + { + emit filterMatch( selectable, pkg ); + return true; + } + if ( selectedGroup() == YPKG_GROUP_ORPHANED && + zypp::PoolItem(pkg).status().isOrphaned() ) + { + emit filterMatch( selectable, pkg ); + return true; + } + if ( selectedGroup() == YPKG_GROUP_MULTIVERSION && + selectable->multiversionInstall() ) + { + emit filterMatch( selectable, pkg ); + return true; + } + return false; } Modified: branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQPkgPackageKitGroupsFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/qt-pk… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQPkgPackageKitGroupsFilterView.h (original) +++ branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQPkgPackageKitGroupsFilterView.h Fri Dec 4 17:39:18 2009 @@ -71,6 +71,7 @@ YPKG_GROUP_SUGGESTED, YPKG_GROUP_RECOMMENDED, YPKG_GROUP_ORPHANED, + YPKG_GROUP_MULTIVERSION, YPKG_GROUP_ALL, } YPkgGroupEnum; Modified: branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQPkgVersionsView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/qt-pk… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQPkgVersionsView.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQPkgVersionsView.cc Fri Dec 4 17:39:18 2009 @@ -26,6 +26,9 @@ #include <QTabWidget> #include <QRegExp> #include <QHeaderView> +#include <QStylePainter> +#include <QStyleOptionButton> + #include "YQPkgVersionsView.h" #include "YQPkgRepoList.h" @@ -33,6 +36,7 @@ #include "YQi18n.h" #include "utf8.h" +#define ICONOFFSET 3 // the status icons have an asymmetrical transparent border YQPkgVersionsView::YQPkgVersionsView( QWidget * parent, bool userCanSwitch ) @@ -69,10 +73,19 @@ void +YQPkgVersionsView::slotRefreshDetails( ) +{ + emit multiversionSelectionChanged( ); +} + + +void YQPkgVersionsView::showDetailsIfVisible( ZyppSel selectable ) { _selectable = selectable; + yuiMilestone() << "showDetailsIfVis" << endl; + if ( _parentTab ) // Is this view embedded into a tab widget? { if ( _parentTab->currentWidget() == this ) // Is this page the topmost? @@ -88,6 +101,8 @@ void YQPkgVersionsView::showDetails( ZyppSel selectable ) { + yuiMilestone() << "showDetails" << endl; + _selectable = selectable; if ( ! selectable ) @@ -128,7 +143,7 @@ font.setPixelSize( (int) ( fm.height() * 1.1 ) ); pkgNameLabel->setFont( font ); - pkgNameLabel->setText( selectable->theObj()->name().c_str() ); + pkgNameLabel->setText( fromUTF8(selectable->theObj()->name().c_str()) ); // New scope { @@ -144,64 +159,89 @@ qDeleteAll( _installed ); _installed.clear(); - - // - // Fill installed objects - // + if ( selectable->multiversionInstall() ) { - zypp::ui::Selectable::installed_iterator it = selectable->installedBegin(); + // + // Find installed and available objects ( for multiversion view ) + // + { + zypp::ui::Selectable::picklist_iterator it = selectable->picklistBegin(); + - while ( it != selectable->installedEnd() ) + while ( it != selectable->picklistEnd() ) + { + YQPkgMultiVersion * version = new YQPkgMultiVersion( this, selectable, *it, _userCanSwitch ); + + _installed.push_back( version ); + _layout->addWidget( version ); + + connect (version, SIGNAL(statusChanged()), this, SLOT(slotRefreshDetails())); + connect (this, SIGNAL(multiversionSelectionChanged()), version, SLOT(update())); + + ++it; + } + } + } + else + { + // + // Fill installed objects + // { - QString text = _( "%1-%2 from vendor %3 (installed)" ) - .arg( (*it)->edition().asString().c_str() ) - .arg( (*it)->arch().asString().c_str() ) - .arg( (*it)->vendor().c_str() ) ; - - QWidget * installedVersion = new QWidget( this ); - QHBoxLayout * instLayout = new QHBoxLayout( installedVersion ); - instLayout->setContentsMargins( 0, 0, 0, 0 ); - - QLabel * icon = new QLabel( installedVersion ); - icon->setPixmap( YQIconPool::pkgSatisfied() ); - instLayout->addWidget( icon ); + zypp::ui::Selectable::installed_iterator it = selectable->installedBegin(); + + while ( it != selectable->installedEnd() ) + { + QString text = _( "%1-%2 from vendor %3 (installed)" ) + .arg( fromUTF8( (*it)->edition().asString().c_str() ) ) + .arg( fromUTF8( (*it)->arch().asString().c_str() ) ) + .arg( fromUTF8( (*it)->vendor().c_str() ) ) ; + + QWidget * installedVersion = new QWidget( this ); + QHBoxLayout * instLayout = new QHBoxLayout( installedVersion ); + instLayout->setContentsMargins( 0, 0, 0, 0 ); + + QLabel * icon = new QLabel( installedVersion ); + icon->setPixmap( YQIconPool::pkgSatisfied() ); + instLayout->addWidget( icon ); - QLabel * textLabel = new QLabel( text, installedVersion ); - instLayout->addWidget( textLabel ); - instLayout->addStretch(); + QLabel * textLabel = new QLabel( text, installedVersion ); + instLayout->addWidget( textLabel ); + instLayout->addStretch(); - _installed.push_back( installedVersion ); - _layout->addWidget( installedVersion ); + _installed.push_back( installedVersion ); + _layout->addWidget( installedVersion ); - ++it; + ++it; + } } - } - // - // Fill available objects - // + // + // Fill available objects + // - { - zypp::ui::Selectable::available_iterator it = selectable->availableBegin(); - - while ( it != selectable->availableEnd() ) { - QRadioButton *radioButton = new YQPkgVersion( this, selectable, *it, _userCanSwitch ); - connect( radioButton, SIGNAL( clicked( bool ) ), SLOT( checkForChangedCandidate() ) ); + zypp::ui::Selectable::available_iterator it = selectable->availableBegin(); + + while ( it != selectable->availableEnd() ) + { + QRadioButton *radioButton = new YQPkgVersion( this, selectable, *it, _userCanSwitch ); + connect( radioButton, SIGNAL( clicked( bool ) ), SLOT( checkForChangedCandidate() ) ); - _buttons->addButton( radioButton ); - _layout->addWidget( radioButton ); + _buttons->addButton( radioButton ); + _layout->addWidget( radioButton ); - if ( selectable->hasCandidateObj() && - selectable->candidateObj()->edition() == (*it)->edition() && - selectable->candidateObj()->arch() == (*it)->arch() ) - { - radioButton->setChecked(true); - } + if ( selectable->hasCandidateObj() && + selectable->candidateObj()->edition() == (*it)->edition() && + selectable->candidateObj()->arch() == (*it)->arch() ) + { + radioButton->setChecked(true); + } - ++it; + ++it; + } } } @@ -307,11 +347,11 @@ // ^^^^^^ ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^ ^^^^^^^^ // %1 %2 %3 %4 %5 setText( _( "%1-%2 from %3 with priority %4 and vendor %5" ) - .arg( zyppObj->edition().asString().c_str() ) - .arg( zyppObj->arch().asString().c_str() ) - .arg( zyppObj->repository().info().name().c_str() ) + .arg( fromUTF8( zyppObj->edition().asString().c_str() ) ) + .arg( fromUTF8( zyppObj->arch().asString().c_str() ) ) + .arg( fromUTF8( zyppObj->repository().info().name().c_str() ) ) .arg( zyppObj->repository().info().priority() ) - .arg( zyppObj->vendor().c_str() ) ); + .arg( fromUTF8( zyppObj->vendor().c_str() ) ) ); } @@ -334,4 +374,163 @@ + +YQPkgMultiVersion::YQPkgMultiVersion( QWidget * parent, + ZyppSel selectable, + ZyppPoolItem zyppPoolItem, + bool enabled ) + : QCheckBox( parent ) + , _selectable( selectable ) + , _zyppPoolItem( zyppPoolItem ) +{ + setText (_( "%1-%2 from %3 with priority %4 and vendor %5" ) + .arg( fromUTF8( zyppPoolItem->edition().asString().c_str() ) ) + .arg( fromUTF8( zyppPoolItem->arch().asString().c_str() ) ) + .arg( fromUTF8( zyppPoolItem->repository().info().name().c_str() ) ) + .arg( zyppPoolItem->repository().info().priority() ) + .arg( fromUTF8( zyppPoolItem->vendor().c_str() ) )); + + + connect( this, SIGNAL (toggled(bool)), this, SLOT( slotIconClicked())); +} + + +YQPkgMultiVersion::~YQPkgMultiVersion() +{ + // NOP +} + + +void YQPkgMultiVersion::slotIconClicked() +{ + // prevent checkmark, we draw the status icons ourselves + bool oldBlock = blockSignals( true ); + setChecked( false ); + blockSignals( oldBlock ); + cycleStatus(); +} + + +void YQPkgMultiVersion::cycleStatus() +{ + + ZyppStatus oldStatus = _selectable->pickStatus( _zyppPoolItem ); + ZyppStatus newStatus = oldStatus; + + switch ( oldStatus ) + { + case S_Install: + newStatus = S_NoInst; + break; + + case S_Protected: + newStatus = _selectable->identicalAvailable( _zyppPoolItem ) ? + S_KeepInstalled: S_NoInst; + break; + + case S_Taboo: + newStatus = _selectable->identicalInstalled( _zyppPoolItem ) ? + S_KeepInstalled : S_NoInst; + break; + + case S_KeepInstalled: + newStatus = _selectable->identicalAvailable( _zyppPoolItem ) ? + S_Update : S_Del; + break; + + case S_Update: + newStatus = S_Del; + break; + + case S_AutoUpdate: + newStatus = S_KeepInstalled; + break; + + case S_Del: + case S_AutoDel: + newStatus = S_KeepInstalled; + break; + + case S_NoInst: + if ( _selectable->identicalAvailable( _zyppPoolItem ) ) + { + newStatus = S_Install; + } + else + { + yuiWarning() << "No candidate for " << _selectable->theObj()->name() << endl; + newStatus = S_NoInst; + } + break; + + case S_AutoInstall: + // this used to be taboo before, but now ZYpp supports + // saving weak locks (unselected packages) + newStatus = S_NoInst; + break; + } + + + setStatus( newStatus ); + yuiMilestone() << "oldStatus:" << oldStatus << endl; + yuiMilestone() << "newStatus:" << newStatus << endl; + +} + + +void YQPkgMultiVersion::setStatus( ZyppStatus newStatus ) +{ + _selectable->setPickStatus( _zyppPoolItem, newStatus ); + + emit statusChanged(); + update(); +} + + +void YQPkgMultiVersion::paintEvent(QPaintEvent *) +{ + // draw the usual checkbox + QStylePainter p(this); + QStyleOptionButton opt; + initStyleOption(&opt); + p.drawControl(QStyle::CE_CheckBox, opt); + + + // calculate position and draw the status icon + QRect elementRect = style()->subElementRect ( QStyle::SE_CheckBoxIndicator, &opt); + QPixmap icon = statusIcon( _selectable->pickStatus(_zyppPoolItem) ); + + QPoint start = elementRect.center() - icon.rect().center(); + QRect rect = QRect(start.x() - ICONOFFSET, start.y(), icon.width(), icon.height()); + + p.drawItemPixmap( rect, 0, icon ); +} + + +QPixmap YQPkgMultiVersion::statusIcon( ZyppStatus status ) +{ + QPixmap icon = YQIconPool::pkgNoInst(); + + switch ( status ) + { + case S_Del: icon = YQIconPool::pkgDel(); break; + case S_Install: icon = YQIconPool::pkgInstall(); break; + case S_KeepInstalled: icon = YQIconPool::pkgKeepInstalled(); break; + case S_NoInst: icon = QPixmap(); break; + case S_Protected: icon = YQIconPool::pkgProtected(); break; + case S_Taboo: icon = YQIconPool::pkgTaboo(); break; + case S_Update: icon = YQIconPool::pkgUpdate(); break; + + case S_AutoDel: icon = YQIconPool::pkgAutoDel(); break; + case S_AutoInstall: icon = YQIconPool::pkgAutoInstall(); break; + case S_AutoUpdate: icon = YQIconPool::pkgAutoUpdate(); break; + + // Intentionally omitting 'default' branch so the compiler can + // catch unhandled enum states + } + return icon; +} + + + #include "YQPkgVersionsView.moc" Modified: branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQPkgVersionsView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/qt-pk… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQPkgVersionsView.h (original) +++ branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQPkgVersionsView.h Fri Dec 4 17:39:18 2009 @@ -22,6 +22,7 @@ #include <QScrollArea> #include <QRadioButton> +#include <QCheckBox> #include <QButtonGroup> #include <QBoxLayout> #include <QLabel> @@ -29,6 +30,7 @@ #include "YQZypp.h" + class QTabWidget; @@ -80,6 +82,7 @@ **/ void reload( QWidget * newCurrent ); + void slotRefreshDetails(); signals: @@ -87,6 +90,8 @@ * Emitted when the user changes the **/ void candidateChanged( ZyppObj newCandidate ); + void multiversionSelectionChanged( ); + protected slots: @@ -117,7 +122,7 @@ }; -class YQPkgVersion: public QRadioButton +class YQPkgVersion : public QRadioButton { public: @@ -163,4 +168,65 @@ }; + +class YQPkgMultiVersion: public QCheckBox +{ + Q_OBJECT + +public: + + /** + * Constructor. Creates a YQPkgVersion item that corresponds to the package + * manager object that 'pkg' refers to. + **/ + YQPkgMultiVersion( QWidget * parent, + ZyppSel selectable, + ZyppPoolItem zyppPoolItem, + bool enabled = true ); + + /** + * Destructor + **/ + virtual ~YQPkgMultiVersion(); + + /** + * Returns the original ZYPP selectable + **/ + ZyppSel selectable() const { return _selectable; } + + /** + * Paints checkboxes with status icons instead of a checkmark + **/ + void paintEvent(QPaintEvent *); + + +protected: + + /** + * Cycle the package status to the next valid value. + **/ + void cycleStatus(); + + void setStatus( ZyppStatus newStatus ); + QPixmap statusIcon( ZyppStatus status ); + + // Data members + + ZyppSel _selectable; + ZyppPoolItem _zyppPoolItem; + + +protected slots: + void slotIconClicked(); + + +signals: + void statusChanged(); + + +}; + + + + #endif // ifndef YQPkgVersionsView_h Modified: branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQZypp.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/qt-pk… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQZypp.h (original) +++ branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQZypp.h Fri Dec 4 17:39:18 2009 @@ -55,6 +55,7 @@ typedef zypp::Pattern::constPtr ZyppPattern; typedef zypp::Patch::constPtr ZyppPatch; typedef zypp::Product::constPtr ZyppProduct; +typedef zypp::PoolItem ZyppPoolItem; typedef zypp::ResPoolProxy ZyppPool; typedef zypp::ResPoolProxy::const_iterator ZyppPoolIterator; -- 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] r59971 - in /branches/SuSE-Code-11-SP1-Branch/qt-pkg: VERSION.cmake yast2-qt-pkg.spec.in
by tgoettlicher＠svn.opensuse.org 04 Dec '09

04 Dec '09

Author: tgoettlicher Date: Fri Dec 4 17:33:24 2009 New Revision: 59971 URL: http://svn.opensuse.org/viewcvs/yast?rev=59971&view=rev Log: updated version Modified: branches/SuSE-Code-11-SP1-Branch/qt-pkg/VERSION.cmake branches/SuSE-Code-11-SP1-Branch/qt-pkg/yast2-qt-pkg.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/qt-pk… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/qt-pkg/VERSION.cmake (original) +++ branches/SuSE-Code-11-SP1-Branch/qt-pkg/VERSION.cmake Fri Dec 4 17:33:24 2009 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "18") -SET(VERSION_PATCH "18") +SET(VERSION_PATCH "19") Modified: branches/SuSE-Code-11-SP1-Branch/qt-pkg/yast2-qt-pkg.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/qt-pk… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/qt-pkg/yast2-qt-pkg.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/qt-pkg/yast2-qt-pkg.spec.in Fri Dec 4 17:33:24 2009 @@ -11,9 +11,9 @@ BuildRequires: yast2-devtools >= 2.16.3 Requires: yast2-qt >= 2.17.13 BuildRequires: yast2-qt-devel >= 2.17.13 -BuildRequires: libzypp-devel >= 6.19.3 +BuildRequires: libzypp-devel >= 6.26.3 BuildRequires: yast2-libyui-devel >= 2.17.14 -Requires: libzypp >= 6.19.0 +Requires: libzypp >= 6.26.3 Requires: yast2-libyui >= 2.17.14 Requires: yast2_theme >= 2.16.1 Provides: yast2-qt:/usr/lib/YaST2/plugin/libpy2qt_pkg.so.2 -- 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] r59970 - in /trunk/qt-pkg: ./ package/ src/
by tgoettlicher＠svn.opensuse.org 04 Dec '09

04 Dec '09

Author: tgoettlicher Date: Fri Dec 4 17:19:41 2009 New Revision: 59970 URL: http://svn.opensuse.org/viewcvs/yast?rev=59970&view=rev Log: - Enabled multiple packages (fate# 305311) - V 2.18.19 Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.cc trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.h trunk/qt-pkg/src/YQPkgVersionsView.cc trunk/qt-pkg/src/YQPkgVersionsView.h trunk/qt-pkg/yast2-qt-pkg.spec.in Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=59970&r… ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Fri Dec 4 17:19:41 2009 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "18") -SET(VERSION_PATCH "18") +SET(VERSION_PATCH "19") Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Fri Dec 4 17:19:41 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Dec 4 16:59:59 CET 2009 - tgoettlicher(a)suse.de + +- Enabled multiple packages (fate# 305311) +- V 2.18.19 + +------------------------------------------------------------------- Tue Dec 1 10:13:02 CET 2009 - tgoettlicher(a)suse.de - fixed bnc #549868: Mnemonic clash in Software Management Modified: trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgPackageKitGroups… ============================================================================== --- trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.cc (original) +++ trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.cc Fri Dec 4 17:19:41 2009 @@ -72,6 +72,7 @@ case YPKG_GROUP_SUGGESTED: return _( "Suggested Packages" ); case YPKG_GROUP_RECOMMENDED: return _( "Recommended Packages"); case YPKG_GROUP_ORPHANED: return _( "Orphaned Packages" ); + case YPKG_GROUP_MULTIVERSION: return _( "Multiversion Packages" ); // Intentionally omitting 'default' case so gcc can catch unhandled enums } @@ -118,6 +119,7 @@ case YPKG_GROUP_SUGGESTED: return( "package_edutainment_languages" ); case YPKG_GROUP_RECOMMENDED: return( "package_edutainment_languages" ); case YPKG_GROUP_ORPHANED: return( "package_edutainment_languages" ); + case YPKG_GROUP_MULTIVERSION: return( "package_edutainment_languages" ); case YPKG_GROUP_ALL: return( "package_main" ); // Intentionally omitting 'default' case so gcc can catch unhandled enums @@ -219,6 +221,8 @@ _groupsMap[ YPKG_GROUP_RECOMMENDED ] = new YQPkgPackageKitGroup( this, YPKG_GROUP_RECOMMENDED ); _groupsMap[ YPKG_GROUP_SUGGESTED ] = new YQPkgPackageKitGroup( this, YPKG_GROUP_SUGGESTED ); _groupsMap[ YPKG_GROUP_ORPHANED ] = new YQPkgPackageKitGroup( this, YPKG_GROUP_ORPHANED ); + if ( ! zypp::sat::Pool::instance().multiversionEmpty() ) + _groupsMap[ YPKG_GROUP_MULTIVERSION] = new YQPkgPackageKitGroup( this, YPKG_GROUP_MULTIVERSION ); } } @@ -352,6 +356,13 @@ emit filterMatch( selectable, pkg ); return true; } + if ( selectedGroup() == YPKG_GROUP_MULTIVERSION && + selectable->multiversionInstall() ) + { + emit filterMatch( selectable, pkg ); + return true; + } + return false; } Modified: trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgPackageKitGroups… ============================================================================== --- trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.h (original) +++ trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.h Fri Dec 4 17:19:41 2009 @@ -71,6 +71,7 @@ YPKG_GROUP_SUGGESTED, YPKG_GROUP_RECOMMENDED, YPKG_GROUP_ORPHANED, + YPKG_GROUP_MULTIVERSION, YPKG_GROUP_ALL, } YPkgGroupEnum; Modified: trunk/qt-pkg/src/YQPkgVersionsView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgVersionsView.cc?… ============================================================================== --- trunk/qt-pkg/src/YQPkgVersionsView.cc (original) +++ trunk/qt-pkg/src/YQPkgVersionsView.cc Fri Dec 4 17:19:41 2009 @@ -75,7 +75,6 @@ void YQPkgVersionsView::slotRefreshDetails( ) { - yuiMilestone() << "slotRefreshDetails" << endl; emit multiversionSelectionChanged( ); } @@ -405,7 +404,9 @@ void YQPkgMultiVersion::slotIconClicked() { // prevent checkmark, we draw the status icons ourselves + bool oldBlock = blockSignals( true ); setChecked( false ); + blockSignals( oldBlock ); cycleStatus(); } @@ -423,17 +424,17 @@ break; case S_Protected: - newStatus = _selectable->hasCandidateObj() ? + newStatus = _selectable->identicalAvailable( _zyppPoolItem ) ? S_KeepInstalled: S_NoInst; break; case S_Taboo: - newStatus = _selectable->hasInstalledObj() ? + newStatus = _selectable->identicalInstalled( _zyppPoolItem ) ? S_KeepInstalled : S_NoInst; break; case S_KeepInstalled: - newStatus = _selectable->hasCandidateObj() ? + newStatus = _selectable->identicalAvailable( _zyppPoolItem ) ? S_Update : S_Del; break; @@ -451,7 +452,7 @@ break; case S_NoInst: - if ( _selectable->hasCandidateObj() ) + if ( _selectable->identicalAvailable( _zyppPoolItem ) ) { newStatus = S_Install; } @@ -469,7 +470,10 @@ break; } + setStatus( newStatus ); + yuiMilestone() << "oldStatus:" << oldStatus << endl; + yuiMilestone() << "newStatus:" << newStatus << endl; } @@ -479,6 +483,7 @@ _selectable->setPickStatus( _zyppPoolItem, newStatus ); emit statusChanged(); + update(); } Modified: trunk/qt-pkg/src/YQPkgVersionsView.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgVersionsView.h?r… ============================================================================== --- trunk/qt-pkg/src/YQPkgVersionsView.h (original) +++ trunk/qt-pkg/src/YQPkgVersionsView.h Fri Dec 4 17:19:41 2009 @@ -202,7 +202,11 @@ protected: + /** + * Cycle the package status to the next valid value. + **/ void cycleStatus(); + void setStatus( ZyppStatus newStatus ); QPixmap statusIcon( ZyppStatus status ); @@ -215,6 +219,7 @@ protected slots: void slotIconClicked(); + signals: void statusChanged(); Modified: trunk/qt-pkg/yast2-qt-pkg.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/yast2-qt-pkg.spec.in?rev=… ============================================================================== --- trunk/qt-pkg/yast2-qt-pkg.spec.in (original) +++ trunk/qt-pkg/yast2-qt-pkg.spec.in Fri Dec 4 17:19:41 2009 @@ -11,9 +11,9 @@ BuildRequires: yast2-devtools >= 2.16.3 Requires: yast2-qt >= 2.17.13 BuildRequires: yast2-qt-devel >= 2.17.13 -BuildRequires: libzypp-devel >= 6.26.0 +BuildRequires: libzypp-devel >= 6.26.3 BuildRequires: yast2-libyui-devel >= 2.17.14 -Requires: libzypp >= 6.26.0 +Requires: libzypp >= 6.26.3 Requires: yast2-libyui >= 2.17.14 Requires: yast2_theme >= 2.16.1 Provides: yast2-qt:/usr/lib/YaST2/plugin/libpy2qt_pkg.so.2 -- 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] r59969 - /tags/branch-Code-11-SP1-2_17_25/ldap-server/
by rhafer＠svn.opensuse.org 04 Dec '09

04 Dec '09

Author: rhafer Date: Fri Dec 4 16:20:19 2009 New Revision: 59969 URL: http://svn.opensuse.org/viewcvs/yast?rev=59969&view=rev Log: Created tag branch-Code-11-SP1-2_17_25 for ldap-server Added: tags/branch-Code-11-SP1-2_17_25/ldap-server/ (props changed) - copied from r59968, branches/SuSE-Code-11-SP1-Branch/ldap-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] r59968 - /tags/branch-Code-11-SP1-2_17_25/
by rhafer＠svn.opensuse.org 04 Dec '09

04 Dec '09

Author: rhafer Date: Fri Dec 4 16:20:13 2009 New Revision: 59968 URL: http://svn.opensuse.org/viewcvs/yast?rev=59968&view=rev Log: Created tag branch-Code-11-SP1-2_17_25 Added: tags/branch-Code-11-SP1-2_17_25/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0