February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55615 - /tags/stable-2_18_7/storage/
by aschnell＠svn.opensuse.org 19 Feb '09

19 Feb '09

Author: aschnell Date: Thu Feb 19 17:15:20 2009 New Revision: 55615 URL: http://svn.opensuse.org/viewcvs/yast?rev=55615&view=rev Log: Created tag stable-2_18_7 for storage Added: tags/stable-2_18_7/storage/ (props changed) - copied from r55614, trunk/storage/ -- 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] r55614 - /trunk/qt-graph/examples/shapes.gv
by aschnell＠svn.opensuse.org 19 Feb '09

19 Feb '09

Author: aschnell Date: Thu Feb 19 16:47:03 2009 New Revision: 55614 URL: http://svn.opensuse.org/viewcvs/yast?rev=55614&view=rev Log: - extended example Modified: trunk/qt-graph/examples/shapes.gv Modified: trunk/qt-graph/examples/shapes.gv URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-graph/examples/shapes.gv?rev=… ============================================================================== --- trunk/qt-graph/examples/shapes.gv (original) +++ trunk/qt-graph/examples/shapes.gv Thu Feb 19 16:47:03 2009 @@ -2,9 +2,20 @@ { node [style="filled", fontname="Helvetica"]; - rectangle [shape="rectangle"]; - diamond [shape="diamond"]; + "rectangle" [shape="rectangle"]; - circle [shape="circle"]; - ellipse [shape="ellipse"]; + "box" [shape="box"]; + "box orientation" [shape="box", orientation=22.5, regular=true]; + + "diamond" [shape="diamond"]; + "diamond regular" [shape="diamond", regular=true]; + + "hexagon" [shape="hexagon"]; + "hexagon regular" [shape="hexagon", regular=true]; + + "polygon" [shape="polygon", sides=12]; + "polygon distortion" [shape="polygon", distortion=-0.25]; + + "circle" [shape="circle"]; + "ellipse" [shape="ellipse"]; } -- 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] r55613 - /trunk/sudo/src/complex.ycp
by kmachalkova＠svn.opensuse.org 19 Feb '09

19 Feb '09

Author: kmachalkova Date: Thu Feb 19 15:40:16 2009 New Revision: 55613 URL: http://svn.opensuse.org/viewcvs/yast?rev=55613&view=rev Log: Avoiding accumulation of whitespaces - #473683 Modified: trunk/sudo/src/complex.ycp Modified: trunk/sudo/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/complex.ycp?rev=55613&r… ============================================================================== --- trunk/sudo/src/complex.ycp (original) +++ trunk/sudo/src/complex.ycp Thu Feb 19 15:40:16 2009 @@ -199,7 +199,7 @@ if(pos != nil) { cmd = substring(it,0, pos); - param = substring(it,pos); + param = substring(it,pos+1); } else { cmd = it; -- 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] r55612 - in /branches/tmp/juhliarik/bootloader-UIrefactor/src/routines: dialogs_i386.ycp widgets_i386.ycp
by jreidinger＠svn.opensuse.org 19 Feb '09

19 Feb '09

