June 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r48540 - in /trunk/qt-pkg: ./ package/ src/
by schubi2＠svn.opensuse.org 26 Jun '08

26 Jun '08

Author: schubi2 Date: Thu Jun 26 09:49:25 2008 New Revision: 48540 URL: http://svn.opensuse.org/viewcvs/yast?rev=48540&view=rev Log: Added plugin mechanism for displaying grafic solver results. Added: trunk/qt-pkg/src/YQZyppSolverDialogPluginIf.h trunk/qt-pkg/src/YQZyppSolverDialogPluginStub.cc trunk/qt-pkg/src/YQZyppSolverDialogPluginStub.h Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/CMakeLists.txt trunk/qt-pkg/src/YQPackageSelector.cc trunk/qt-pkg/src/YQPkgList.cc trunk/qt-pkg/src/YQPkgObjList.cc trunk/qt-pkg/src/YQPkgObjList.h trunk/qt-pkg/yast2-qt-pkg.spec.in 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 Thu Jun 26 09:49:25 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jun 26 09:47:18 CEST 2008 - schubi(a)suse.de + +- Added plugin mechanism for displaying grafic solver results. + +------------------------------------------------------------------- Wed Jun 4 11:46:58 CEST 2008 - sh(a)suse.de - Added translation marker for "File" menu (bnc #396419) Modified: trunk/qt-pkg/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/CMakeLists.txt?rev=48… ============================================================================== --- trunk/qt-pkg/src/CMakeLists.txt (original) +++ trunk/qt-pkg/src/CMakeLists.txt Thu Jun 26 09:49:25 2008 @@ -53,6 +53,7 @@ YQPkgUpdateProblemFilterView.cc YQPkgVersionsView.cc YQPackageSelectorPluginImpl.cc + YQZyppSolverDialogPluginStub.cc ) QT4_AUTOMOC(${qt_yast_pkg_plugin_SRCS}) @@ -64,7 +65,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_INSTALL_PREFIX}/include/YaST2/yast2-qt ) INCLUDE_DIRECTORIES( ${ZYPP_INCLUDE_DIR} ) -ADD_LIBRARY( py2qt_pkg SHARED ${qt_yast_pkg_plugin_SRCS}) +ADD_LIBRARY( py2qt_pkg SHARED ${qt_yast_pkg_plugin_SRCS} ) TARGET_LINK_LIBRARIES( py2qt_pkg ${UI_PLUGIN_DIR}/libpy2qt.so ) TARGET_LINK_LIBRARIES( py2qt_pkg ${LIBYUI_LIBRARY} ) TARGET_LINK_LIBRARIES( py2qt_pkg ${ZYPP_LIBRARY} ) Modified: trunk/qt-pkg/src/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelector.cc?… ============================================================================== --- trunk/qt-pkg/src/YQPackageSelector.cc (original) +++ trunk/qt-pkg/src/YQPackageSelector.cc Thu Jun 26 09:49:25 2008 @@ -662,6 +662,7 @@ _pkgMenu->addAction(_pkgList->actionSetCurrentDelete); _pkgMenu->addAction(_pkgList->actionSetCurrentUpdate); _pkgMenu->addAction(_pkgList->actionSetCurrentTaboo); + _pkgMenu->addAction(_pkgList->actionShowCurrentSolverInfo); #if ENABLE_SOURCE_RPMS _pkgMenu->addSeparator(); Modified: trunk/qt-pkg/src/YQPkgList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgList.cc?rev=4854… ============================================================================== --- trunk/qt-pkg/src/YQPkgList.cc (original) +++ trunk/qt-pkg/src/YQPkgList.cc Thu Jun 26 09:49:25 2008 @@ -277,10 +277,10 @@ _notInstalledContextMenu->addAction(actionSetCurrentInstall); _notInstalledContextMenu->addAction(actionSetCurrentDontInstall); _notInstalledContextMenu->addAction(actionSetCurrentTaboo); + _notInstalledContextMenu->addAction(actionShowCurrentSolverInfo); addAllInListSubMenu( _notInstalledContextMenu ); - _notInstalledContextMenu->addSeparator(); _notInstalledContextMenu->addAction( _( "Export This List to &Text File..." ), this, SLOT( askExportList() ) ); @@ -297,6 +297,7 @@ _installedContextMenu->addAction(actionSetCurrentDelete); _installedContextMenu->addAction(actionSetCurrentUpdate); _installedContextMenu->addAction(actionSetCurrentProtected); + _installedContextMenu->addAction(actionShowCurrentSolverInfo); addAllInListSubMenu( _installedContextMenu ); Modified: trunk/qt-pkg/src/YQPkgObjList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgObjList.cc?rev=4… ============================================================================== --- trunk/qt-pkg/src/YQPkgObjList.cc (original) +++ trunk/qt-pkg/src/YQPkgObjList.cc Thu Jun 26 09:49:25 2008 @@ -35,6 +35,7 @@ #include "YQi18n.h" #include "YQIconPool.h" #include "YQUI.h" +#include "YQZyppSolverDialogPluginStub.h" using std::list; using std::string; @@ -56,6 +57,7 @@ actionSetCurrentUpdate(0L), actionSetCurrentTaboo(0L), actionSetCurrentProtected(0L), + actionShowCurrentSolverInfo(0L), actionSetListInstall(0L), actionSetListDontInstall(0L), actionSetListKeepInstalled(0L), @@ -310,6 +312,24 @@ void +YQPkgObjList::showSolverInfo() +{ + QTreeWidgetItem * listViewItem = currentItem(); + + if ( ! listViewItem ) + return; + + YQPkgObjListItem * item = dynamic_cast<YQPkgObjListItem *> (listViewItem); + + if ( item ) + { + YQZyppSolverDialogPluginStub plugin; + plugin.createZyppSolverDialog(item->zyppObj()->poolItem()); + } +} + + +void YQPkgObjList::setAllItemStatus( ZyppStatus newStatus, bool force ) { if ( ! _editable ) @@ -376,6 +396,8 @@ actionSetCurrentTaboo = createAction( S_Taboo, "[!]" ); actionSetCurrentProtected = createAction( S_Protected, "[*]" ); + actionShowCurrentSolverInfo = createAction( _( "Show solver information" )); + actionSetListInstall = createAction( S_Install, "", true ); actionSetListDontInstall = createAction( S_NoInst, "", true ); actionSetListKeepInstalled = createAction( S_KeepInstalled, "", true ); @@ -404,6 +426,8 @@ connect( actionSetCurrentTaboo, SIGNAL( activated() ), this, SLOT( setCurrentTaboo() ) ); connect( actionSetCurrentProtected, SIGNAL( activated() ), this, SLOT( setCurrentProtected() ) ); + connect( actionShowCurrentSolverInfo, SIGNAL( activated() ), this, SLOT( showCurrentSolverInfo() ) ); + connect( actionSetListInstall, SIGNAL( activated() ), this, SLOT( setListInstall() ) ); connect( actionSetListDontInstall, SIGNAL( activated() ), this, SLOT( setListDontInstall() ) ); connect( actionSetListKeepInstalled, SIGNAL( activated() ), this, SLOT( setListKeepInstalled() ) ); @@ -468,6 +492,8 @@ _notInstalledContextMenu->addAction(actionSetCurrentDontInstall); _notInstalledContextMenu->addAction(actionSetCurrentTaboo); + _notInstalledContextMenu->addAction(actionShowCurrentSolverInfo); + addAllInListSubMenu( _notInstalledContextMenu ); } @@ -482,6 +508,8 @@ _installedContextMenu->addAction(actionSetCurrentDelete); _installedContextMenu->addAction(actionSetCurrentUpdate); + _installedContextMenu->addAction(actionShowCurrentSolverInfo); + addAllInListSubMenu( _installedContextMenu ); } @@ -559,6 +587,7 @@ actionSetCurrentDelete->setEnabled( false ); actionSetCurrentUpdate->setEnabled( false ); } + actionShowCurrentSolverInfo->setEnabled( true ); } else // ! item { @@ -570,6 +599,9 @@ actionSetCurrentDelete->setEnabled( false ); actionSetCurrentUpdate->setEnabled( false ); actionSetCurrentProtected->setEnabled( false ); + + actionShowCurrentSolverInfo->setEnabled( false ); + } } Modified: trunk/qt-pkg/src/YQPkgObjList.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgObjList.h?rev=48… ============================================================================== --- trunk/qt-pkg/src/YQPkgObjList.h (original) +++ trunk/qt-pkg/src/YQPkgObjList.h Thu Jun 26 09:49:25 2008 @@ -100,6 +100,11 @@ bool selectNextItem = false ); /** + * Show solver information about the current selected item + **/ + void showSolverInfo(); + + /** * Sets the status of all (toplevel) list items to 'newStatus', if possible. * Only one single statusChanged() signal is emitted. * @@ -239,6 +244,8 @@ void setCurrentTaboo() { setCurrentStatus( S_Taboo ); } void setCurrentProtected() { setCurrentStatus( S_Protected ); } + void showCurrentSolverInfo() { showSolverInfo (); } + void setListInstall() { setAllItemStatus( S_Install ); } void setListDontInstall() { setAllItemStatus( S_NoInst ); } void setListKeepInstalled() { setAllItemStatus( S_KeepInstalled ); } @@ -369,6 +376,7 @@ QAction * actionSetCurrentUpdate; QAction * actionSetCurrentTaboo; QAction * actionSetCurrentProtected; + QAction * actionShowCurrentSolverInfo; QAction * actionSetListInstall; QAction * actionSetListDontInstall; Added: trunk/qt-pkg/src/YQZyppSolverDialogPluginIf.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQZyppSolverDialogPlu… ============================================================================== --- trunk/qt-pkg/src/YQZyppSolverDialogPluginIf.h (added) +++ trunk/qt-pkg/src/YQZyppSolverDialogPluginIf.h Thu Jun 26 09:49:25 2008 @@ -0,0 +1,34 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (c) SuSE Linux AG | +\----------------------------------------------------------------------/ + + File: YQZyppSolverDialogPluginIf.h + + Author: Stefan Schubert <schubi(a)suse.de> + + +/-*/ + +#ifndef YQZyppSolverDialogPluginIf_h +#define YQZyppSolverDialogPluginIf_h + +#include <zypp/PoolItem.h> + +class YQZyppSolverDialogPluginIf +{ + + public: + + virtual ~YQZyppSolverDialogPluginIf() {} + + virtual bool createZyppSolverDialog(const zypp::PoolItem item) = 0 ; +}; +#endif Added: trunk/qt-pkg/src/YQZyppSolverDialogPluginStub.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQZyppSolverDialogPlu… ============================================================================== --- trunk/qt-pkg/src/YQZyppSolverDialogPluginStub.cc (added) +++ trunk/qt-pkg/src/YQZyppSolverDialogPluginStub.cc Thu Jun 26 09:49:25 2008 @@ -0,0 +1,68 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (c) SuSE Linux AG | +\----------------------------------------------------------------------/ + + File: YQZyppSolverDialogPluginStub.cc + + Authors: Stefan Schubert <schubi(a)suse.de> + + +/-*/ +#include <qmessagebox.h> +#include "YQZyppSolverDialogPluginStub.h" + +#define YUILogComponent "qt-ui" +#include "YUILog.h" +#include "YQi18n.h" + +#define PLUGIN_BASE_NAME "qt_zypp_solver_dialog" + +YQZyppSolverDialogPluginStub::YQZyppSolverDialogPluginStub() + : YUIPlugin( PLUGIN_BASE_NAME ) +{ + if ( success() ) + { + yuiMilestone() << "Loaded " << PLUGIN_BASE_NAME + << " plugin successfully from " << pluginLibFullPath() + << endl; + } + + + impl = (YQZyppSolverDialogPluginIf*) locateSymbol("ZYPPDIALOGP"); + + if ( ! impl ) + { + yuiError() << "Plugin " << PLUGIN_BASE_NAME << " does not provide ZYPPP symbol" << endl; + } +} + + +YQZyppSolverDialogPluginStub::~YQZyppSolverDialogPluginStub() +{ + // NOP +} + + +bool +YQZyppSolverDialogPluginStub::createZyppSolverDialog( const zypp::PoolItem item ) +{ + if ( ! impl ) + { + QMessageBox::information( 0, + _("Missing package") , + _("Package libqdialogsolver is rquired for this feature.")); + return false; + } + + return impl->createZyppSolverDialog( item ); +} + + Added: trunk/qt-pkg/src/YQZyppSolverDialogPluginStub.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQZyppSolverDialogPlu… ============================================================================== --- trunk/qt-pkg/src/YQZyppSolverDialogPluginStub.h (added) +++ trunk/qt-pkg/src/YQZyppSolverDialogPluginStub.h Thu Jun 26 09:49:25 2008 @@ -0,0 +1,64 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (c) SuSE Linux AG | +\----------------------------------------------------------------------/ + + File: YQZyppSolverDialogPluginStub.h + + Authors: Stefan Schubert <schubi(a)suse.de> + +/-*/ + +// -*- c++ -*- + +#ifndef YQZyppSolverDialogPluginStub_h +#define YQZyppSolverDialogPluginStub_h + + +#include "YUIPlugin.h" + +#include "YQZyppSolverDialogPluginIf.h" +#include <zypp/PoolItem.h> + +class YWidget; + +/** + * Simplified access to the QZyppSolverDialog plugin. + **/ +class YQZyppSolverDialogPluginIf; + + +class YQZyppSolverDialogPluginStub: public YUIPlugin +{ +public: + /** + * Constructor: Load the plugin library for the QZyppDialog widget + **/ + YQZyppSolverDialogPluginStub(); + + /** + * Destructor. + **/ + virtual ~YQZyppSolverDialogPluginStub(); + + /** + * Create and show a QZyppDialog widget + * + * This might return 0 if the plugin lib could not be loaded or if the + * appropriate symbol could not be located in the plugin lib. + **/ + virtual bool createZyppSolverDialog( const zypp::PoolItem item ); + + + YQZyppSolverDialogPluginIf * impl ; +}; + + +#endif // YQZyppSolverDialogPluginStub_h 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 Thu Jun 26 09:49:25 2008 @@ -16,6 +16,7 @@ Requires: yast2_theme >= 2.16.1 Provides: yast2-qt:/usr/lib/YaST2/plugin/libpy2qt_pkg.so.2 Provides: yast2_ui_pkg +Recommends: libqdialogsolver1 %description - -- 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] r48539 - in /branches/tmp/aschnell/part-redesign/storage/src/include: ep-raid-dialogs.ycp ep-raid-lib.ycp raid_lib.ycp
by aschnell＠svn.opensuse.org 25 Jun '08

