March 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r45194 - in /branches/SuSE-SLE-10-SP2-Branch/autoinstallation: VERSION package/autoyast2.changes
by ug＠svn.opensuse.org 04 Mar '08

04 Mar '08

Author: ug Date: Tue Mar 4 18:18:54 2008 New Revision: 45194 URL: http://svn.opensuse.org/viewcvs/yast?rev=45194&view=rev Log: 2.13.100 Modified: branches/SuSE-SLE-10-SP2-Branch/autoinstallation/VERSION branches/SuSE-SLE-10-SP2-Branch/autoinstallation/package/autoyast2.changes Modified: branches/SuSE-SLE-10-SP2-Branch/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/autoin… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/autoinstallation/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/autoinstallation/VERSION Tue Mar 4 18:18:54 2008 @@ -1 +1 @@ -2.13.99 +2.13.100 Modified: branches/SuSE-SLE-10-SP2-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/autoin… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/autoinstallation/package/autoyast2.changes Tue Mar 4 18:18:54 2008 @@ -2,6 +2,7 @@ Tue Mar 4 18:13:05 CET 2008 - ug(a)suse.de - <kernel> was not handled correctly (#366553) +- 2.13.100 ------------------------------------------------------------------- Tue Feb 26 12:33:13 CET 2008 - ug(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] r45193 - in /branches/SuSE-SLE-10-SP2-Branch/autoinstallation: package/autoyast2.changes src/modules/AutoinstSoftware.ycp
by ug＠svn.opensuse.org 04 Mar '08

04 Mar '08

Author: ug Date: Tue Mar 4 18:13:42 2008 New Revision: 45193 URL: http://svn.opensuse.org/viewcvs/yast?rev=45193&view=rev Log: <kernel> was not handled correctly (#366553) Modified: branches/SuSE-SLE-10-SP2-Branch/autoinstallation/package/autoyast2.changes branches/SuSE-SLE-10-SP2-Branch/autoinstallation/src/modules/AutoinstSoftware.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/autoin… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/autoinstallation/package/autoyast2.changes Tue Mar 4 18:13:42 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Mar 4 18:13:05 CET 2008 - ug(a)suse.de + +- <kernel> was not handled correctly (#366553) + +------------------------------------------------------------------- Tue Feb 26 12:33:13 CET 2008 - ug(a)suse.de - mountby option got lost when reusing partitions (#364793) Modified: branches/SuSE-SLE-10-SP2-Branch/autoinstallation/src/modules/AutoinstSoftware.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/autoin… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/autoinstallation/src/modules/AutoinstSoftware.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/autoinstallation/src/modules/AutoinstSoftware.ycp Tue Mar 4 18:13:42 2008 @@ -84,6 +84,7 @@ string notFound = ""; Packages::Init(true); Packages::InitializeAddOnProducts(); + kernel = settings["kernel"]:""; foreach( string pack, settings["packages"]:[], ``{ if( ! Pkg::IsAvailable(pack) && Stage::initial() ) { notFound = notFound + pack + "\n"; @@ -96,7 +97,6 @@ } PackageAI::toinstall = settings["packages"]:[]; - kernel = settings["kernel"]:""; post_packages = settings["post-packages"]:[]; PackageAI::toremove = settings["remove-packages"]:[]; @@ -449,6 +449,12 @@ list<string> computed_packages = Packages::ComputeSystemPackageList(); y2debug("Computed list of packages: %1", computed_packages); + foreach( string pack, computed_packages, ``{ + if( size(kernel) > 0 && pack != kernel && search(pack, "kernel-") == 0 ) { + y2milestone("taboo for kernel %1",pack); + PackageAI::toremove = add( PackageAI::toremove, pack ); + } + }); // // Now remove all packages listed in remove-packages -- 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] r45192 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQSelectionBox.cc
by sh-sh-sh＠svn.opensuse.org 04 Mar '08

04 Mar '08