Author: jreidinger Date: Thu Feb 19 15:28:36 2009 New Revision: 55612 URL: http://svn.opensuse.org/viewcvs/yast?rev=55612&view=rev Log: convert disks order dialog to CWM, missing handler for add button. Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs_i386.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/widgets_i386.ycp Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs_i386.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIre… ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs_i386.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs_i386.ycp Thu Feb 19 15:28:36 2009 @@ -30,199 +30,27 @@ include "bootloader/routines/widgets_i386.ycp"; + + /** * Run dialog to adjust installation on i386 and AMD64 * @return symbol for wizard sequencer */ symbol i386InstallDetailsDialog () { - term contents = `HBox (`HStretch (), `VBox ( - `VStretch (), - // frame - `Frame (_("Disk Order"), - `HBox (`HSpacing (2), `VBox ( - `VSpacing (1), - `SelectionBox (`id (`disks), - `opt (`notify, `immediate), - // selectionn box label - _("D&isks"), []), - Mode::config () - ? `HBox ( - `HStretch (), - `PushButton (`id (`add), `opt (`key_F3), Label::AddButton ()), - `PushButton (`id (`delete), `opt(`key_F5), Label::DeleteButton ()), - `HStretch () - ) - : `HBox (), - `VSpacing (1) - ), - `HSquash ( - `VBox ( - `VStretch (), - `PushButton (`id (`up), `opt (`hstretch), _("&Up")), - `PushButton (`id (`down), `opt (`hstretch), _("&Down")), - `VStretch () - ) - ), - `HSpacing (2) - ) - ), - `VStretch (), - // frame - `Frame (_("Disk System Area Update"), `HBox (`HSpacing (2), `VBox ( - `VSpacing (1), - `Left (`CheckBox (`id (`repl_mbr), - // check box - _("R&eplace MBR with Generic Code"))), - `Left (`CheckBox (`id (`activate), - // check box - _("&Activate Boot Loader Partition"))), - BootCommon::getLoaderType (false) == "grub" - && BootCommon::allowEmbed15 () - ? `Left (`CheckBox (`id (`embed), - // check box - _("U&se Dedicated Boot Loader Area"))) - : `VBox (), - `VSpacing (1) - ), `HSpacing (2))), - `VStretch () - ), `HStretch ()); - - Wizard::SetContentsButtons ( - // dialog caption - _("Boot Loader Installation Details"), - contents, - i386InstallDetailsHelp (), - Label::BackButton (), - Label::OKButton ()); - - list<string> disks_order = BootCommon::DisksOrder (); - - UI::ChangeWidget (`id (`disks), `Items, disks_order); - UI::ChangeWidget (`id (`disks), `CurrentItem, disks_order[0]:""); - UI::ChangeWidget (`id (`repl_mbr), `Value, BootCommon::repl_mbr); - UI::ChangeWidget (`id (`activate), `Value, BootCommon::activate); - if (UI::WidgetExists (`id (`embed))) - UI::ChangeWidget (`id (`embed), `Value, BootCommon::embed_stage15); - boolean save_embed = BootCommon::embed_stage15; - - any ret = nil; - while (ret == nil) - { - string current = (string)UI::QueryWidget (`id (`disks), `CurrentItem); - integer pos = 0; - while (pos < size (disks_order) && disks_order[pos]:"" != current) - pos = pos + 1; - UI::ChangeWidget (`id (`up), `Enabled, - pos > 0 && pos < size (disks_order)); - UI::ChangeWidget (`id (`down), `Enabled, pos < size (disks_order) - 1); - - ret = UI::UserInput (); - boolean order_changed = false; - - if (ret == `add) - { - term popup = `VBox (`VSpacing (1), - // textentry header - `InputField (`id (`devname), `opt (`hstretch), _("&Device")), - `VSpacing (1), - `HBox (`HStretch (), - `PushButton (`id (`ok), `opt (`key_F10, `default), - Label::OKButton ()), - `HStretch (), - `PushButton (`id (`cancel), `opt (`key_F8), - Label::CancelButton ()), - `HStretch () - ), - `VSpacing (1) - ); - UI::OpenDialog (popup); - symbol pushed = (symbol)UI::UserInput (); - string new_dev = (string) - UI::QueryWidget (`id (`devname), `Value); - UI::CloseDialog (); - if (pushed == `ok) - { - disks_order = add (disks_order, new_dev); - order_changed = true; - current = new_dev; - } - } - else if (ret == `delete) - { - disks_order = filter (string d, disks_order, { - return d != current; - }); - order_changed = true; - current = disks_order[0]:nil; - } - else if (ret == `up) - { - disks_order = (list<string>) - BootCommon::swapItems (disks_order, pos, pos - 1); - order_changed = true; - } - else if (ret == `down) - { - disks_order = (list<string>) - BootCommon::swapItems (disks_order, pos, pos + 1); - order_changed = true; - } - - if (ret == `cancel) - ret = `abort; - if (ret != `next && ret != `abort && ret != `back) - { - if (order_changed) - { - UI::ChangeWidget (`id (`disks), `Items, disks_order); - UI::ChangeWidget (`id (`disks), `CurrentItem, current); - } - ret = nil; - } - } - if (ret == `next) - { - integer index = 0; - BootCommon::device_mapping = filter (string k, string v, - BootCommon::device_mapping, - { - return substring (v, 0, 2) != "hd"; - }); - BootCommon::mbrDisk = disks_order[0]:""; - BootCommon::device_mapping = (map<string,string>)union ( - BootCommon::device_mapping, - listmap (string d, disks_order, { - string hex_index = substring (tohexstring (index), 2); - index = index + 1; - return $[ d : sformat ("hd%1", hex_index) ]; - }) - ); - BootCommon::repl_mbr = (boolean) - UI::QueryWidget (`id (`repl_mbr), `Value); - if (BootCommon::activate != (boolean) - UI::QueryWidget (`id (`activate), `Value)) - { - BootCommon::activate_changed = true; - } - BootCommon::activate = (boolean) - UI::QueryWidget (`id (`activate), `Value); - if (UI::WidgetExists (`id (`embed))) - { - BootCommon::embed_stage15 = (boolean) - UI::QueryWidget (`id (`embed), `Value); - } - if (BootCommon::repl_mbr) - { - if (Stage::initial ()) - Pkg::PkgInstall ("master-boot-code"); - BootCommon::location_changed = true; - } - if (BootCommon::activate || BootCommon::embed_stage15 != save_embed) - { - BootCommon::location_changed = true; - } - } - return (symbol)ret; + term contents = `HBox (`HStretch (), `VBox ( + `Frame (_("Disk Order"),"disks_order"), + `VStretch()), + `HStretch()); + + return CWM::ShowAndRun ($[ + "widget_descr": $[ "disks_order": DisksOrderWidget()], + "widget_names": ["disks_order"], + "contents": contents, + "caption" : _("Disk order settings"), + "back_button" : Label::BackButton (), + "abort_button" : Label::AbortButton (), + "next_button" : Label::OKButton () + ]); } /** Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/widgets_i386.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIre… ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/widgets_i386.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/widgets_i386.ycp Thu Feb 19 15:28:36 2009 @@ -228,6 +228,108 @@ ]; } +void InitDiskOrder(string widget) { + list<string> disksOrder = BootCommon::DisksOrder (); + + UI::ChangeWidget ( `id(`disks), `Items, disksOrder); + UI::ChangeWidget (`id (`disks), `CurrentItem, disksOrder[0]:""); +} + +string GetItemID(term t){ + return argsof((term)argsof(t)[0]:`id(""))[0]:""; +} + +void StoreDiskOrder(string widget, map event) { + list<term> disksOrder = (list<term>)UI::QueryWidget(`id(`disks), `Items); + list<string> result = (list<string>) maplist(term t, disksOrder, { + return GetItemID(t); + }); + BootCommon::mbrDisk = result[0]:""; + integer index = 0; + BootCommon::device_mapping = listmap (string d, result, { + string indexs = tostring(index); + index = index + 1; + return $[ d : sformat ("hd%1", indexs)]; + }); +} + +symbol HandleDiskOrder( string widget, map event ){ + any action = event["ID"]:nil; + boolean changed = false; + list<term> disksOrder = (list<term>)UI::QueryWidget(`id(`disks), `Items); + string current = (string)UI::QueryWidget (`id (`disks), `CurrentItem); + integer pos = 0; + while (pos < size (disksOrder) + && GetItemID(disksOrder[pos]:`Item(`id(""))) != current) + pos = pos + 1; + + //disabling & enabling up/down + UI::ChangeWidget (`id (`up), `Enabled, pos > 0 && pos < size (disksOrder)); + UI::ChangeWidget (`id (`down), `Enabled, pos < size (disksOrder) - 1); + + if (action == `up){ + changed= true; + disksOrder = + (list<term>) BootCommon::swapItems (disksOrder, pos, pos - 1); + } else if (action == `down){ + changed= true; + disksOrder = + (list<term>) BootCommon::swapItems (disksOrder, pos, pos + 1); + } else if (action == `delete){ + changed = true; + disksOrder = remove(disksOrder,pos); + UI::ChangeWidget (`id (`disks), `CurrentItem, + (pos > 0) ? GetItemID(disksOrder[(pos-1)]:`Item(`id(""))) + : GetItemID(disksOrder[0]:`Item(`id("")))); + } else if (action == `add) { + //TODO + } + + if (changed){ + UI::ChangeWidget (`id (`disks), `Items, disksOrder); + } +} + +map<string,any> DisksOrderWidget(){ + term contents = `HBox (`HSpacing (2), `VBox ( + `VSpacing (1), + `SelectionBox (`id (`disks), + `opt (`notify, `immediate),_("D&isks"), []), + (Mode::config () || Mode::installation()) + ? `HBox ( + `HStretch (), + `PushButton (`id (`add), + `opt (`key_F3), Label::AddButton ()), + `PushButton (`id (`delete), + `opt(`key_F5), Label::DeleteButton ()), + `HStretch () + ) + : `HBox (), + `VSpacing (1) + ), + `HSquash ( + `VBox ( + `VStretch (), + `PushButton (`id (`up), + `opt (`hstretch), _("&Up")), + `PushButton (`id (`down), + `opt (`hstretch), _("&Down")), + `VStretch () + ) + ), + `HSpacing (2) + ); + return $[ + "widget" : `custom, + "custom_widget" : contents, + "init" : InitDiskOrder, + "handle" : HandleDiskOrder, +// "handle_events" : [`up, `down, `add, `delete], + "store" : StoreDiskOrder, + "help" : i386InstallDetailsHelp () + ]; +} + /** * Cache for i386Widgets function */ -- 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] r55611 - in /trunk/storage: libstorage/src/Graph.cc package/yast2-storage.changes
by aschnell＠svn.opensuse.org 19 Feb '09

