April 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63883 - in /trunk/fcoe-client/src: FcoeClient.ycp complex.ycp
by gs＠svn2.opensuse.org 28 Apr '11

28 Apr '11

Author: gs Date: Thu Apr 28 14:01:49 2011 New Revision: 63883 URL: http://svn.opensuse.org/viewcvs/yast?rev=63883&view=rev Log: Transfer detecting of netcards to module Modified: trunk/fcoe-client/src/FcoeClient.ycp trunk/fcoe-client/src/complex.ycp Modified: trunk/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/FcoeClient.ycp?r… ============================================================================== --- trunk/fcoe-client/src/FcoeClient.ycp (original) +++ trunk/fcoe-client/src/FcoeClient.ycp Thu Apr 28 14:01:49 2011 @@ -38,6 +38,10 @@ import "Report"; import "Summary"; import "Message"; +import "Stage"; +import "Mode"; +import "Package"; +import "Popup"; /** * Prototypes @@ -122,19 +126,148 @@ // Settings: Define all variables needed for configuration of fcoe-client -// TODO FIXME: Define all the variables necessary to hold -// TODO FIXME: the configuration here (with the appropriate -// TODO FIXME: description) -// TODO FIXME: For example: -// /** -// * List of the configured cards. -// */ -// list cards = []; -// -// /** -// * Some additional parameter needed for the configuration. -// */ -// boolean additional_parameter = true; + +// Define all the variables necessary to hold + +global string NOT_CONFIGURED = "not configured"; + +// map containing information about networks cards and VLAN, FCoE aand DCB status +map <integer, list> network_interfaces = $[]; + +// map containing information about values in /etc/fcoe/config +map <string, string> fcoe_general_config = $[]; + +// +// Check whether open-fcoe is installed and do installation if user agrees +// (dependencies: 'lldpad', 'libhbalinux2' and 'libHBAAPI2') +// +boolean CheckInstalledPackages() +{ + boolean ret = false; + + // don't check interactively for packages (bnc#367300) + // skip it during initial and second stage or when create AY profile + if(Stage::cont() || Stage::initial() || Mode::config()) return true; + y2milestone("Check if open-fcoe package installed"); + + if( !Package::InstallMsg( "open-fcoe", + _("To continue the FCoE configuration, the %1 package must be installed.") + + _("Install it now?")) ) + { + Popup::Error( Message::CannotContinueWithoutPackagesInstalled() ); + } + else + { + ret = true; + } + return ret; +} + + +// +// Check whether a VLAN interface is configured for a given network interface +// +string GetVlanInterface ( string interface ) +{ + string vlan_interface = ""; + string command = sformat( "sed -n 's/\$[^ ]*\$ *.*%1/\\1/p' /proc/net/vlan/config", + interface ); + y2milestone( "Executing command: %1", command ); + + map output = (map)SCR::Execute( .target.bash_output, command ); + // read stdout (remove \n at the end) + vlan_interface = substring( output["stdout"]:"", 0, size(output["stdout"]:"") -1 ); + + return vlan_interface; +} + +// +// Get status of FCoE and DCB from /etc/fcoe/cfg-eth<vlan_interface +// +map <string, string> GetFCoEStatus( string vlan_interface ) +{ + map <string, string> status_map = $[]; + + if ( vlan_interface != "") + { + string file_name = sformat( "/etc/fcoe/cfg-%1", vlan_interface ); + y2milestone( "VLAN channel %1 found, reading %2", vlan_interface, file_name ); + + string content = (string)SCR::Read(.target.string, file_name); + if ( content == "" ) + y2warning( "Cannot read %1", file_name ); + else + y2milestone( "Content: %1", content ); + + list <string> lines = splitstring( content, "\n" ); + + foreach( string line, (list<string>)lines, { + if ( regexpmatch( line, "^FCOE_ENABLE" ) ) + { + status_map = add( status_map, "FCOE_ENABLE", substring( line, 12 ) ); + } + if ( regexpmatch( line, "^DCB_REQUIRED" ) ) + { + status_map = add( status_map, "DCB_REQUIRED", substring( line, 13 ) ); + } + }); + } + else + { + y2error( "Interface not valid" ); + } + + return status_map; +} + +// +// Detect network interface cards (hardware probe) and get status +// +void DetectNetworkCards() +{ + string vlan_interface = ""; + + list <map> netcards = (list<map>)SCR::Read(.probe.netcard); + y2milestone( "Detected netcards: %1", netcards ); + integer row = 0; + + foreach ( map card, netcards, { + list info_list = []; + map <string, string> status_map = $[]; + + vlan_interface = GetVlanInterface( card["dev_name"]:"" ); + if ( vlan_interface != "" ) + status_map = GetFCoEStatus( vlan_interface ); + else + vlan_interface = NOT_CONFIGURED; + + info_list = add( info_list, card["dev_name"]:""); + info_list = add( info_list, card["device"]:""); + info_list = add( info_list, vlan_interface ); + info_list = add( info_list, status_map["FCOE_ENABLE"]:""); + info_list = add( info_list, status_map["DCB_REQUIRED"]:""); + + network_interfaces = add( network_interfaces, row, info_list ); + row = row + 1; + } ); +} + +// +// Returns the map containing all detected interfaces including +// configuration status of VLAN, FCoE and DCB +// +global map <integer, list> GetNetworkCards() +{ + return network_interfaces; +} + +// +// Returns the map containing general FCoE configuration +// +global map <string, string> GetFcoeConfig() +{ + return fcoe_general_config; +} /** * Read all fcoe-client settings @@ -154,18 +287,18 @@ // We do not set help text here, because it was set outside Progress::New( caption, " ", steps, [ /* Progress stage 1/3 */ - _("Read the database"), + _("Check installed packages"), /* Progress stage 2/3 */ - _("Read the previous settings"), + _("Detect network cards"), /* Progress stage 3/3 */ - _("Detect the devices") + _("Check services") ], [ /* Progress step 1/3 */ - _("Reading the database..."), + _("Checking for installed packages..."), /* Progress step 2/3 */ - _("Reading the previous settings..."), + _("Detecting network cards..."), /* Progress step 3/3 */ - _("Detecting the devices..."), + _("Checking for services..."), /* Progress finished */ _("Finished") ], @@ -175,15 +308,21 @@ // read database if(Abort()) return false; Progress::NextStage(); + + boolean installed = CheckInstalledPackages(); + /* Error message */ - if(false) Report::Error(_("Cannot read database.")); + if( !installed ) return false; sleep(sl); // read current settings if(Abort()) return false; Progress::NextStage(); + + DetectNetworkCards(); + /* Error message */ - if(false) Report::Error(Message::CannotReadCurrentSettings()); + if(false) Report::Error(_("Cannot get information about netcards")); sleep(sl); // detect devices Modified: trunk/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/complex.ycp?rev=… ============================================================================== --- trunk/fcoe-client/src/complex.ycp (original) +++ trunk/fcoe-client/src/complex.ycp Thu Apr 28 14:01:49 2011 @@ -88,58 +88,28 @@ y2milestone( "Init services dialog" ); } - // -// Check whether a VLAN interface is configured for a given network interface // -string GetVlanInterface ( string interface ) -{ - string vlan_interface = ""; - string command = sformat( "sed -n 's/\$[^ ]*\$ *.*%1/\\1/p' /proc/net/vlan/config", interface ); - y2milestone( "Executing command: %1", command ); - - map output = (map)SCR::Execute( .target.bash_output, command ); - // read stdout (remove \n at the end) - vlan_interface = substring( output["stdout"]:"", 0, size(output["stdout"]:"") -1 ); - - return vlan_interface; -} - -map <string, string> GetFCoEStatus( string vlan_interface ) +// +void AdjustButtons() { - map <string, string> status_map = $[]; + map <integer, list> netcards = FcoeClient::GetNetworkCards(); + integer row = (integer)UI::QueryWidget( `id(`interfaces), `CurrentItem ); + list card = netcards[row]:[]; - if ( vlan_interface != "") - { - string file_name = sformat( "/etc/fcoe/cfg-%1", vlan_interface ); - y2milestone( "VLAN channel %1 found, reading %2", vlan_interface, file_name ); - string content = (string)SCR::Read(.target.string, file_name); - if ( content == "" ) - y2warning( "Cannot read %1", file_name ); - else - y2milestone( "Content: %1", content ); + y2milestone( "row: %1 card: %2", row, card ); - list <string> lines = splitstring( content, "\n" ); - - foreach( string line, (list<string>)lines, { - if ( regexpmatch( line, "^FCOE_ENABLE" ) ) - { - status_map = add( status_map, "FCOE_ENABLE", substring( line, 12 ) ); - y2milestone( "FCOE_ENABLE: %1", status_map["FCOE_ENABLE"]:"" ); - } - if ( regexpmatch( line, "^DCB_REQUIRED" ) ) - { - status_map = add( status_map, "DCB_REQUIRED", substring( line, 13 ) ); - y2milestone( "DCB_REQUIRED: %1", status_map["DCB_REQUIRED"]:"" ); - } - }); + // check VLAN status + if ( card[2]:"" == FcoeClient::NOT_CONFIGURED ) + { + UI::ChangeWidget( `id(`edit), `Enabled, false ); + UI::ChangeWidget( `id(`config), `Enabled, true ); } else { - y2error( "Interface not valid" ); + UI::ChangeWidget( `id(`edit), `Enabled, true ); + UI::ChangeWidget( `id(`config), `Enabled, false ); } - - return status_map; } @@ -147,32 +117,27 @@ y2milestone( "Init interfaces dialog" ); string vlan_interface = ""; - list <map> netcards = (list<map>)SCR::Read(.probe.netcard); - y2milestone( "Detected netcards: %1", netcards ); + map <integer, list> netcards = FcoeClient::GetNetworkCards(); + y2milestone( "Got netcards: %1", netcards ); list <term> table_items = []; - integer row = 0; - foreach ( map card, netcards, { - map <string, string> status_map = $[]; - vlan_interface = GetVlanInterface( card["dev_name"]:"" ); - if ( vlan_interface != "" ) - status_map = GetFCoEStatus( vlan_interface ); - else - vlan_interface = "not configured"; - + foreach ( integer row, list card, netcards, { table_items = add( table_items, - `item(`id(row), card["dev_name"]:"", card["device"]:"", vlan_interface, - status_map["FCOE_ENABLE"]:"", status_map["DCB_REQUIRED"]:"" ) + `item(`id(row), card[0]:"", card[1]:"", card[2]:"", + card[3]:"", card[4]:"" ) ); - row = row + 1; }); UI::ChangeWidget( `id(`interfaces), `Items, table_items ); + UI::ChangeWidget( `id(`interfaces), `CurrentItem, `id(0) ); + AdjustButtons(); } - +// +// +// void InitConfigurationDialog (string id) { y2milestone( "Init configuration dialog" ); @@ -213,11 +178,17 @@ { any action = event["ID"]:nil; + y2milestone( "Event: %1", event ); + if ( action == `edit ) { y2milestone( "Action: %1, returning `edit", action); return `edit; } + else if ( action == `interfaces ) + { + AdjustButtons(); + } return nil; } -- 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] r63882 - /trunk/fcoe-client/src/dialogs.ycp
by gs＠svn2.opensuse.org 28 Apr '11