25 Jun '08

Author: aschnell Date: Wed Jun 25 23:36:15 2008 New Revision: 48539 URL: http://svn.opensuse.org/viewcvs/yast?rev=48539&view=rev Log: - work on resizing raids (I hate those maps) Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-lib.ycp branches/tmp/aschnell/part-redesign/storage/src/include/raid_lib.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-dialogs.ycp Wed Jun 25 23:36:15 2008 @@ -8,22 +8,22 @@ textdomain "storage"; - integer MinimalNumberOfDevicesForRaid(symbol raid_type) + integer MinimalNumberOfDevicesForRaid(string raid_type) { - map<symbol, integer> info = $[ `raid0 : 2, `raid1 : 2, `raid5 : 3, `raid6 : 4, - `raid10 : 2, `multipath : 2 ]; + map<string, integer> info = $[ "raid0" : 2, "raid1" : 2, "raid5" : 3, "raid6" : 4, + "raid10" : 2, "multipath" : 2 ]; return info[raid_type]:0; } - boolean CheckNumberOfDevicesForRaid(symbol raid_type, integer num) + boolean CheckNumberOfDevicesForRaid(string raid_type, integer num) { integer min_num = MinimalNumberOfDevicesForRaid(raid_type); if (num < min_num) { - map<symbol, string> info = $[ `raid0 : "RAID0", `raid1 : "RAID1", `raid5 : "RAID5", `raid6 : "RAID6", - `raid10 : "RAID10", `multipath : "Multipath RAID" ]; + map<string, string> info = $[ "raid0" : "RAID0", "raid1" : "RAID1", "raid5" : "RAID5", "raid6" : "RAID6", + "raid10" : "RAID10", "multipath" : "Multipath RAID" ]; Error(sformat(_("For %1, select at least %2 device.", "For %1, select at least %2 devices.", min_num), info[raid_type]:"error", min_num)); return false; @@ -39,7 +39,7 @@ { y2milestone("MiniWorkflowStepRaidTypeDevices data:%1", data); - symbol raid_type = data["raid_type"]:`raid0; + string raid_type = data["raid_type"]:"raid0"; string device = data["device"]:"error"; list<string> devices = data["devices"]:[]; @@ -61,15 +61,15 @@ // Translators, 'Striping' is a technical term here. Translate only if // you are sure!! If in doubt, leave it in English. `LeftRadioButton(`id(`raid0), _("RAID &0 (Striping)"), - raid_type == `raid0), + raid_type == "raid0"), // Translators, 'Mirroring' is a technical term here. Translate only if // you are sure!! If in doubt, leave it in English. `LeftRadioButton(`id(`raid1), _("RAID &1 (Mirroring)"), - raid_type == `raid1), + raid_type == "raid1"), // Translators, 'Redundant Striping' is a technical term here. Translate // only if you are sure!! If in doubt, leave it in English. `LeftRadioButton(`id(`raid5), _("RAID &5 (Redundant Striping)"), - raid_type == `raid5) + raid_type == "raid5") ) )))) ); @@ -94,7 +94,7 @@ { case `next: { - raid_type = (symbol) UI::QueryWidget(`id(`raid_type), `Value); + raid_type = substring(tostring((symbol) UI::QueryWidget(`id(`raid_type), `Value)), 1); devices = maplist(map device, DevicesSelectionBox::GetSelectedDevices(), { return device["device"]:""; @@ -124,7 +124,7 @@ { y2milestone("MiniWorkflowStepRaidOptions data:%1", data); - symbol raid_type = data["raid_type"]:`raid0; + string raid_type = data["raid_type"]:"error"; integer chunk_size = (data["chunk_size_k"]:4)*1024; // TODO symbol parity_algorithm = data["parity_algorithm"]:`left_asymmetric; @@ -137,7 +137,7 @@ `id(chunk_size))) ); - if (raid_type == `raid5) + if (raid_type == "raid5") options = add(options, `Left(`ComboBoxSelected(`id(`parity_algorithm), `opt(`hstretch), _("Parity &Algorithm"), [ `item(`id(`left_asymmetric), "left-asymmetric"), @@ -183,8 +183,8 @@ y2milestone("MiniWorkflowStepResizeRaid data:%1", data); string device = data["device"]:"error"; - symbol raid_type = data["raid_type"]:`unknown; - list<string> devices = []; + string raid_type = data["raid_type"]:"error"; + list<string> devices_new = []; list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size ]); @@ -203,7 +203,7 @@ MiniWorkflow::SetContents(Greasemonkey::Transform(contents), "TODO"); - MiniWorkflow::SetLastStep(false); + MiniWorkflow::SetLastStep(true); symbol widget = nil; @@ -217,11 +217,11 @@ { case `next: { - devices = maplist(map device, DevicesSelectionBox::GetSelectedDevices(), { + devices_new = maplist(map device, DevicesSelectionBox::GetSelectedDevices(), { return device["device"]:""; }); - if (!CheckNumberOfDevicesForRaid(raid_type, size(devices))) + if (!CheckNumberOfDevicesForRaid(raid_type, size(devices_new))) widget = `again; } break; @@ -231,7 +231,9 @@ if (widget == `next) { - data["devices"] = devices; + data["devices_new"] = devices_new; + + widget = `finish; } y2milestone("MiniWorkflowStepResizeRaid data:%1 ret:%2", data, widget); @@ -276,10 +278,8 @@ } - boolean DlgResizeRaid(string device) + boolean DlgResizeRaid(map<string, any> data) { - map<string, any> data = $[ "device" : device ]; - map<string, any> aliases = $[ "TheOne" : ``(MiniWorkflowStepResizeRaid(data)) ]; @@ -288,14 +288,34 @@ "TheOne" : $[ `finish : `finish ] ]; - string title = sformat(_("Resize RAID %1"), device); + string title = sformat(_("Resize RAID %1"), data["device"]:"error"); symbol widget = MiniWorkflow::Run(title, raid_icon, aliases, sequence, "TheOne"); if (widget == `finish) { - if (true) // TODO + integer raid_nr = data["nr"]:0; + + list<string> devices_old = data["devices"]:[]; + list<string> devices_new = data["devices_new"]:[]; + + list<string> devices_added = filter(string dev, devices_new, { return !contains(devices_old, dev); }); + list<string> devices_removed = filter(string dev, devices_old, { return !contains(devices_new, dev); }); + + if (size(devices_added) > 0 || size(devices_removed) > 0) { + foreach(string dev, devices_removed, { + Storage::UnchangePartitionId(dev); + Storage::ShrinkMd(raid_nr, dev); + }); + + foreach(string dev, devices_added, { + Storage::SetPartitionId(dev, Partitions::fsid_raid); + Storage::ExtendMd(raid_nr, dev); + }); + + data["devices"] = devices_new; + UpdateNavigationTree(nil); TreePanel::Create(); } @@ -307,11 +327,11 @@ boolean DlgEditRaid(string device) { - map<string, any> data = $[ "flavour" : `raid ]; - map<string, map> target_map = Storage::GetTargetMap(); - data = Storage::GetPartition(target_map, device); + map<string, any> data = Storage::GetPartition(target_map, device); + data["format"] = false; + data["flavour"] = `raid; map<string, any> aliases = $[ "FormatMount" : ``(MiniWorkflowStepFormatMount(data)), Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-lib.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-lib.ycp Wed Jun 25 23:36:15 2008 @@ -36,16 +36,16 @@ void EpResizeRaid(string device) { map<string, map> target_map = Storage::GetTargetMap(); - map volume = Storage::GetPartition(target_map, device); + map<string, any> data = Storage::GetPartition(target_map, device); - if (!volume["create"]:false) + if (!data["create"]:false) { Error(sformat(_("The RAID %1 is already created on disk. It cannot be resized. To resize %1, remove it and create it again."), device)); return; } - DlgResizeRaid(device); + DlgResizeRaid(data); } Modified: branches/tmp/aschnell/part-redesign/storage/src/include/raid_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/raid_lib.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/raid_lib.ycp Wed Jun 25 23:36:15 2008 @@ -374,12 +374,20 @@ void addRaid(map<string, any> data) { - Storage::CreateMdWithDevs(data["nr"]:0, data["raid_type"]:`raid0, data["devices"]:[]); + integer nr = data["nr"]:0; + symbol raid_type = symbolof(toterm(data["raid_type"]:"raid0")); + list<string> devices = data["devices"]:[]; - Storage::ChangeMdChunk(data["nr"]:0, data["chunk_size_k"]:4); + Storage::CreateMdWithDevs(nr, raid_type, devices); - if (data["raid_type"]:`raid0 == `raid5) - Storage::ChangeMdParitySymbol(data["nr"]:0,data["parity_algorithm"]:`left_asymmetric ); + foreach(string dev, devices, { + Storage::SetPartitionId(dev, Partitions::fsid_raid); + }); + + Storage::ChangeMdChunk(nr, data["chunk_size_k"]:4); + + if (raid_type == `raid5) + Storage::ChangeMdParitySymbol(nr, data["parity_algorithm"]:`left_asymmetric ); Storage::ChangeVolumeProperties(data); } -- 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] r48538 - /trunk/gtk/ChangeLog
by rpmcruz＠svn.opensuse.org 25 Jun '08