19 Feb '09

Author: aschnell Date: Thu Feb 19 15:24:40 2009 New Revision: 55611 URL: http://svn.opensuse.org/viewcvs/yast?rev=55611&view=rev Log: - added tooltips to nodes in graph Modified: trunk/storage/libstorage/src/Graph.cc trunk/storage/package/yast2-storage.changes Modified: trunk/storage/libstorage/src/Graph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Graph.cc?… ============================================================================== --- trunk/storage/libstorage/src/Graph.cc (original) +++ trunk/storage/libstorage/src/Graph.cc Thu Feb 19 15:24:40 2009 @@ -10,6 +10,8 @@ #include "config.h" #include "y2storage/Graph.h" +#include "y2storage/AppUtil.h" +#include "y2storage/HumanString.h" using namespace std; @@ -23,13 +25,14 @@ struct Node { - Node(NodeType type, const string& id, const string& label) - : type(type), id(id), label(label) + Node(NodeType type, const string& id, const string& label, unsigned long long sizeK) + : type(type), id(id), label(label), sizeK(sizeK) {} NodeType type; string id; string label; + unsigned long long sizeK; }; @@ -69,37 +72,52 @@ } + string makeTooltip(const char* text, unsigned long long sizeK) + { + return dotQuote(string(text) + string(", ") + byteToHumanString(1024 * sizeK, false, 2, false)); + } + + std::ostream& operator<<(std::ostream& s, const Node& node) { s << dotQuote(node.id) << " [label=" << dotQuote(node.label); switch (node.type) { case NODE_DISK: - s << ", color=\"#ff0000\", fillcolor=\"#ffaaaa\""; + s << ", color=\"#ff0000\", fillcolor=\"#ffaaaa\"" + << ", tooltip=" << makeTooltip(_("Hard Disk"), node.sizeK); break; case NODE_DMRAID: - s << ", color=\"#ff0000\", fillcolor=\"#ffaaaa\""; + s << ", color=\"#ff0000\", fillcolor=\"#ffaaaa\"" + << ", tooltip=" << makeTooltip(_("BIOS RAID"), node.sizeK); break; case NODE_DMMULTIPATH: - s << ", color=\"#ff0000\", fillcolor=\"#ffaaaa\""; + s << ", color=\"#ff0000\", fillcolor=\"#ffaaaa\"" + << ", tooltip=" << makeTooltip(_("Multipath"), node.sizeK); break; case NODE_PARTITION: - s << ", color=\"#cc33cc\", fillcolor=\"#eeaaee\""; + s << ", color=\"#cc33cc\", fillcolor=\"#eeaaee\"" + << ", tooltip=" << makeTooltip(_("Partition"), node.sizeK); break; case NODE_MDRAID: - s << ", color=\"#aaaa00\", fillcolor=\"#ffffaa\""; + s << ", color=\"#aaaa00\", fillcolor=\"#ffffaa\"" + << ", tooltip=" << makeTooltip(_("RAID"), node.sizeK); break; case NODE_LVMVG: - s << ", color=\"#0000ff\", fillcolor=\"#aaaaff\""; + s << ", color=\"#0000ff\", fillcolor=\"#aaaaff\"" + << ", tooltip=" << makeTooltip(_("Volume Group"), node.sizeK); break; case NODE_LVMLV: - s << ", color=\"#6622dd\", fillcolor=\"#bb99ff\""; + s << ", color=\"#6622dd\", fillcolor=\"#bb99ff\"" + << ", tooltip=" << makeTooltip(_("Logical Volume"), node.sizeK); break; case NODE_DM: - s << ", color=\"#885511\", fillcolor=\"#ddbb99\""; + s << ", color=\"#885511\", fillcolor=\"#ddbb99\"" + << ", tooltip=" << makeTooltip(_("DM Device"), node.sizeK); break; case NODE_MOUNTPOINT: - s << ", color=\"#008800\", fillcolor=\"#99ee99\""; + s << ", color=\"#008800\", fillcolor=\"#99ee99\"" + << ", tooltip=" << makeTooltip(_("Mount Point"), node.sizeK); break; } return s << "];"; @@ -134,14 +152,16 @@ deque<ContainerInfo> containers; s->getContainers(containers); - for (deque<ContainerInfo>::iterator i1 = containers.begin(); - i1 != containers.end(); ++i1) + for (deque<ContainerInfo>::iterator i1 = containers.begin(); i1 != containers.end(); ++i1) { switch (i1->type) { case DISK: { - Node disk_node(NODE_DISK, "device:" + i1->device, i1->device); + DiskInfo diskinfo; + s->getDiskInfo(i1->device, diskinfo); + + Node disk_node(NODE_DISK, "device:" + i1->device, i1->device, diskinfo.sizeK); nodes.push_back(disk_node); if (!i1->usedByDevice.empty()) @@ -151,13 +171,12 @@ deque<PartitionInfo> partitions; s->getPartitionInfo(i1->name, partitions); - for (deque<PartitionInfo>::iterator i2 = partitions.begin(); - i2 != partitions.end(); ++i2) + for (deque<PartitionInfo>::iterator i2 = partitions.begin(); i2 != partitions.end(); ++i2) { if (i2->partitionType == EXTENDED) continue; - Node partition_node(NODE_PARTITION, "device:" + i2->v.device, i2->v.device); + Node partition_node(NODE_PARTITION, "device:" + i2->v.device, i2->v.device, i2->v.sizeK); nodes.push_back(partition_node); edges.push_back(EDGE_SUBDEVICE, disk_node.id, partition_node.id); @@ -169,7 +188,7 @@ if (!i2->v.mount.empty()) { - Node mountpoint_node(NODE_MOUNTPOINT, "mountpoint:" + i2->v.mount, i2->v.mount); + Node mountpoint_node(NODE_MOUNTPOINT, "mountpoint:" + i2->v.mount, i2->v.mount, i2->v.sizeK); nodes.push_back(mountpoint_node); edges.push_back(EDGE_MOUNT, partition_node.id, mountpoint_node.id); @@ -180,22 +199,24 @@ case LVM: { - Node vg_node(NODE_LVMVG, "device:" + i1->device, i1->device); + LvmVgInfo lvmvginfo; + s->getLvmVgInfo(i1->name, lvmvginfo); + + Node vg_node(NODE_LVMVG, "device:" + i1->device, i1->device, lvmvginfo.sizeK); nodes.push_back(vg_node); deque<LvmLvInfo> lvs; s->getLvmLvInfo(i1->name, lvs); - for (deque<LvmLvInfo>::iterator i2 = lvs.begin(); - i2 != lvs.end(); ++i2) + for (deque<LvmLvInfo>::iterator i2 = lvs.begin(); i2 != lvs.end(); ++i2) { - Node lv_node(NODE_LVMLV, "device:" + i2->v.device, i2->v.device); + Node lv_node(NODE_LVMLV, "device:" + i2->v.device, i2->v.device, i2->v.sizeK); nodes.push_back(lv_node); edges.push_back(EDGE_SUBDEVICE, vg_node.id, lv_node.id); if (!i2->v.mount.empty()) { - Node mountpoint_node(NODE_MOUNTPOINT, "mountpoint:" + i2->v.mount, i2->v.mount); + Node mountpoint_node(NODE_MOUNTPOINT, "mountpoint:" + i2->v.mount, i2->v.mount, i2->v.sizeK); nodes.push_back(mountpoint_node); edges.push_back(EDGE_MOUNT, lv_node.id, mountpoint_node.id); @@ -211,7 +232,7 @@ for (deque<MdInfo>::iterator i2 = mds.begin(); i2 != mds.end(); ++i2) { - Node md_node(NODE_MDRAID, "device:" + i2->v.device, i2->v.device); + Node md_node(NODE_MDRAID, "device:" + i2->v.device, i2->v.device, i2->v.sizeK); nodes.push_back(md_node); if (!i2->v.usedByDevice.empty()) @@ -221,7 +242,7 @@ if (!i2->v.mount.empty()) { - Node mountpoint_node(NODE_MOUNTPOINT, "mountpoint:" + i2->v.mount, i2->v.mount); + Node mountpoint_node(NODE_MOUNTPOINT, "mountpoint:" + i2->v.mount, i2->v.mount, i2->v.sizeK); nodes.push_back(mountpoint_node); edges.push_back(EDGE_MOUNT, md_node.id, mountpoint_node.id); @@ -237,7 +258,7 @@ for (deque<DmInfo>::iterator i2 = dms.begin(); i2 != dms.end(); ++i2) { - Node dm_node(NODE_DM, "device:" + i2->v.device, i2->v.device); + Node dm_node(NODE_DM, "device:" + i2->v.device, i2->v.device, i2->v.sizeK); nodes.push_back(dm_node); if (!i2->v.usedByDevice.empty()) @@ -247,7 +268,7 @@ if (!i2->v.mount.empty()) { - Node mountpoint_node(NODE_MOUNTPOINT, "mountpoint:" + i2->v.mount, i2->v.mount); + Node mountpoint_node(NODE_MOUNTPOINT, "mountpoint:" + i2->v.mount, i2->v.mount, i2->v.sizeK); nodes.push_back(mountpoint_node); edges.push_back(EDGE_MOUNT, dm_node.id, mountpoint_node.id); @@ -258,7 +279,10 @@ case DMRAID: { - Node dmraid_node(NODE_DMRAID, "device:" + i1->device, i1->device); + DmraidCoInfo dmraidcoinfo; + s->getDmraidCoInfo(i1->device, dmraidcoinfo); + + Node dmraid_node(NODE_DMRAID, "device:" + i1->device, i1->device, dmraidcoinfo.p.d.sizeK); nodes.push_back(dmraid_node); if (!i1->usedByDevice.empty()) @@ -268,13 +292,12 @@ deque<DmraidInfo> partitions; s->getDmraidInfo(i1->name, partitions); - for (deque<DmraidInfo>::iterator i2 = partitions.begin(); - i2 != partitions.end(); ++i2) + for (deque<DmraidInfo>::iterator i2 = partitions.begin(); i2 != partitions.end(); ++i2) { if (i2->p.p.partitionType == EXTENDED) continue; - Node partition_node(NODE_PARTITION, "device:" + i2->p.v.device, i2->p.v.device); + Node partition_node(NODE_PARTITION, "device:" + i2->p.v.device, i2->p.v.device, i2->p.v.sizeK); nodes.push_back(partition_node); edges.push_back(EDGE_SUBDEVICE, dmraid_node.id, partition_node.id); @@ -286,7 +309,7 @@ if (!i2->p.v.mount.empty()) { - Node mountpoint_node(NODE_MOUNTPOINT, "mountpoint:" + i2->p.v.mount, i2->p.v.mount); + Node mountpoint_node(NODE_MOUNTPOINT, "mountpoint:" + i2->p.v.mount, i2->p.v.mount, i2->p.v.sizeK); nodes.push_back(mountpoint_node); edges.push_back(EDGE_MOUNT, partition_node.id, mountpoint_node.id); @@ -297,7 +320,10 @@ case DMMULTIPATH: { - Node dmmultipath_node(NODE_DMMULTIPATH, "device:" + i1->device, i1->device); + DmmultipathCoInfo dmmultipathcoinfo; + s->getDmmultipathCoInfo(i1->device, dmmultipathcoinfo); + + Node dmmultipath_node(NODE_DMMULTIPATH, "device:" + i1->device, i1->device, dmmultipathcoinfo.p.d.sizeK); nodes.push_back(dmmultipath_node); if (!i1->usedByDevice.empty()) @@ -307,13 +333,12 @@ deque<DmmultipathInfo> partitions; s->getDmmultipathInfo(i1->name, partitions); - for (deque<DmmultipathInfo>::iterator i2 = partitions.begin(); - i2 != partitions.end(); ++i2) + for (deque<DmmultipathInfo>::iterator i2 = partitions.begin(); i2 != partitions.end(); ++i2) { if (i2->p.p.partitionType == EXTENDED) continue; - Node partition_node(NODE_PARTITION, "device:" + i2->p.v.device, i2->p.v.device); + Node partition_node(NODE_PARTITION, "device:" + i2->p.v.device, i2->p.v.device, i2->p.v.sizeK); nodes.push_back(partition_node); edges.push_back(EDGE_SUBDEVICE, dmmultipath_node.id, partition_node.id); @@ -325,7 +350,7 @@ if (!i2->p.v.mount.empty()) { - Node mountpoint_node(NODE_MOUNTPOINT, "mountpoint:" + i2->p.v.mount, i2->p.v.mount); + Node mountpoint_node(NODE_MOUNTPOINT, "mountpoint:" + i2->p.v.mount, i2->p.v.mount, i2->p.v.sizeK); nodes.push_back(mountpoint_node); edges.push_back(EDGE_MOUNT, partition_node.id, mountpoint_node.id); Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Feb 19 15:24:40 2009 @@ -1,8 +1,13 @@ ------------------------------------------------------------------- +Thu Feb 19 15:23:47 CET 2009 - aschnell(a)suse.de + +- added tooltips to nodes in graph +- 2.18.7 + +------------------------------------------------------------------- Wed Feb 18 14:44:45 CET 2009 - aschnell(a)suse.de - converted proposal code to a module -- 2.18.7 ------------------------------------------------------------------- Fri Feb 13 12:42:07 CET 2009 - aschnell(a)suse.de -- 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] r55610 - /trunk/ncurses/src/NCWidgetFactory.cc
by gs＠svn.opensuse.org 19 Feb '09