28 Apr '11

Author: gs Date: Thu Apr 28 14:00:57 2011 New Revision: 63882 URL: http://svn.opensuse.org/viewcvs/yast?rev=63882&view=rev Log: button label changed Modified: trunk/fcoe-client/src/dialogs.ycp Modified: trunk/fcoe-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/dialogs.ycp?rev=… ============================================================================== --- trunk/fcoe-client/src/dialogs.ycp (original) +++ trunk/fcoe-client/src/dialogs.ycp Thu Apr 28 14:00:57 2011 @@ -87,7 +87,7 @@ [] ), `Left(`HBox( `PushButton(`id(`edit), _("Change &Settings") ), - `PushButton(`id(`config), _("Configure &VLAN")) ) + `PushButton(`id(`config), _("Create &VLAN Interface")) ) ) ) ); -- 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] r63881 - in /trunk/control-center: VERSION.cmake package/yast2-control-center.changes src/yqdesktopfilesmodel.cpp
by tgoettlicher＠svn2.opensuse.org 27 Apr '11

27 Apr '11

Author: tgoettlicher Date: Wed Apr 27 17:24:12 2011 New Revision: 63881 URL: http://svn.opensuse.org/viewcvs/yast?rev=63881&view=rev Log: Removed useless warning message (bnc #620617) Modified: trunk/control-center/VERSION.cmake trunk/control-center/package/yast2-control-center.changes trunk/control-center/src/yqdesktopfilesmodel.cpp Modified: trunk/control-center/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/VERSION.cmake?rev… ============================================================================== --- trunk/control-center/VERSION.cmake (original) +++ trunk/control-center/VERSION.cmake Wed Apr 27 17:24:12 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") -SET(VERSION_MINOR "20") -SET(VERSION_PATCH "2") +SET(VERSION_MINOR "21") +SET(VERSION_PATCH "1") Modified: trunk/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/package/yast2-con… ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Wed Apr 27 17:24:12 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 27 17:22:24 CEST 2011 - tgoettlicher(a)suse.de + +- Removed useless warning message (bnc #620617) +- 2.21.1 + +------------------------------------------------------------------- Wed Feb 23 13:06:01 CET 2011 - tgoettlicher(a)suse.de - remember panel width (bnc #613352) Modified: trunk/control-center/src/yqdesktopfilesmodel.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/yqdesktopfile… ============================================================================== --- trunk/control-center/src/yqdesktopfilesmodel.cpp (original) +++ trunk/control-center/src/yqdesktopfilesmodel.cpp Wed Apr 27 17:24:12 2011 @@ -57,7 +57,7 @@ } } - qWarning() << "No index for key: " << key << " value: " << value.toString(); +// qWarning() << "No index for key: " << key << " value: " << value.toString(); return QModelIndex(); } -- 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] r63880 - in /trunk/qt-pkg: VERSION.cmake package/yast2-qt-pkg.changes src/YQPkgDependenciesView.cc src/YQPkgSearchFilterView.cc
by tgoettlicher＠svn2.opensuse.org 27 Apr '11