25 Jun '08

Author: rpmcruz Date: Wed Jun 25 20:31:22 2008 New Revision: 48538 URL: http://svn.opensuse.org/viewcvs/yast?rev=48538&view=rev Log: forgot to add this... Modified: trunk/gtk/ChangeLog Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=48538&r1=48537… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Wed Jun 25 20:31:22 2008 @@ -3,6 +3,8 @@ * src/ygtkhtmlwrap.h/c: got rid of set_background and fixed a crash if libgtkthml is used when an image can't be open. + * src/ygtkrichtext.c: added a background for <pre>. + 2008-06-24 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc: forgot to make some strings on the changes -- 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] r48537 - in /trunk/gtk: ChangeLog src/Makefile.am src/ygtkhtmlwrap.c src/ygtkhtmlwrap.h src/ygtkrichtext.c src/ygtkwizard.c
by rpmcruz＠svn.opensuse.org 25 Jun '08

25 Jun '08

Author: rpmcruz Date: Wed Jun 25 20:30:35 2008 New Revision: 48537 URL: http://svn.opensuse.org/viewcvs/yast?rev=48537&view=rev Log: * src/ygtkhtmlwrap.h/c: got rid of set_background and fixed a crash if libgtkthml is used when an image can't be open. * src/ygtkrichtext.c: added a background for <pre>. Modified: trunk/gtk/ChangeLog trunk/gtk/src/Makefile.am trunk/gtk/src/ygtkhtmlwrap.c trunk/gtk/src/ygtkhtmlwrap.h trunk/gtk/src/ygtkrichtext.c trunk/gtk/src/ygtkwizard.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=48537&r1=48536… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Wed Jun 25 20:30:35 2008 @@ -1,3 +1,8 @@ +2008-06-25 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/ygtkhtmlwrap.h/c: got rid of set_background and fixed a crash + if libgtkthml is used when an image can't be open. + 2008-06-24 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc: forgot to make some strings on the changes Modified: trunk/gtk/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/Makefile.am?rev=48537&r1… ============================================================================== --- trunk/gtk/src/Makefile.am (original) +++ trunk/gtk/src/Makefile.am Wed Jun 25 20:30:35 2008 @@ -53,11 +53,11 @@ ygtkscrolledwindow.c \ ygtktogglebutton.c \ ygtkhtmlwrap.c \ - ygtkrichtext.c \ ygtktimezonepicker.c \ yzyppwrapper.cc \ yzypptags.cc \ - ygtkzyppwrapper.cc + ygtkzyppwrapper.cc \ + ygtkrichtext.c # should only append ygtkrichtext.c if USE_GTKHTML is set dummy_SOURCES = dummy.cc Modified: trunk/gtk/src/ygtkhtmlwrap.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkhtmlwrap.c?rev=48537… ============================================================================== --- trunk/gtk/src/ygtkhtmlwrap.c (original) +++ trunk/gtk/src/ygtkhtmlwrap.c Wed Jun 25 20:30:35 2008 @@ -20,29 +20,6 @@ return g_object_new (ygtk_html_wrap_get_type(), NULL); } -// Utilities -static void gdkwindow_set_background (GdkWindow *window, const char *image) -{ - if (image) { - GError *error = 0; - GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (image, &error); - if (!pixbuf) { - g_warning ("ygtkrichtext: could not open background image: '%s'" - " - %s", image, error->message); - return; - } - - GdkPixmap *pixmap; - gdk_pixbuf_render_pixmap_and_mask_for_colormap (pixbuf, - gdk_drawable_get_colormap (GDK_DRAWABLE (window)), &pixmap, NULL, 0); - g_object_unref (G_OBJECT (pixbuf)); - - gdk_window_set_back_pixmap (window, pixmap, FALSE); - } - else - gdk_window_clear (window); -} - // GtkHTML #ifdef USE_GTKHTML #include <libgtkhtml-3.14/gtkhtml/gtkhtml.h> @@ -57,6 +34,10 @@ static void gtkhtml_url_requested_cb (GtkHTML *html, const gchar *url, GtkHTMLStream *stream) { // to load images (and possibly other external embed files) FILE *file = fopen (url, "rb"); + if (!file) { + g_warning ("Error: couldn't open file '%s'\n", url); + return; + } fseek (file, 0, SEEK_END); size_t file_size = ftell (file); @@ -109,11 +90,6 @@ g_signal_connect (G_OBJECT (widget), "link-clicked", callback, data); } -void ygtk_html_wrap_set_background (GtkWidget *widget, const char *image) -{ - // TODO -} - // YGtkRichText #else #include "ygtkrichtext.h" @@ -154,13 +130,5 @@ g_signal_connect (G_OBJECT (widget), "link-clicked", callback, data); } -void ygtk_html_wrap_set_background (GtkWidget *widget, const char *image) -{ - g_return_if_fail (GTK_WIDGET_REALIZED (widget)); - GdkWindow *window = gtk_text_view_get_window - (GTK_TEXT_VIEW (widget), GTK_TEXT_WINDOW_TEXT); - gdkwindow_set_background (window, image); -} - #endif Modified: trunk/gtk/src/ygtkhtmlwrap.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkhtmlwrap.h?rev=48537… ============================================================================== --- trunk/gtk/src/ygtkhtmlwrap.h (original) +++ trunk/gtk/src/ygtkhtmlwrap.h Wed Jun 25 20:30:35 2008 @@ -29,9 +29,6 @@ gboolean ygtk_html_wrap_search (GtkWidget *widget, const gchar *text); gboolean ygtk_html_wrap_search_next (GtkWidget *widget, const gchar *text); // F3 -// set a background image -- to be done on (or after) realize -void ygtk_html_wrap_set_background (GtkWidget *widget, const char *image); - G_END_DECLS #endif /* YGTK_HTML_WRAP_H */ Modified: trunk/gtk/src/ygtkrichtext.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkrichtext.c?rev=48537… ============================================================================== --- trunk/gtk/src/ygtkrichtext.c (original) +++ trunk/gtk/src/ygtkrichtext.c Wed Jun 25 20:30:35 2008 @@ -128,7 +128,8 @@ size /= PANGO_SCALE; gtk_text_buffer_create_tag (buffer, "h1", "weight", PANGO_WEIGHT_HEAVY, - "size", (int)(size * PANGO_SCALE_XX_LARGE), "pixels-below-lines", 16, NULL); + "size", (int)(size * PANGO_SCALE_XX_LARGE), "pixels-below-lines", 16, + "foreground", "#5c5c5c", NULL); gtk_text_buffer_create_tag (buffer, "h2", "weight", PANGO_WEIGHT_ULTRABOLD, "size", (int)(size * PANGO_SCALE_X_LARGE), "pixels-below-lines", 15, NULL); gtk_text_buffer_create_tag (buffer, "h3", "weight", PANGO_WEIGHT_BOLD, @@ -143,7 +144,8 @@ gtk_text_buffer_create_tag (buffer, "small", "size", (int)(size * PANGO_SCALE_SMALL), NULL); gtk_text_buffer_create_tag (buffer, "tt", "family", "monospace", NULL); - gtk_text_buffer_create_tag (buffer, "pre", "family", "monospace", NULL); + gtk_text_buffer_create_tag (buffer, "pre", "family", "monospace", + "paragraph-background", "#f0f0f0", NULL); gtk_text_buffer_create_tag (buffer, "b", "weight", PANGO_WEIGHT_BOLD, NULL); gtk_text_buffer_create_tag (buffer, "i", "style", PANGO_STYLE_ITALIC, NULL); gtk_text_buffer_create_tag (buffer, "u", "underline", PANGO_UNDERLINE_SINGLE, NULL); Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=48537&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Wed Jun 25 20:30:35 2008 @@ -142,12 +142,6 @@ GTK_WIDGET_CLASS (ygtk_help_dialog_parent_class)->realize (widget); YGtkHelpDialog *dialog = YGTK_HELP_DIALOG (widget); -#if 0 - // set help text background - gtk_widget_realize (dialog->help_text); - ygtk_html_wrap_set_background (dialog->help_text, THEMEDIR "/wizard/help-background.png"); -#endif - // set close as default widget gtk_widget_grab_default (dialog->close_button); gtk_widget_grab_focus (dialog->close_button); -- 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] r48536 - /branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-dialogs.ycp
by aschnell＠svn.opensuse.org 25 Jun '08