19 Feb '09

Author: gs Date: Thu Feb 19 13:54:23 2009 New Revision: 55610 URL: http://svn.opensuse.org/viewcvs/yast?rev=55610&view=rev Log: remove obsolete lines Modified: trunk/ncurses/src/NCWidgetFactory.cc Modified: trunk/ncurses/src/NCWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCWidgetFactory.cc?r… ============================================================================== --- trunk/ncurses/src/NCWidgetFactory.cc (original) +++ trunk/ncurses/src/NCWidgetFactory.cc Thu Feb 19 13:54:23 2009 @@ -379,9 +379,6 @@ YPackageSelector * NCWidgetFactory::createPackageSelector( YWidget * parent, long modeFlags ) { - // FIXME - //YNCursesUI::ui()->setAutoActivateDialogs( false ); - NCPackageSelectorPluginStub * plugin = YNCursesUI::ui()->packageSelectorPlugin(); if ( plugin ) -- 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] r55609 - /tags/stable-2_18_1/ncurses-pkg/
by kmachalkova＠svn.opensuse.org 19 Feb '09

19 Feb '09

Author: kmachalkova Date: Thu Feb 19 13:50:00 2009 New Revision: 55609 URL: http://svn.opensuse.org/viewcvs/yast?rev=55609&view=rev Log: Created tag stable-2_18_1 for ncurses-pkg Added: tags/stable-2_18_1/ncurses-pkg/ - copied from r55608, trunk/ncurses-pkg/ -- 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] r55608 - in /trunk/ncurses-pkg: VERSION package/yast2-ncurses-pkg.changes
by kmachalkova＠svn.opensuse.org 19 Feb '09