27 Apr '11

Author: tgoettlicher Date: Wed Apr 27 17:05:58 2011 New Revision: 63880 URL: http://svn.opensuse.org/viewcvs/yast?rev=63880&view=rev Log: Added translation markers for RPM fields (bnc #686502) Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgDependenciesView.cc trunk/qt-pkg/src/YQPkgSearchFilterView.cc Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=63880&r… ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Wed Apr 27 17:05:58 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") 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 Wed Apr 27 17:05:58 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 27 17:05:04 CEST 2011 - tgoettlicher(a)suse.de + +- Added translation markers for RPM fields (bnc #686502) +- 2.21.2 + +------------------------------------------------------------------- Wed Apr 27 16:27:50 CEST 2011 - tgoettlicher(a)suse.de - Enabled menu key to show context menu (bnc #681702) Modified: trunk/qt-pkg/src/YQPkgDependenciesView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgDependenciesView… ============================================================================== --- trunk/qt-pkg/src/YQPkgDependenciesView.cc (original) +++ trunk/qt-pkg/src/YQPkgDependenciesView.cc Wed Apr 27 17:05:58 2011 @@ -103,18 +103,15 @@ table( row( hcell( _( "Version:" ) ) + cell( pkg->edition().asString() ) ) + - // Intentionally NOT translating the RPM depencency tags: - // They make only sense to users who have some basic knowledge what they are anyway. - - row( "Provides:", pkg->dep( zypp::Dep::PROVIDES ) ) + - row( "Prerequires:", pkg->dep( zypp::Dep::PREREQUIRES ) ) + - row( "Requires:", pkg->dep( zypp::Dep::REQUIRES ) ) + - row( "Conflicts:", pkg->dep( zypp::Dep::CONFLICTS ) ) + - row( "Obsoletes:", pkg->dep( zypp::Dep::OBSOLETES ) ) + - row( "Recommends:", pkg->dep( zypp::Dep::RECOMMENDS ) ) + - row( "Suggests:", pkg->dep( zypp::Dep::SUGGESTS ) ) + - row( "Enances:", pkg->dep( zypp::Dep::ENHANCES ) ) + - row( "Supplements:", pkg->dep( zypp::Dep::SUPPLEMENTS ) ) + row( _("Provides:"), pkg->dep( zypp::Dep::PROVIDES ) ) + + row( _("Prerequires:"), pkg->dep( zypp::Dep::PREREQUIRES ) ) + + row( _("Requires:"), pkg->dep( zypp::Dep::REQUIRES ) ) + + row( _("Conflicts:"), pkg->dep( zypp::Dep::CONFLICTS ) ) + + row( _("Obsoletes:"), pkg->dep( zypp::Dep::OBSOLETES ) ) + + row( _("Recommends:"), pkg->dep( zypp::Dep::RECOMMENDS ) ) + + row( _("Suggests:"), pkg->dep( zypp::Dep::SUGGESTS ) ) + + row( _("Enances:"), pkg->dep( zypp::Dep::ENHANCES ) ) + + row( _("Supplements:"), pkg->dep( zypp::Dep::SUPPLEMENTS ) ) ); return html; @@ -136,15 +133,15 @@ row( hcell( _( "Version:" ) ) + cell( p1->edition().asString() ) + cell( p2->edition().asString() ) ) + - row( "Provides:", p1->dep( zypp::Dep::PROVIDES ), p2->dep( zypp::Dep::PROVIDES ) ) + - row( "Prerequires:", p1->dep( zypp::Dep::PREREQUIRES ), p2->dep( zypp::Dep::PREREQUIRES ) ) + - row( "Requires:", p1->dep( zypp::Dep::REQUIRES ), p2->dep( zypp::Dep::REQUIRES ) ) + - row( "Conflicts:", p1->dep( zypp::Dep::CONFLICTS ), p2->dep( zypp::Dep::CONFLICTS ) ) + - row( "Obsoletes:", p1->dep( zypp::Dep::OBSOLETES ), p2->dep( zypp::Dep::OBSOLETES ) ) + - row( "Recommends:", p1->dep( zypp::Dep::RECOMMENDS ), p2->dep( zypp::Dep::RECOMMENDS ) ) + - row( "Suggests:", p1->dep( zypp::Dep::SUGGESTS ), p2->dep( zypp::Dep::SUGGESTS ) ) + - row( "Enances:", p1->dep( zypp::Dep::ENHANCES ), p2->dep( zypp::Dep::ENHANCES ) ) + - row( "Supplements:", p1->dep( zypp::Dep::SUPPLEMENTS ), p2->dep( zypp::Dep::SUPPLEMENTS ) ) + row( _("Provides:"), p1->dep( zypp::Dep::PROVIDES ), p2->dep( zypp::Dep::PROVIDES ) ) + + row( _("Prerequires:"), p1->dep( zypp::Dep::PREREQUIRES ), p2->dep( zypp::Dep::PREREQUIRES ) ) + + row( _("Requires:"), p1->dep( zypp::Dep::REQUIRES ), p2->dep( zypp::Dep::REQUIRES ) ) + + row( _("Conflicts:"), p1->dep( zypp::Dep::CONFLICTS ), p2->dep( zypp::Dep::CONFLICTS ) ) + + row( _("Obsoletes:"), p1->dep( zypp::Dep::OBSOLETES ), p2->dep( zypp::Dep::OBSOLETES ) ) + + row( _("Recommends:"), p1->dep( zypp::Dep::RECOMMENDS ), p2->dep( zypp::Dep::RECOMMENDS ) ) + + row( _("Suggests:"), p1->dep( zypp::Dep::SUGGESTS ), p2->dep( zypp::Dep::SUGGESTS ) ) + + row( _("Enances:"), p1->dep( zypp::Dep::ENHANCES ), p2->dep( zypp::Dep::ENHANCES ) ) + + row( _("Supplements:"), p1->dep( zypp::Dep::SUPPLEMENTS ), p2->dep( zypp::Dep::SUPPLEMENTS ) ) ); return html; Modified: trunk/qt-pkg/src/YQPkgSearchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgSearchFilterView… ============================================================================== --- trunk/qt-pkg/src/YQPkgSearchFilterView.cc (original) +++ trunk/qt-pkg/src/YQPkgSearchFilterView.cc Wed Apr 27 17:05:58 2011 @@ -119,10 +119,9 @@ vLayout->addStretch(); - // Intentionally NOT marking RPM tags for translation - _searchInProvides = new QCheckBox( "RPM \"P&rovides\"" , gbox ); YUI_CHECK_NEW( _searchInProvides ); + _searchInProvides = new QCheckBox( _( "RPM \"P&rovides\""), gbox ); YUI_CHECK_NEW( _searchInProvides ); vLayout->addWidget(_searchInProvides); - _searchInRequires = new QCheckBox( "RPM \"Re&quires\"" , gbox ); YUI_CHECK_NEW( _searchInRequires ); + _searchInRequires = new QCheckBox( _( "RPM \"Re&quires\""), gbox ); YUI_CHECK_NEW( _searchInRequires ); vLayout->addWidget(_searchInRequires); _searchInFileList = new QCheckBox( _( "File list" ), gbox ); YUI_CHECK_NEW( _searchInFileList ); -- 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] r63879 - in /trunk/qt-pkg: VERSION.cmake package/yast2-qt-pkg.changes src/YQPkgObjList.cc src/YQPkgObjList.h
by tgoettlicher＠svn2.opensuse.org 27 Apr '11