25 Jun '08

Author: aschnell Date: Wed Jun 25 19:15:20 2008 New Revision: 48536 URL: http://svn.opensuse.org/viewcvs/yast?rev=48536&view=rev Log: - layout Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-dialogs.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-dialogs.ycp Wed Jun 25 19:15:20 2008 @@ -54,7 +54,7 @@ contains(devices, dev["device"]:""); }); - term contents = `VBox( + term contents = `VBox(`Left( `HVSquash(`Frame(_("RAID Type"), `RadioButtonGroup(`id(`raid_type), `VBox( @@ -71,7 +71,7 @@ `LeftRadioButton(`id(`raid5), _("RAID &5 (Redundant Striping)"), raid_type == `raid5) ) - ))) + )))) ); contents = add(contents, DevicesSelectionBox::Create(unused_devices, used_devices, fields, -- 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] r48535 - in /branches/tmp/aschnell/part-redesign/storage/src/include: ep-lvm-dialogs.ycp lvm_lib.ycp
by aschnell＠svn.opensuse.org 25 Jun '08

25 Jun '08

Author: aschnell Date: Wed Jun 25 16:50:07 2008 New Revision: 48535 URL: http://svn.opensuse.org/viewcvs/yast?rev=48535&view=rev Log: - check volume group name Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/lvm_lib.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp Wed Jun 25 16:50:07 2008 @@ -8,6 +8,64 @@ textdomain "storage"; + boolean CheckVgName(string name) + { + if (size(name) == 0) + { + // error popup text + Error(_("Enter a name for the volume group.")); + return false; + } + + if (size(name) > 128) + { + // error popup text + Error(_("The name for the volume group is longer than 128 characters.")); + return false; + } + + if (substring(name, 0, 1) == "-") + { + // error popup text + Error(_("The name for the volume group must not start with a \"-\".")); + return false; + } + + string allowed_chars = "0123456789" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + + "abcdefghijklmnopqrstuvwxyz" + "._-+"; + if (findfirstnotof(name, allowed_chars) != nil) + { + // error popup text + Error(_("The name for the volume group contains illegal characters. Allowed +are alphanumeric characters, \".\", \"_\", \"-\" and \"+\".")); + return false; + } + + return true; + } + + + boolean CheckVgNameConflict(string name, list<string> vgs) + { + if (contains(vgs, name)) + { + // error popup text + Error(sformat(_("The volume group \"%1\" already exists."), name )); + return false; + } + + if (!check_vgname_dev(name)) + { + // error popup text + Error(sformat(_("The volume group name \"%1\" conflicts +with another entry in the /dev directory.\n"), name)); + return false; + } + + return true; + } + + boolean CheckPeSize(integer pe_size) { if (!Integer::IsPowerOfTwo(pe_size) || pe_size < 1024) @@ -41,7 +99,11 @@ { y2milestone("MiniWorkflowStepVg data:%1", data); - string vgname = ""; + map<string, map> target_map = Storage::GetTargetMap(); + + list<string> vgs = get_vgs(target_map); + + string vgname = size(vgs) == 0 ? "system" : ""; integer pesize = 4*1024*1024; list<string> pvs = []; @@ -49,7 +111,6 @@ list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size ]); - map<string, map> target_map = Storage::GetTargetMap(); list<map> unused_pvs = filter(map pv, get_possible_pvs(target_map), { return pv["used_by"]:"" == ""; }); @@ -94,10 +155,8 @@ return pv["device"]:""; }); - // TODO: checks - - if (!CheckPeSize(pesize) || - !CheckNumberOfDevicesForVg(size(pvs))) + if (!CheckVgName(vgname) || !CheckVgNameConflict(vgname, vgs) || + !CheckPeSize(pesize) || !CheckNumberOfDevicesForVg(size(pvs))) widget = `again; } break; Modified: branches/tmp/aschnell/part-redesign/storage/src/include/lvm_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/lvm_lib.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/lvm_lib.ycp Wed Jun 25 16:50:07 2008 @@ -36,12 +36,11 @@ ////////////////////////////////////////////////////////////////////// // get a list of all volume groups in the targetMap -define list get_vgs( map<string,map> targetMap ) - ``{ - list lvm_vg = []; +list<string> get_vgs( map<string,map> targetMap ) +{ + list<string> lvm_vg = []; - foreach( string dev, map devmap, targetMap, - ``{ + foreach( string dev, map devmap, targetMap, { if ( devmap["type"]:`CT_UNKNOWN==`CT_LVM ) { // add a found volume group @@ -49,7 +48,7 @@ } }); return( lvm_vg ); - }; +}; ////////////////////////////////////////////////////////////////////// // pesize to byte -- 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] r48534 - in /trunk/installation: package/yast2-installation.changes src/clients/inst_proposal.ycp
by ug＠svn.opensuse.org 25 Jun '08