Author: sh-sh-sh Date: Tue Mar 4 17:55:07 2008 New Revision: 45192 URL: http://svn.opensuse.org/viewcvs/yast?rev=45192&view=rev Log: - Fixed segfault if SelectionBox value is set to nil (bnc #363251) - Fixed segfault if user clicks in empty area of a SelectionBox Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQSelectionBox.cc Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=45192&r1=45… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Tue Mar 4 17:55:07 2008 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "16") -SET(VERSION_PATCH "31") +SET(VERSION_PATCH "32") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Tue Mar 4 17:55:07 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Mar 4 17:53:00 CET 2008 - sh(a)suse.de + +- Fixed segfault if SelectionBox value is set to nil (bnc #363251) +- Fixed segfault if user clicks in empty area of a SelectionBox +- V 2.16.32 + +------------------------------------------------------------------- Wed Feb 27 14:20:40 CET 2008 - sh(a)suse.de - Removed obsolete Unicode fonts (now in separate pkg gnu-unifonts) Modified: trunk/qt/src/YQSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQSelectionBox.cc?rev=451… ============================================================================== --- trunk/qt/src/YQSelectionBox.cc (original) +++ trunk/qt/src/YQSelectionBox.cc Tue Mar 4 17:55:07 2008 @@ -146,7 +146,7 @@ if ( item ) { #ifdef VERBOSE_SELECTION - yuiDebug() << this << ": Selecting item \"" << item->label() << "\"" << endl; + yuiDebug() << this << ": Selecting item \"" << item << "\"" << endl; #endif item->setSelected( true ); @@ -160,18 +160,22 @@ { YSelectionBox::deselectAllItems(); _qt_listWidget->clearSelection(); + _qt_listWidget->setCurrentRow( -1 ); if ( _qt_listWidget->currentRow() > -1 ) { // Some item is selected after all; the Qt documtation says this // happens if the QListBox is in single selection mode (which it is) - // and has the keyboard focus. + // and has the keyboard focus. setCurrentRow( -1 ) does the trick for + // now, but who knows how this might change in future Qt versions. // // Synchronize internal "selected" flags with what the QListBox // displays. This has a small performance penalty because it calls // YSelectionBox::deselectAllItems() again which again iterates over // all items. - selectItem( _qt_listWidget->row(_qt_listWidget->currentItem()) ); + + int index = _qt_listWidget->row( _qt_listWidget->currentItem() ); + selectItem( index ); } } @@ -264,8 +268,10 @@ void YQSelectionBox::slotSelectionChanged() { - QList<QListWidgetItem *> items = _qt_listWidget->selectedItems (); - selectItem( _qt_listWidget->row( items.first() ) ); + QList<QListWidgetItem *> items = _qt_listWidget->selectedItems(); + + if ( ! items.empty() ) + selectItem( _qt_listWidget->row( items.first() ) ); if ( notify() ) { -- 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] r45191 - in /trunk/ycp-ui-bindings/examples: Events.ycp SelectionBox3.ycp
by sh-sh-sh＠svn.opensuse.org 04 Mar '08

04 Mar '08

Author: sh-sh-sh Date: Tue Mar 4 17:46:05 2008 New Revision: 45191 URL: http://svn.opensuse.org/viewcvs/yast?rev=45191&view=rev Log: examples Modified: trunk/ycp-ui-bindings/examples/Events.ycp trunk/ycp-ui-bindings/examples/SelectionBox3.ycp Modified: trunk/ycp-ui-bindings/examples/Events.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/Events.… ============================================================================== --- trunk/ycp-ui-bindings/examples/Events.ycp (original) +++ trunk/ycp-ui-bindings/examples/Events.ycp Tue Mar 4 17:46:05 2008 @@ -10,7 +10,7 @@ { /** * Nicely (HTML-) format an event map. - + * * @param event The event map to format * @return html HTML code for the formatted event **/ @@ -249,6 +249,7 @@ } else if ( event["ID"]:nil == `cancel_order ) { + y2milestone( "Cancelling order" ); UI::ChangeWidget(`delivery_service, `Value, nil ); UI::ChangeWidget(`pizza, `Value, nil ); UI::ChangeWidget(`toppings, `CurrentItem, nil ); Modified: trunk/ycp-ui-bindings/examples/SelectionBox3.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/Selecti… ============================================================================== --- trunk/ycp-ui-bindings/examples/SelectionBox3.ycp (original) +++ trunk/ycp-ui-bindings/examples/SelectionBox3.ycp Tue Mar 4 17:46:05 2008 @@ -18,7 +18,8 @@ ] ), `HBox( `PushButton(`id(`todays_special), `opt(`hstretch), "&Today's special" ), - `PushButton(`id(`veggie), `opt(`hstretch), "&Veggie" ) + `PushButton(`id(`veggie), `opt(`hstretch), "&Veggie" ), + `PushButton(`id(`none), `opt(`hstretch), "&Nothing" ) ), `PushButton(`id(`ok), `opt(`default), "&OK") ) @@ -30,8 +31,9 @@ { id = UI::UserInput(); - if ( id == `todays_special ) UI::ChangeWidget( `id( `pizza ), `CurrentItem, `nap ); - else if ( id == `veggie ) UI::ChangeWidget( `id( `pizza ), `CurrentItem, `fun ); + if ( id == `todays_special ) UI::ChangeWidget( `pizza, `CurrentItem, `nap ); + else if ( id == `veggie ) UI::ChangeWidget( `pizza, `CurrentItem, `fun ); + else if ( id == `none ) UI::ChangeWidget( `pizza, `CurrentItem, nil ); } until ( id == `ok ); // Get the input from the selection box. -- 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] r45190 - /trunk/gtk/src/yzyppwrapper.cc
by rpmcruz＠svn.opensuse.org 04 Mar '08