27 Apr '11

Author: tgoettlicher Date: Wed Apr 27 16:42:14 2011 New Revision: 63879 URL: http://svn.opensuse.org/viewcvs/yast?rev=63879&view=rev Log: Enabled menu key to show context menu (bnc #681702) Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgObjList.cc trunk/qt-pkg/src/YQPkgObjList.h Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=63879&r… ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Wed Apr 27 16:42:14 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") -SET(VERSION_MINOR "20") -SET(VERSION_PATCH "3") +SET(VERSION_MINOR "21") +SET(VERSION_PATCH "1") 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 Wed Apr 27 16:42:14 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 27 16:27:50 CEST 2011 - tgoettlicher(a)suse.de + +- Enabled menu key to show context menu (bnc #681702) +- 2.21.1 + +------------------------------------------------------------------- Thu Feb 3 15:13:54 CET 2011 - tgoettlicher(a)suse.de - Fixed dependencies Modified: trunk/qt-pkg/src/YQPkgObjList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgObjList.cc?rev=6… ============================================================================== --- trunk/qt-pkg/src/YQPkgObjList.cc (original) +++ trunk/qt-pkg/src/YQPkgObjList.cc Wed Apr 27 16:42:14 2011 @@ -117,10 +117,18 @@ connect( this, SIGNAL( currentItemChanged ( QTreeWidgetItem *, QTreeWidgetItem * ) ), this, SLOT ( currentItemChangedInternal( QTreeWidgetItem * ) ) ); + connect( this, SIGNAL(customContextMenuRequested(const QPoint &)), + this, SLOT (slotCustomContextMenu(const QPoint&))); + setIconSize( QSize( 22, 16 ) ); + + setContextMenuPolicy(Qt::CustomContextMenu); + } + + YQPkgObjList::~YQPkgObjList() { if ( _excludedItems ) @@ -182,23 +190,7 @@ item->cycleStatus(); } } - else if ( button == Qt::RightButton ) - { - if ( editable() && item->editable() ) - { - updateActions( item ); - - if ( ! item->selectable() ) - return; - - QMenu * contextMenu = - ! item->selectable()->installedEmpty() ? - installedContextMenu() : notInstalledContextMenu(); - - if ( contextMenu ) - contextMenu->popup( pos ); - } - } + // context menus are handled in slotCustomContextMenu() } } @@ -1680,6 +1672,26 @@ return ( _excludeMap.find( item ) != _excludeMap.end() ); } +void YQPkgObjList::slotCustomContextMenu(const QPoint& pos) +{ + YQPkgObjListItem * item = dynamic_cast<YQPkgObjListItem *> ( currentItem() ); + + if ( item && editable() && item->editable() ) + { + updateActions( item ); + + if ( ! item->selectable() ) + return; + + QMenu * contextMenu = + ! item->selectable()->installedEmpty() ? + installedContextMenu() : notInstalledContextMenu(); + + if ( contextMenu ) + contextMenu->popup( mapToGlobal (pos) ); + } +} + QTreeWidgetItem * YQPkgObjList::ExcludedItems::oldParentItem( QTreeWidgetItem * item ) { Modified: trunk/qt-pkg/src/YQPkgObjList.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgObjList.h?rev=63… ============================================================================== --- trunk/qt-pkg/src/YQPkgObjList.h (original) +++ trunk/qt-pkg/src/YQPkgObjList.h Wed Apr 27 16:42:14 2011 @@ -285,6 +285,12 @@ **/ virtual void currentItemChangedInternal( QTreeWidgetItem * item ); + /** + * slot that shows context menu when requested + **/ + void slotCustomContextMenu(const QPoint& pos); + + signals: -- 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] r63878 - /tags/branch-Code-11-SP2-2_17_79/installation/
by jsuchome＠svn2.opensuse.org 27 Apr '11