25 Jun '08

Author: ug Date: Wed Jun 25 16:45:34 2008 New Revision: 48534 URL: http://svn.opensuse.org/viewcvs/yast?rev=48534&view=rev Log: proposal selection possible via autoyast profile (fate#302946) Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_proposal.ycp 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 Jun 25 16:45:34 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jun 25 16:44:33 CEST 2008 - ug(a)suse.de + +- proposal selection possible via autoyast profile (fate#302946) + +------------------------------------------------------------------- Tue Jun 17 14:23:04 CEST 2008 - lslezak(a)suse.cz - use Pkg::SourceSaveAll() instead of Pkg::SourceFinishAll() Modified: trunk/installation/src/clients/inst_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_pr… ============================================================================== --- trunk/installation/src/clients/inst_proposal.ycp (original) +++ trunk/installation/src/clients/inst_proposal.ycp Wed Jun 25 16:45:34 2008 @@ -635,6 +635,10 @@ return ! contains (submodules, m); }); submodules = (list<string>)merge (submodules, display_only_modules); + list <string> p = AutoinstConfig::getProposalList(); + submodules_presentation = filter (string v, submodules_presentation, { + return ( contains( p, v ) || p == [] ); + }); } else { @@ -646,6 +650,10 @@ // setup the list submodules_presentation = maplist (list mod, modules, ``(mod[0]:"") ); + list <string> p = AutoinstConfig::getProposalList(); + submodules_presentation = filter (string v, submodules_presentation, { + return ( contains( p, v ) || p == [] ); + }); } y2milestone ("Presentation order: %1", submodules_presentation); -- 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] r48533 - in /trunk/autoinstallation: VERSION package/autoyast2.changes src/modules/AutoinstConfig.ycp src/modules/AutoinstGeneral.ycp
by ug＠svn.opensuse.org 25 Jun '08