04 Mar '08

Author: rpmcruz Date: Tue Mar 4 16:54:30 2008 New Revision: 45190 URL: http://svn.opensuse.org/viewcvs/yast?rev=45190&view=rev Log: Show release number. Modified: trunk/gtk/src/yzyppwrapper.cc Modified: trunk/gtk/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=4519… ============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Tue Mar 4 16:54:30 2008 @@ -678,7 +678,7 @@ static Ypp::Package::Version *constructVersion (ZyppObject object) { Ypp::Package::Version *version = new Ypp::Package::Version(); - version->number = object->edition().version(); + version->number = object->edition().asString(); version->number += " (" + object->arch().asString() + ")"; #ifdef OLD_ZYPP version->repo = ypp->impl->getRepository (object->repository().info().alias()); -- 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] r45189 - /trunk/gtk/src/yzyppwrapper.cc
by rpmcruz＠svn.opensuse.org 04 Mar '08

04 Mar '08

Author: rpmcruz Date: Tue Mar 4 16:38:08 2008 New Revision: 45189 URL: http://svn.opensuse.org/viewcvs/yast?rev=45189&view=rev Log: Extra space on version string. Modified: trunk/gtk/src/yzyppwrapper.cc Modified: trunk/gtk/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=4518… ============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Tue Mar 4 16:38:08 2008 @@ -679,7 +679,7 @@ { Ypp::Package::Version *version = new Ypp::Package::Version(); version->number = object->edition().version(); - version->number += " (" + object->arch().asString() + ")"; + version->number += " (" + object->arch().asString() + ")"; #ifdef OLD_ZYPP version->repo = ypp->impl->getRepository (object->repository().info().alias()); #else -- 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] r45188 - in /trunk/gtk: ChangeLog src/YGPackageSelector.cc
by rpmcruz＠svn.opensuse.org 04 Mar '08

04 Mar '08