19 Feb '09

Author: kmachalkova Date: Thu Feb 19 13:49:53 2009 New Revision: 55608 URL: http://svn.opensuse.org/viewcvs/yast?rev=55608&view=rev Log: version++ Modified: trunk/ncurses-pkg/VERSION trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes Modified: trunk/ncurses-pkg/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/VERSION?rev=55608&r1… ============================================================================== --- trunk/ncurses-pkg/VERSION (original) +++ trunk/ncurses-pkg/VERSION Thu Feb 19 13:49:53 2009 @@ -1 +1 @@ -2.18.0 +2.18.1 Modified: trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/package/yast2-ncurse… ============================================================================== --- trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes (original) +++ trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes Thu Feb 19 13:49:53 2009 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Thu Feb 19 13:33:58 CET 2009 - kmachalkova(a)suse.cz + +- New menu for launching repo manager and YOU configuration +- New sub-menu for configuring PKGMGR_ACTION_AT_EXIT sysconfig + variable +- Focus newly created table/input field after switching between filter + views +- 2.18.1 + +------------------------------------------------------------------- Tue Jan 20 17:55:52 CET 2009 - kmachalkova(a)suse.cz - Fixed weird behaviour of left/right arrow keys (bnc#467586) -- 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] r55607 - /trunk/ncurses-pkg/src/NCPackageSelector.cc
by kmachalkova＠svn.opensuse.org 19 Feb '09