27 Apr '11

Author: jsuchome Date: Wed Apr 27 15:45:00 2011 New Revision: 63878 URL: http://svn.opensuse.org/viewcvs/yast?rev=63878&view=rev Log: Created tag branch-Code-11-SP2-2_17_79 for installation Added: tags/branch-Code-11-SP2-2_17_79/installation/ (props changed) - copied from r63877, branches/SuSE-Code-11-SP2-Branch/installation/ -- 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] r63877 - /tags/branch-Code-11-SP2-2_17_79/
by jsuchome＠svn2.opensuse.org 27 Apr '11

27 Apr '11

Author: jsuchome Date: Wed Apr 27 15:44:56 2011 New Revision: 63877 URL: http://svn.opensuse.org/viewcvs/yast?rev=63877&view=rev Log: Created tag branch-Code-11-SP2-2_17_79 Added: tags/branch-Code-11-SP2-2_17_79/ -- 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] r63876 - in /branches/SuSE-Code-11-SP2-Branch/installation: VERSION package/yast2-installation.changes src/clients/inst_disks_activate.ycp src/include/inst_inc_all.ycp
by jsuchome＠svn2.opensuse.org 27 Apr '11

27 Apr '11

Author: jsuchome Date: Wed Apr 27 15:44:48 2011 New Revision: 63876 URL: http://svn.opensuse.org/viewcvs/yast?rev=63876&view=rev Log: - added option to configure FCoE Interfaces when started with WithFCoE=1 argument (fate#307445) - 2.17.79 Modified: branches/SuSE-Code-11-SP2-Branch/installation/VERSION branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_disks_activate.ycp branches/SuSE-Code-11-SP2-Branch/installation/src/include/inst_inc_all.ycp Modified: branches/SuSE-Code-11-SP2-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/VERSION Wed Apr 27 15:44:48 2011 @@ -1 +1 @@ -2.17.78 +2.17.79 Modified: branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes Wed Apr 27 15:44:48 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 27 15:09:25 CEST 2011 - jsuchome(a)suse.cz + +- added option to configure FCoE Interfaces when started with + WithFCoE=1 argument (fate#307445) +- 2.17.79 + +------------------------------------------------------------------- Wed Apr 27 11:24:45 CEST 2011 - jsuchome(a)suse.cz - Copy /media.1/build to the installed system (fate#311377) Modified: branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_disks_activate.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_disks_activate.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_disks_activate.ycp Wed Apr 27 15:44:48 2011 @@ -23,6 +23,7 @@ import "Arch"; import "GetInstArgs"; import "Label"; +import "Linuxrc"; import "Popup"; import "Storage"; import "Wizard"; @@ -32,6 +33,7 @@ boolean have_dasd = false; boolean have_zfcp = false; +boolean want_fcoe = false; void RestoreButtons (boolean enable_back, boolean enable_next) { Wizard::RestoreAbortButton(); @@ -72,7 +74,9 @@ UI::CloseDialog (); } -if (have_dasd || have_zfcp) +want_fcoe = Linuxrc::InstallInf ("WithFCoE") == "1"; + +if (have_dasd || have_zfcp || want_fcoe) { // dialog caption string caption = _("Disk Activation"); @@ -93,6 +97,12 @@ _("Configure &ZFCP Disks"))) : `VSpacing (0), `VSpacing (have_zfcp ? 2 : 0), + want_fcoe + ? `HWeight (1, `PushButton (`id (`fcoe), `opt (`hstretch), + // push button + _("Configure &FCoE Interfaces"))) + : `VSpacing (0), + `VSpacing (want_fcoe? 2 : 0), `HWeight (1, `PushButton (`id (`iscsi), `opt (`hstretch), // push button _("Configure &iSCSI Disks"))), @@ -121,7 +131,12 @@ } else if (ret == `iscsi) { - ret = WFM::call ("inst_iscsi-client"); + ret = WFM::call ("inst_iscsi-client", [argmap]); + ret = `redraw; + } + else if (ret == `fcoe) + { + ret = WFM::call ("inst_fcoe-client", [argmap]); ret = `redraw; } if (ret == `redraw) Modified: branches/SuSE-Code-11-SP2-Branch/installation/src/include/inst_inc_all.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/src/include/inst_inc_all.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/src/include/inst_inc_all.ycp Wed Apr 27 15:44:48 2011 @@ -199,8 +199,9 @@ // update the workflow according to current situation // disable disks activation if not needed boolean iscsi = Linuxrc::InstallInf("WithiSCSI") == "1"; + boolean fcoe = Linuxrc::InstallInf ("WithFCoE") == "1"; - if (! (Arch::s390() || iscsi)) { + if (! (Arch::s390() || iscsi || fcoe)) { y2milestone ("Disabling disk activation module"); ProductControl::DisableModule ("disks_activate"); } -- 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] r63875 - /tags/stable-2_21_3/installation/
by jsuchome＠svn2.opensuse.org 27 Apr '11