Author: rpmcruz Date: Tue Mar 4 16:22:26 2008 New Revision: 45188 URL: http://svn.opensuse.org/viewcvs/yast?rev=45188&view=rev Log: * src/YGPackageSelector.cc (resolveProblems): zypp changed the semantics of the conflict details. They now need to be inlined to the string. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGPackageSelector.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=45188&r1=45187… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Tue Mar 4 16:22:26 2008 @@ -1,3 +1,8 @@ +2008-03-04 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGPackageSelector.cc (resolveProblems): zypp changed the semantics of + the conflict details. They now need to be inlined to the string. + 2008-02-27 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/yzyppwrapper.cc: got rid of depreacated warning. @@ -28,22 +33,6 @@ * src/YGBarGraph.cc & src/ygtkbargraph.c: honor bar graph segment's custom color. -2008-02-27 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> - - * src/yzyppwrapper.cc: got rid of depreacated warning. - - * src/YGPackageSelector.cc (DiskView): highlight near full disk on table. - - * src/ygtkwizard.c: help-background.png no longer shipped with 11.0. Disable - help dialog background. - - * src/YGIntField.cc (YSlider): don't draw values (that's what the side - int field is for). - - * src/YGLayout.cc: removed label alignment tweak for non-stretchable widgets. - - * src/YGUI.h/cc: sync with libyui changes: moved some methods from YUI to YApplication. - 2008-02-26 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc (DiskView): fixed #363473 and enabled as a Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev… ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Tue Mar 4 16:22:26 2008 @@ -2015,9 +2015,10 @@ // we can't use ordinary radio buttons, as gtk+ enforces that in a group // one must be selected... + #define DETAILS_PAD 25 enum ColumnAlias { SHOW_TOGGLE_COL, ACTIVE_TOGGLE_COL, TEXT_COL, WEIGHT_TEXT_COL, - APPLY_PTR_COL, TOOLTIP_TEXT_COL + TEXT_PAD_COL, APPLY_PTR_COL }; struct inner { @@ -2031,6 +2032,8 @@ gtk_tree_model_get_iter (model, &iter, path); gtk_tree_model_get (model, &iter, ACTIVE_TOGGLE_COL, &enabled, APPLY_PTR_COL, &apply, -1); + if (!apply) + return; // disable all the other radios on the group, setting current gtk_tree_model_get_iter (model, &iter, path); @@ -2040,13 +2043,12 @@ gtk_tree_store_set (store, &iter, ACTIVE_TOGGLE_COL, FALSE, -1); bool *apply; gtk_tree_model_get (model, &iter, APPLY_PTR_COL, &apply, -1); - *apply = false; + if (apply) *apply = false; } while (gtk_tree_model_iter_next (model, &iter)); } enabled = !enabled; - if (apply) - *apply = enabled; + *apply = enabled; gtk_tree_model_get_iter (model, &iter, path); gtk_tree_store_set (store, &iter, ACTIVE_TOGGLE_COL, enabled, -1); } @@ -2057,6 +2059,7 @@ solution_toggled (model, path); gtk_tree_path_free (path); } +#if 0 static gboolean query_tooltip_cb (GtkWidget *view, gint x, gint y, gboolean keyboard_mode, GtkTooltip *tooltip, gpointer data) { @@ -2078,33 +2081,37 @@ } return FALSE; } +#endif }; // model - GtkTreeStore *store = gtk_tree_store_new (6, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, - G_TYPE_STRING, G_TYPE_INT, G_TYPE_POINTER, G_TYPE_STRING); + GtkTreeStore *store = gtk_tree_store_new (8, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, + G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, G_TYPE_BOOLEAN, G_TYPE_UINT, G_TYPE_POINTER); for (std::list <Ypp::Problem *>::iterator it = problems.begin(); it != problems.end(); it++) { - string details = YGUtils::truncate ((*it)->details, 800); GtkTreeIter problem_iter; gtk_tree_store_append (store, &problem_iter, NULL); gtk_tree_store_set (store, &problem_iter, SHOW_TOGGLE_COL, FALSE, - TEXT_COL, (*it)->description.c_str(), - WEIGHT_TEXT_COL, PANGO_WEIGHT_BOLD, APPLY_PTR_COL, NULL, - TOOLTIP_TEXT_COL, details.c_str(), -1); + TEXT_COL, (*it)->description.c_str(), WEIGHT_TEXT_COL, PANGO_WEIGHT_BOLD, -1); + if (!(*it)->details.empty()) { + GtkTreeIter details_iter; + gtk_tree_store_append (store, &details_iter, &problem_iter); + gtk_tree_store_set (store, &details_iter, SHOW_TOGGLE_COL, FALSE, + TEXT_COL, (*it)->details.c_str(), TEXT_PAD_COL, DETAILS_PAD, -1); + } for (int i = 0; (*it)->getSolution (i); i++) { Ypp::Problem::Solution *solution = (*it)->getSolution (i); - string sol_details = YGUtils::truncate (solution->details, 800); GtkTreeIter solution_iter; - const gchar *tooltip_text = sol_details.c_str(); - if (sol_details.empty()) - tooltip_text = NULL; gtk_tree_store_append (store, &solution_iter, &problem_iter); gtk_tree_store_set (store, &solution_iter, SHOW_TOGGLE_COL, TRUE, ACTIVE_TOGGLE_COL, FALSE, TEXT_COL, solution->description.c_str(), - APPLY_PTR_COL, &solution->apply, - TOOLTIP_TEXT_COL, tooltip_text, -1); + APPLY_PTR_COL, &solution->apply, -1); + if (!solution->details.empty()) { + gtk_tree_store_append (store, &solution_iter, &problem_iter); + gtk_tree_store_set (store, &solution_iter, SHOW_TOGGLE_COL, FALSE, + TEXT_COL, solution->details.c_str(), TEXT_PAD_COL, DETAILS_PAD, -1); + } } } @@ -2138,12 +2145,10 @@ renderer = gtk_cell_renderer_text_new(); g_object_set (G_OBJECT (renderer), "wrap-width", 400, NULL); column = gtk_tree_view_column_new_with_attributes ("", renderer, - "text", TEXT_COL, "weight", WEIGHT_TEXT_COL, NULL); + "text", TEXT_COL, "weight", WEIGHT_TEXT_COL, "xpad", TEXT_PAD_COL, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (view), column); gtk_tree_view_expand_all (GTK_TREE_VIEW (view)); gtk_widget_set_has_tooltip (view, TRUE); - g_signal_connect (G_OBJECT (view), "query-tooltip", - G_CALLBACK (inner::query_tooltip_cb), store); GtkWidget *scroll = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), -- 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] r45187 - in /branches/tmp/aschnell/part-redesign/storage/src: include/ modules/
by aschnell＠svn.opensuse.org 04 Mar '08

04 Mar '08