25 Jun '08

Author: ug Date: Wed Jun 25 16:23:37 2008 New Revision: 48533 URL: http://svn.opensuse.org/viewcvs/yast?rev=48533&view=rev Log: proposal selection possible via autoyast profile (fate#302946). 2.17.1 Modified: trunk/autoinstallation/VERSION trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoinstConfig.ycp trunk/autoinstallation/src/modules/AutoinstGeneral.ycp Modified: trunk/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/VERSION?rev=485… ============================================================================== --- trunk/autoinstallation/VERSION (original) +++ trunk/autoinstallation/VERSION Wed Jun 25 16:23:37 2008 @@ -1 +1 @@ -2.17.0 +2.17.1 Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Jun 25 16:23:37 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jun 25 16:19:11 CEST 2008 - ug(a)suse.de + +- proposal selection possible via autoyast profile (fate#302946) +- 2.17.1 + +------------------------------------------------------------------- Mon Jun 23 12:47:17 CEST 2008 - ug(a)suse.de - if mountpoint is swap, filesystem is set to swap too Modified: trunk/autoinstallation/src/modules/AutoinstConfig.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstConfig.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstConfig.ycp Wed Jun 25 16:23:37 2008 @@ -167,6 +167,14 @@ // before the probing stage DASD module can has run // global boolean remoteProfile = true; + global list<string> Proposals = []; + + global list<string> getProposalList() { + return Proposals; + } + global void setProposalList(list<string> l) { + Proposals = l; + } include "autoinstall/io.ycp"; Modified: trunk/autoinstallation/src/modules/AutoinstGeneral.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstGeneral.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstGeneral.ycp Wed Jun 25 16:23:37 2008 @@ -44,6 +44,9 @@ global list askList = []; +// global list<string> proposals = ["bootloader_proposal", "software_proposal", "country_simple_proposal", "timezone_proposal", "users_proposal", "runlevel_proposal", "hwinfo_proposal", "mouse_proposal", "deploying_proposal"]; + global list<string> proposals = []; + /* default value of settings modified */ global boolean modified = false; @@ -121,6 +124,11 @@ summary = Summary::AddLine(summary, (AutoinstGeneral::signature_handling["import_gpg_key"]:false) ? _("Importing new GPG keys") : _("Not importing new GPG Keys")); + summary = Summary::AddHeader(summary, _("Proposals")); + foreach(string p, proposals, ``{ + summary = Summary::AddLine(summary, p); + }); + return summary; } @@ -137,6 +145,7 @@ mode = settings["mode"]:$[]; signature_handling = settings["signature-handling"]:$[]; askList = settings["ask-list"]:[]; + proposals = settings["proposals"]:[]; return true; } @@ -164,6 +173,7 @@ general["mode"] = mode; general["signature-handling"] = signature_handling; general["ask-list"] = askList; + general["proposals"] = proposals; return general; } @@ -217,6 +227,7 @@ ProductFeatures::SetBooleanFeature( "globals", "kexec_reboot", !mode["forceboot"]:false ); AutoinstConfig::Halt = mode["halt"]:false; AutoinstConfig::RebootMsg = mode["rebootmsg"]:false; + AutoinstConfig::setProposalList( proposals ); // // mouse -- 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] r48532 - /branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp
by aschnell＠svn.opensuse.org 25 Jun '08