27 Apr '11

Author: jsuchome Date: Wed Apr 27 15:44:43 2011 New Revision: 63875 URL: http://svn.opensuse.org/viewcvs/yast?rev=63875&view=rev Log: Created tag stable-2_21_3 for installation Added: tags/stable-2_21_3/installation/ - copied from r63874, trunk/installation/ -- 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] r63874 - in /trunk/installation: VERSION package/yast2-installation.changes src/clients/inst_disks_activate.ycp src/include/inst_inc_all.ycp
by jsuchome＠svn2.opensuse.org 27 Apr '11

27 Apr '11

Author: jsuchome Date: Wed Apr 27 15:44:27 2011 New Revision: 63874 URL: http://svn.opensuse.org/viewcvs/yast?rev=63874&view=rev Log: - added option to configure FCoE Interfaces when started with WithFCoE=1 argument (fate#307445) - 2.21.3 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_disks_activate.ycp trunk/installation/src/include/inst_inc_all.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=63874&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Wed Apr 27 15:44:27 2011 @@ -1 +1 @@ -2.21.2 +2.21.3 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Apr 27 15:44:27 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 27 15:08:04 CEST 2011 - jsuchome(a)suse.cz + +- added option to configure FCoE Interfaces when started with + WithFCoE=1 argument (fate#307445) +- 2.21.3 + +------------------------------------------------------------------- Wed Apr 27 11:19:50 CEST 2011 - jsuchome(a)suse.cz - Copy /media.1/build to the installed system (fate#311377) Modified: trunk/installation/src/clients/inst_disks_activate.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_di… ============================================================================== --- trunk/installation/src/clients/inst_disks_activate.ycp (original) +++ trunk/installation/src/clients/inst_disks_activate.ycp Wed Apr 27 15:44:27 2011 @@ -23,6 +23,7 @@ import "Arch"; import "GetInstArgs"; import "Label"; +import "Linuxrc"; import "Popup"; import "Storage"; import "Wizard"; @@ -32,6 +33,7 @@ boolean have_dasd = false; boolean have_zfcp = false; +boolean want_fcoe = false; void RestoreButtons (boolean enable_back, boolean enable_next) { Wizard::RestoreAbortButton(); @@ -72,7 +74,9 @@ UI::CloseDialog (); } -if (have_dasd || have_zfcp) +want_fcoe = Linuxrc::InstallInf ("WithFCoE") == "1"; + +if (have_dasd || have_zfcp || want_fcoe) { // dialog caption string caption = _("Disk Activation"); @@ -93,6 +97,12 @@ _("Configure &ZFCP Disks"))) : `VSpacing (0), `VSpacing (have_zfcp ? 2 : 0), + want_fcoe + ? `HWeight (1, `PushButton (`id (`fcoe), `opt (`hstretch), + // push button + _("Configure &FCoE Interfaces"))) + : `VSpacing (0), + `VSpacing (want_fcoe? 2 : 0), `HWeight (1, `PushButton (`id (`iscsi), `opt (`hstretch), // push button _("Configure &iSCSI Disks"))), @@ -121,7 +131,12 @@ } else if (ret == `iscsi) { - ret = WFM::call ("inst_iscsi-client"); + ret = WFM::call ("inst_iscsi-client", [argmap]); + ret = `redraw; + } + else if (ret == `fcoe) + { + ret = WFM::call ("inst_fcoe-client", [argmap]); ret = `redraw; } if (ret == `redraw) Modified: trunk/installation/src/include/inst_inc_all.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/inst_in… ============================================================================== --- trunk/installation/src/include/inst_inc_all.ycp (original) +++ trunk/installation/src/include/inst_inc_all.ycp Wed Apr 27 15:44:27 2011 @@ -199,8 +199,9 @@ // update the workflow according to current situation // disable disks activation if not needed boolean iscsi = Linuxrc::InstallInf("WithiSCSI") == "1"; + boolean fcoe = Linuxrc::InstallInf ("WithFCoE") == "1"; - if (! (Arch::s390() || iscsi)) { + if (! (Arch::s390() || iscsi || fcoe)) { y2milestone ("Disabling disk activation module"); ProductControl::DisableModule ("disks_activate"); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0