Author: aschnell Date: Tue Mar 4 15:44:22 2008 New Revision: 45187 URL: http://svn.opensuse.org/viewcvs/yast?rev=45187&view=rev Log: - added loop and dm panels Added: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-loop.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-nfs.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/Partitions.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp Added: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm.ycp (added) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm.ycp Tue Mar 4 15:44:22 2008 @@ -0,0 +1,67 @@ +/** + * File: ep-dm.ycp + * Package: yast2-storage + * Summary: Expert Partitioner + * Authors: Arvin Schnell <aschnell(a)suse.de> + * + */ +{ + textdomain "storage"; + + + void CreateDmMainPanel(any user_data) + { + UI::ReplaceWidget(`tree_panel, + `VBox( + `HStretch(), + `Left(`Heading("Device Mapper (DM)")), + `VStretch() + ) + ); + + Wizard::RestoreHelp("Help about Device Mapper"); + } + + + void HandleDmMainPanel(any user_data, any widget) + { + } + + + void CreateDmPanel(any user_data) + { + string part_device = (string) user_data; + + map<string, map> target_map = Storage::GetTargetMap(); + + list<symbol> fields = StorageFields::Filter([ `mount_point, `size, `fs_type ]); + + UI::ReplaceWidget(`tree_panel, + `VBox( + `Left(`Heading("DM: " + part_device)), + `HStretch(), + StorageFields::Overview(fields, target_map, part_device), + `VStretch(), + `HBox( + `PushButton(`id(`edit), "Edit..."), + `HStretch() + ) + ) + ); + } + + + void HandleDmPanel(any user_data, any widget) + { + string part_device = (string) user_data; + + switch ((symbol) widget) + { + case `edit: + break; + + case `delete: + break; + } + } +} Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp Tue Mar 4 15:44:22 2008 @@ -13,7 +13,7 @@ include "partitioning/ep-hd-lib.ycp"; - void CreateHdPanel(any user_data) + void CreateHdMainPanel(any user_data) { UI::ReplaceWidget(`tree_panel, `VBox( @@ -29,7 +29,7 @@ } - void HandleHdPanel(any user_data, any widget) + void HandleHdMainPanel(any user_data, any widget) { if (widget == `rescan) { Added: branches/tmp/aschnell/part-redesign/storage/src/include/ep-loop.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-loop.ycp (added) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-loop.ycp Tue Mar 4 15:44:22 2008 @@ -0,0 +1,76 @@ +/** + * File: ep-loop.ycp + * Package: yast2-storage + * Summary: Expert Partitioner + * Authors: Arvin Schnell <aschnell(a)suse.de> + * + */ +{ + textdomain "storage"; + + + void CreateLoopMainPanel(any user_data) + { + UI::ReplaceWidget(`tree_panel, + `VBox( + `HStretch(), + `Left(`Heading("Crypt Files")), + `VBox( + `PushButton(`id(`create_loop), "Create Crypt File...") + ), + `VStretch() + ) + ); + + Wizard::RestoreHelp("Help about Crypt Files"); + } + + + void HandleLoopMainPanel(any user_data, any widget) + { + switch ((symbol) widget) + { + case `create_loop: + break; + } + } + + + void CreateLoopPanel(any user_data) + { + string part_device = (string) user_data; + + map<string, map> target_map = Storage::GetTargetMap(); + + list<symbol> fields = StorageFields::Filter([ `mount_point, `size, `fs_type, `file_path ]); + + UI::ReplaceWidget(`tree_panel, + `VBox( + `Left(`Heading("Crypt File: " + part_device)), + `HStretch(), + StorageFields::Overview(fields, target_map, part_device), + `VStretch(), + `HBox( + `PushButton(`id(`edit), "Edit..."), + `PushButton(`id(`delete), "Delete..."), + `HStretch() + ) + ) + ); + } + + + void HandleLoopPanel(any user_data, any widget) + { + string part_device = (string) user_data; + + switch ((symbol) widget) + { + case `edit: + break; + + case `delete: + break; + } + } +} Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp Tue Mar 4 15:44:22 2008 @@ -12,7 +12,7 @@ include "partitioning/ep-lvm-dialogs.ycp"; - void CreateLvmPanel(any user_data) + void CreateLvmMainPanel(any user_data) { UI::ReplaceWidget(`tree_panel, `VBox( @@ -30,7 +30,7 @@ } - void HandleLvmPanel(any user_data, any widget) + void HandleLvmMainPanel(any user_data, any widget) { if (widget == `create_vg) { Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp Tue Mar 4 15:44:22 2008 @@ -45,6 +45,8 @@ include "partitioning/ep-hd.ycp"; include "partitioning/ep-lvm.ycp"; include "partitioning/ep-raid.ycp"; + include "partitioning/ep-loop.ycp"; + include "partitioning/ep-dm.ycp"; include "partitioning/ep-nfs.ycp"; include "partitioning/ep-settings.ycp"; @@ -54,9 +56,11 @@ list<term> MakeNavigationTree() { data = $[ `all : $[ `create : CreateAllPanel, `handle : HandleAllPanel, `save : SaveAllPanel ], - `hd : $[ `create : CreateHdPanel, `handle : HandleHdPanel ], - `lvm : $[ `create : CreateLvmPanel, `handle : HandleLvmPanel ], + `hd : $[ `create : CreateHdMainPanel, `handle : HandleHdMainPanel ], + `lvm : $[ `create : CreateLvmMainPanel, `handle : HandleLvmMainPanel ], `md : $[ `create : CreateRaidMainPanel, `handle : HandleRaidMainPanel ], + `loop : $[ `create : CreateLoopMainPanel, `handle : HandleLoopMainPanel ], + `dm : $[ `create : CreateDmMainPanel, `handle : HandleDmMainPanel ], `nfs : $[ `create : CreateNfsMainPanel, `handle : HandleNfsMainPanel ], `settings : $[ `create : CreateSettingsPanel, `save : SaveSettingsPanel ] ]; @@ -104,13 +108,13 @@ huhu(disk, `md, $[ `create : CreateRaidPanel, `handle : HandleRaidPanel ], nil); } else if (type == `CT_LOOP) { - huhu(disk, `loop, $[], nil); + huhu(disk, `loop, $[ `create : CreateLoopPanel, `handle : HandleLoopPanel ], nil); } else if (type == `CT_DM) { - huhu(disk, `dm, $[], nil); + huhu(disk, `dm, $[ `create : CreateDmPanel, `handle : HandleDmPanel ], nil); } else if (type == `CT_NFS) { - huhu(disk, `nfs, $[ `create : CreateNfsOverviewPanel, `handle : HandleNfsOverviewPanel ], nil); + huhu(disk, `nfs, $[ `create : CreateNfsPanel, `handle : HandleNfsPanel ], nil); } } Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-nfs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-nfs.ycp Tue Mar 4 15:44:22 2008 @@ -36,7 +36,7 @@ } - void CreateNfsOverviewPanel(any user_data) + void CreateNfsPanel(any user_data) { string part_device = (string) user_data; @@ -60,7 +60,7 @@ } - void HandleNfsOverviewPanel(any user_data, any widget) + void HandleNfsPanel(any user_data, any widget) { string part_device = (string) user_data; Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/Partitions.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/Partitions.ycp Tue Mar 4 15:44:22 2008 @@ -756,57 +756,65 @@ /*--------------------------------------------------------------------- - * Convert <number-of-bytes> to XXX.X MB or XXX.X GB or XXX.X TB + * Convert <number-of-bytes> to XXX.X KB, XXX.X MB, XXX.X GB or XXX.X TB * - * see also ByteToHumanStringWithZero ! - * Return value: string "unknown" if input == 0 + * see also ByteToHumanString + * + * Return value: string "0.0 KB" if input == 0 *---------------------------------------------------------------------- * * TODO: also defined in partition_defines.ycp, remove one */ -global string ByteToHumanString(integer number) - ``{ - // column description, if disk space is not known - if( number == 0 ) return( _("unknown") ); - - if( number < 1073741824 ) - { +global string ByteToHumanStringWithZero(integer number) +{ + if( number < 1048576 ) + { + // < 1 MB + integer KB = number / 1024; + integer hunB = (number - (KB * 1024)) / 103; + return sformat("%1.%2 KB", KB, hunB); + } + else if( number < 1073741824 ) + { // < 1 GB integer MB = number / 1048576; integer hunKB = (number - (MB * 1048576)) / 104858; return sformat("%1.%2 MB", MB, hunKB); - } + } else if ( number < 1099511627776 ) - { + { // < 1 TB integer GB = number / 1073741824; integer hunMB = (number - (GB * 1073741824)) / 107374183; return sformat("%1.%2 GB", GB, hunMB); - } + } else - { - // >= 1 TB - integer TB = number / 1099511627776; - integer hunGB = (number - (TB * 1099511627776)) / 109951162778; + { + // >= 1 TB + integer TB = number / 1099511627776; + integer hunGB = (number - (TB * 1099511627776)) / 109951162778; return sformat("%1.%2 TB", TB, hunGB); - } - }; + } +}; /*--------------------------------------------------------------------- - * Convert <number-of-bytes> to XXX.X MB or XXX.X GB or XXX.X TB + * Convert <number-of-bytes> to XXX.X KB, XXX.X MB, XXX.X GB or XXX.X TB + * + * see also ByteToHumanStringWithZero * - * see also ByteToHumanString ! - * Return value: string "0" if input == 0 + * Return value: string "unknown" if input == 0 *---------------------------------------------------------------------- */ -global string ByteToHumanStringWithZero(integer number) +global string ByteToHumanString(integer number) { if (number == 0) - return sformat("%1.%2 MB", 0, 0); + { + // column description, if disk space is not known + return _("unknown"); + } - return ByteToHumanString(number); + return ByteToHumanStringWithZero(number); }; - } Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp Tue Mar 4 15:44:22 2008 @@ -436,7 +436,7 @@ { string value = ""; if (disk["type"]:`CT_UNKNOWN == `CT_LVM && part == nil) - value = sformat("%1", disk["pesize"]:0); // FIXME + value = Partitions::ByteToHumanString(disk["pesize"]:0); if (style == `table) return value; else @@ -453,7 +453,7 @@ if (stripes == 1) value = sformat("%1", stripes); else - value = sformat("%1 (%2)", stripes, stripesize); // FIXME + value = sformat("%1 (%2)", stripes, Partitions::ByteToHumanStringWithZero(stripesize*1024)); } if (style == `table) return value; @@ -500,6 +500,15 @@ return "End Cylinder: " + value + "\n"; } + case `file_path: + { + string value = data["fpath"]:""; + if (style == `table) + return value; + else + return "File Path: " + value + "\n"; + } + default: { y2error("unknown field %1", field); -- 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] r45186 - in /trunk/qt/src: YQSelectionBox.cc YQSelectionBox.h
by sh-sh-sh＠svn.opensuse.org 04 Mar '08