25 Jun '08

Author: aschnell Date: Wed Jun 25 15:13:43 2008 New Revision: 48532 URL: http://svn.opensuse.org/viewcvs/yast?rev=48532&view=rev Log: - better checks for pe size Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp Wed Jun 25 15:13:43 2008 @@ -8,6 +8,21 @@ textdomain "storage"; + boolean CheckPeSize(integer pe_size) + { + if (!Integer::IsPowerOfTwo(pe_size) || pe_size < 1024) + { + Error(_("The data entered is invalid. Insert a physical extent size larger than 1kB +in powers of 2, for example, \"512kB\" or \"4MB\"")); + return false; + } + else + { + return true; + } + } + + boolean CheckNumberOfDevicesForVg(integer num) { if (num < 1) @@ -71,7 +86,7 @@ any tmp = UI::QueryWidget(`id("pesize"), `Value); if (is(tmp, string)) - pesize = pesize_str_to_byte((string) tmp); + pesize = kmgt_str_to_byte((string) tmp); else pesize = (integer) tmp; @@ -81,17 +96,8 @@ // TODO: checks - if (pesize == 0) - { - // error popup text - Popup::Error(_("The data entered is invalid. -Insert a physical extent size from 8kB to 512MB -in powers of 2, for example, \"4MB\" or \"512kB\" -")); - widget = `again; - } - - if (!CheckNumberOfDevicesForVg(size(pvs))) + if (!CheckPeSize(pesize) || + !CheckNumberOfDevicesForVg(size(pvs))) widget = `again; } break; -- 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] r48531 - in /trunk/network/src: lan/bridge.ycp routines/runtime.ycp routines/widgets.ycp
by kmachalkova＠svn.opensuse.org 25 Jun '08