19 Feb '09

Author: kmachalkova Date: Thu Feb 19 13:08:20 2009 New Revision: 55607 URL: http://svn.opensuse.org/viewcvs/yast?rev=55607&view=rev Log: translation Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.cc Thu Feb 19 13:08:20 2009 @@ -1598,7 +1598,7 @@ //Add only if requested by `opt(`repoMgr) flag - #381956 if (isRepoMgrEnabled()) - configMenu = new NCPkgMenuConfig( menu_buttons, "C&onfiguration", this); + configMenu = new NCPkgMenuConfig( menu_buttons, _("C&onfiguration"), this); extrasMenu = new NCPkgMenuExtras( menu_buttons, NCPkgStrings::Extras(), this); -- 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] r55606 - /trunk/storage/storage/src/include/custom_part_check_generated.ycp
by aschnell＠svn.opensuse.org 19 Feb '09

19 Feb '09

Author: aschnell Date: Thu Feb 19 12:27:52 2009 New Revision: 55606 URL: http://svn.opensuse.org/viewcvs/yast?rev=55606&view=rev Log: - changed type of retval Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_check_generated.ycp (original) +++ trunk/storage/storage/src/include/custom_part_check_generated.ycp Thu Feb 19 12:27:52 2009 @@ -55,7 +55,6 @@ boolean diskless = true; boolean partition_mounted_but_not_formated = false; - symbol retval = `next; boolean swap_found = false; boolean boot_found = false; boolean root_found = false; @@ -206,6 +205,8 @@ y2milestone("root_dmraid:%1 root_raid %2 boot_raid %3 raid_type:%4", root_dmraid, root_raid, boot_raid, raid_type); + boolean retval = true; + if ( ( !Arch::ia64 () && installation && gpt_warning) || show_all_popups ) { // popup text %2 is a disk name e.g. /dev/hda %1 is a number @@ -220,7 +221,7 @@ deletechars(_("Create New Partition Table"), "&"), deletechars(_("Expert"), "&"))); - if (ret == false) retval = `again; + if (ret == false) retval = false; } @@ -232,7 +233,7 @@ Assign the root mount point \"/\" to a partition. ")); - retval = `again; + retval = false; } @@ -245,7 +246,7 @@ Use a Linux file system, such as ext3 or reiserfs, for these mount points. ")); - retval = `again; + retval = false; } if( fat_system_boot || show_all_popups ) @@ -255,7 +256,7 @@ Use a Linux file system, such as ext2, ext3 or reiserfs, for this mount point. ")); - retval = `again; + retval = false; } if( (boot_found) && installation || show_all_popups ) @@ -273,7 +274,7 @@ Really use this setup? "),Partitions::BootCyl(),Product::name)); - if ( !ret ) retval = `again; + if ( !ret ) retval = false; } @@ -287,7 +288,7 @@ Really keep this size of boot partition? ")); - if (ret == false) retval = `again; + if (ret == false) retval = false; } } @@ -312,7 +313,7 @@ Really use the setup without /boot partition? ")); - if (ret == false) retval = `again; + if (ret == false) retval = false; } @@ -331,7 +332,7 @@ Really use this setup? "), Partitions::BootCyl(),Product::name)); - if (ret == false) retval = `again; + if (ret == false) retval = false; } } @@ -352,7 +353,7 @@ Really use this setup? "),Product::name)); - if (ret == false) retval = `again; + if (ret == false) retval = false; } // iSeries has no problems with this configuration @@ -374,7 +375,7 @@ Really use this setup? "),Product::name)); - if (ret == false) retval = `again; + if (ret == false) retval = false; } @@ -394,7 +395,7 @@ Really use this setup? "), Partitions::BootMount(),Product::name)); - if (ret == false) retval = `again; + if (ret == false) retval = false; } if( (root_dmraid && !boot_found) || show_all_popups ) @@ -412,7 +413,7 @@ Really use this setup? "), Partitions::BootMount(), Product::name)); - if (ret == false) retval = `again; + if (ret == false) retval = false; } if( ((Partitions::EfiBoot() || Arch::ia64()) && installation && boot_found && gpt_boot_ia64) || @@ -421,7 +422,7 @@ // popup text boolean ret = Popup::YesNo( ia64_gpt_text() + "\n\n" + _("Really use this setup ?") ); - if (ret == false) retval = `again; + if (ret == false) retval = false; } if ( (!swap_found && Stage::initial() && root_fs!=`nfs) || show_all_popups ) @@ -438,7 +439,7 @@ Really use the setup without swap partition? ")); - if (ret == false) retval = `again; + if (ret == false) retval = false; } @@ -471,10 +472,10 @@ boolean ret = Popup::YesNo( message); - if (ret == false) retval = `again; + if (ret == false) retval = false; } - return retval == `next; + return retval; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0