04 Mar '08

Author: sh-sh-sh Date: Tue Mar 4 14:33:33 2008 New Revision: 45186 URL: http://svn.opensuse.org/viewcvs/yast?rev=45186&view=rev Log: consistent naming + mandatory indentation style Modified: trunk/qt/src/YQSelectionBox.cc trunk/qt/src/YQSelectionBox.h Modified: trunk/qt/src/YQSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQSelectionBox.cc?rev=451… ============================================================================== --- trunk/qt/src/YQSelectionBox.cc (original) +++ trunk/qt/src/YQSelectionBox.cc Tue Mar 4 14:33:33 2008 @@ -60,21 +60,21 @@ YUI_CHECK_NEW( _caption ); layout->addWidget( _caption ); - _qt_listBox = new QListWidget( this ); - YUI_CHECK_NEW( _qt_listBox ); - layout->addWidget( _qt_listBox ); - - _qt_listBox->installEventFilter( this ); - //FIXME _qt_listBox->setVariableHeight( false ); - _qt_listBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, - QSizePolicy::Expanding ) ); - //FIXME _qt_listBox->setTopItem(0); - _caption->setBuddy( _qt_listBox ); + _qt_listWidget = new QListWidget( this ); + YUI_CHECK_NEW( _qt_listWidget ); + layout->addWidget( _qt_listWidget ); + + _qt_listWidget->installEventFilter( this ); + //FIXME _qt_listWidget->setVariableHeight( false ); + _qt_listWidget->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, + QSizePolicy::Expanding ) ); + //FIXME _qt_listWidget->setTopItem(0); + _caption->setBuddy( _qt_listWidget ); - connect( _qt_listBox, SIGNAL( itemSelectionChanged() ), + connect( _qt_listWidget, SIGNAL( itemSelectionChanged() ), this, SLOT ( slotSelectionChanged() ) ); - connect( _qt_listBox, SIGNAL( itemDoubleClicked( QListWidgetItem * ) ), + connect( _qt_listWidget, SIGNAL( itemDoubleClicked( QListWidgetItem * ) ), this, SLOT ( slotActivated( QListWidgetItem * ) ) ); connect( &_timer, SIGNAL( timeout() ), @@ -111,30 +111,30 @@ if ( icon.isNull() ) { - _qt_listBox->addItem( fromUTF8( item->label() ) ); + _qt_listWidget->addItem( fromUTF8( item->label() ) ); } else { - QListWidgetItem *i = new QListWidgetItem(_qt_listBox); - i->setData(Qt::DisplayRole, fromUTF8( item->label() ) ); - i->setData(Qt::DecorationRole, icon ); - _qt_listBox->addItem( i ); + QListWidgetItem *i = new QListWidgetItem( _qt_listWidget ); + i->setData(Qt::DisplayRole, fromUTF8( item->label() ) ); + i->setData(Qt::DecorationRole, icon ); + _qt_listWidget->addItem( i ); } if ( item->selected() ) { - YQSignalBlocker sigBlocker( _qt_listBox ); - _qt_listBox->setCurrentItem( _qt_listBox->item( item->index() ) ); + YQSignalBlocker sigBlocker( _qt_listWidget ); + _qt_listWidget->setCurrentItem( _qt_listWidget->item( item->index() ) ); } } void YQSelectionBox::selectItem( YItem * item, bool selected ) { - YQSignalBlocker sigBlocker( _qt_listBox ); + YQSignalBlocker sigBlocker( _qt_listWidget ); YSelectionBox::selectItem( item, selected ); - _qt_listBox->setCurrentRow( selected ? item->index() : -1 ); + _qt_listWidget->setCurrentRow( selected ? item->index() : -1 ); } @@ -159,9 +159,9 @@ void YQSelectionBox::deselectAllItems() { YSelectionBox::deselectAllItems(); - _qt_listBox->clearSelection(); + _qt_listWidget->clearSelection(); - if ( _qt_listBox->currentRow() > -1 ) + if ( _qt_listWidget->currentRow() > -1 ) { // Some item is selected after all; the Qt documtation says this // happens if the QListBox is in single selection mode (which it is) @@ -171,16 +171,16 @@ // displays. This has a small performance penalty because it calls // YSelectionBox::deselectAllItems() again which again iterates over // all items. - selectItem( _qt_listBox->row(_qt_listBox->currentItem()) ); + selectItem( _qt_listWidget->row(_qt_listWidget->currentItem()) ); } } void YQSelectionBox::deleteAllItems() { - YQSignalBlocker sigBlocker( _qt_listBox ); + YQSignalBlocker sigBlocker( _qt_listWidget ); - _qt_listBox->clear(); + _qt_listWidget->clear(); YSelectionBox::deleteAllItems(); } @@ -199,8 +199,8 @@ { int hintHeight = !_caption->isHidden() ? _caption->sizeHint().height() : 0; int visibleLines = shrinkable() ? SHRINKABLE_VISIBLE_LINES : DEFAULT_VISIBLE_LINES; - hintHeight += visibleLines * _qt_listBox->fontMetrics().lineSpacing(); - hintHeight += _qt_listBox->frameWidth() * 2; + hintHeight += visibleLines * _qt_listWidget->fontMetrics().lineSpacing(); + hintHeight += _qt_listWidget->frameWidth() * 2; return max( 80, hintHeight ); } @@ -215,15 +215,15 @@ void YQSelectionBox::setEnabled( bool enabled ) { _caption->setEnabled( enabled ); - _qt_listBox->setEnabled( enabled ); - //FIXME needed? _qt_listBox->triggerUpdate( true ); + _qt_listWidget->setEnabled( enabled ); + //FIXME needed? _qt_listWidget->triggerUpdate( true ); YWidget::setEnabled( enabled ); } bool YQSelectionBox::setKeyboardFocus() { - _qt_listBox->setFocus(); + _qt_listWidget->setFocus(); return true; } @@ -264,8 +264,8 @@ void YQSelectionBox::slotSelectionChanged() { - QList<QListWidgetItem *> items = _qt_listBox->selectedItems (); - selectItem( _qt_listBox->row( items.first() ) ); + QList<QListWidgetItem *> items = _qt_listWidget->selectedItems (); + selectItem( _qt_listWidget->row( items.first() ) ); if ( notify() ) { @@ -295,7 +295,7 @@ void YQSelectionBox::slotActivated( QListWidgetItem * qItem ) { - selectItem( _qt_listBox->row( qItem ) ); + selectItem( _qt_listWidget->row( qItem ) ); if ( notify() ) YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::Activated ) ); Modified: trunk/qt/src/YQSelectionBox.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQSelectionBox.h?rev=4518… ============================================================================== --- trunk/qt/src/YQSelectionBox.h (original) +++ trunk/qt/src/YQSelectionBox.h Tue Mar 4 14:33:33 2008 @@ -163,7 +163,7 @@ // YQWidgetCaption * _caption; - QListWidget * _qt_listBox; + QListWidget * _qt_listWidget; QTimer _timer; }; -- 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] r45185 - /trunk/libyui/package/yast2-libyui.changes
by sh-sh-sh＠svn.opensuse.org 04 Mar '08

04 Mar '08

Author: sh-sh-sh Date: Tue Mar 4 14:16:02 2008 New Revision: 45185 URL: http://svn.opensuse.org/viewcvs/yast?rev=45185&view=rev Log: change log Modified: trunk/libyui/package/yast2-libyui.changes Modified: trunk/libyui/package/yast2-libyui.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/package/yast2-libyui.chan… ============================================================================== --- trunk/libyui/package/yast2-libyui.changes (original) +++ trunk/libyui/package/yast2-libyui.changes Tue Mar 4 14:16:02 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Mar 4 13:48:08 CET 2008 - sh(a)suse.de + +- Conflict with yast2-core < 2.16.38 (before pkg split) + +------------------------------------------------------------------- Tue Feb 26 18:29:05 CET 2008 - sh(a)suse.de - Added cmake support for dependent packages -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0