25 Jun '08

Author: kmachalkova Date: Wed Jun 25 14:55:38 2008 New Revision: 48531 URL: http://svn.opensuse.org/viewcvs/yast?rev=48531&view=rev Log: Fixed typos (#384167) Modified: trunk/network/src/lan/bridge.ycp trunk/network/src/routines/runtime.ycp trunk/network/src/routines/widgets.ycp Modified: trunk/network/src/lan/bridge.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/bridge.ycp?rev=4… ============================================================================== --- trunk/network/src/lan/bridge.ycp (original) +++ trunk/network/src/lan/bridge.ycp Wed Jun 25 14:55:38 2008 @@ -56,7 +56,7 @@ if ((string)configurations[NetworkInterfaces::GetType(device), device, "IPADDR"]:"" != "0.0.0.0") { if(!confirmed) { valid = Popup::ContinueCancel(_("At least one selected device is already configured. -Remove the configuration. +Remove the configuration? ")); confirmed=true; } Modified: trunk/network/src/routines/runtime.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/runtime.ycp… ============================================================================== --- trunk/network/src/routines/runtime.ycp (original) +++ trunk/network/src/routines/runtime.ycp Wed Jun 25 14:55:38 2008 @@ -96,7 +96,7 @@ { string message = // notification about package needed 1/2 - _("The %1 packages must be installed because device control for non-root users has benn established.") + + _("The %1 packages must be installed because device control for non-root users has been established.") + // notification about package needed 2/2 _("Do you want to install it now?"); Modified: trunk/network/src/routines/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/widgets.ycp… ============================================================================== --- trunk/network/src/routines/widgets.ycp (original) +++ trunk/network/src/routines/widgets.ycp Wed Jun 25 14:55:38 2008 @@ -116,8 +116,8 @@ // Combo box option for Device Activation "label": _("Manually"), // help text for Device Activation - "help": _("Press Manually tocontrol the interface manually -via ifup or KInternet (See User Controlled below). + "help": _("Manually: You control the interface manually +via 'ifup' or 'kinternet' (see 'User Controlled' below). "), ], "ifplugd": $[ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0