October 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r52645 - in /trunk/storage: VERSION package/yast2-storage.changes storage/src/include/ep-hd-dialogs.ycp
by aschnell＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: aschnell Date: Tue Oct 28 20:22:45 2008 New Revision: 52645 URL: http://svn.opensuse.org/viewcvs/yast?rev=52645&view=rev Log: - allow creation of partitions by providing cylinder start and end (bnc #431583) Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-hd-dialogs.ycp Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=52645&r1=526… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Tue Oct 28 20:22:45 2008 @@ -1 +1 @@ -2.17.45 +2.17.46 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 Tue Oct 28 20:22:45 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Oct 28 20:14:59 CET 2008 - aschnell(a)suse.de + +- allow creation of partitions by providing cylinder start and + end (bnc #431583) +- 2.17.46 + +------------------------------------------------------------------- Mon Oct 27 11:54:55 CET 2008 - aschnell(a)suse.de - provide simple interface to activate multipath if yast2-multipath Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Tue Oct 28 20:22:45 2008 @@ -106,7 +106,7 @@ integer min_size_k = tointeger(float::ceil(cyl_size / 1024.0)); integer max_size_k = (slot[1]:0 * cyl_size) / 1024; - symbol what = (region == slot) ? `max_size : `manual_size; + symbol what = (region == slot) ? `max_size : `manual_region; term contents = `HVSquash( // frame heading @@ -126,9 +126,9 @@ `LeftRadioButtonWithAttachment(`id(`manual_region), `opt(`notify), _("Custom Region"), `VBox(`id(`manual_region_attachment), `MinWidth(10, `IntField(`id(`start_cyl), `opt(`shrinkable), - _("Start Cylinder"), 0, cyl_count, 42)), + _("Start Cylinder"), 0, cyl_count, region[0]:0)), `MinWidth(10, `IntField(`id(`num_cyls), `opt(`shrinkable), - _("Number of Cylinders"), 0, cyl_count, 42)) + _("Number of Cylinders"), 0, cyl_count, region[1]:0)) )) ) ) @@ -204,7 +204,7 @@ if (!valid) { // error popup - Popup::Error(_("The region is invalid.")); + Popup::Error(_("The region entered is invalid.")); widget = `again; } -- 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] r52644 - in /trunk/storage/storage/src/include: ep-hd-dialogs.ycp ep-hd-lib.ycp
by aschnell＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: aschnell Date: Tue Oct 28 20:11:06 2008 New Revision: 52644 URL: http://svn.opensuse.org/viewcvs/yast?rev=52644&view=rev Log: - proper limits for cylinder input fields Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp trunk/storage/storage/src/include/ep-hd-lib.ycp Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Tue Oct 28 20:11:06 2008 @@ -96,6 +96,7 @@ y2milestone("MiniWorkflowStepPartitionSize data:%1", data); integer cyl_size = data["cyl_size"]:0; + integer cyl_count = data["cyl_count"]:0; list< list<integer> > slots = data["slots", data["type"]:`unknown]:[]; list<integer> slot = slots[0]:[]; @@ -125,9 +126,9 @@ `LeftRadioButtonWithAttachment(`id(`manual_region), `opt(`notify), _("Custom Region"), `VBox(`id(`manual_region_attachment), `MinWidth(10, `IntField(`id(`start_cyl), `opt(`shrinkable), - _("Start Cylinder"), 0, 10000 /* TODO */, 42)), + _("Start Cylinder"), 0, cyl_count, 42)), `MinWidth(10, `IntField(`id(`num_cyls), `opt(`shrinkable), - _("Number of Cylinders"), 0, 10000 /* TODO */, 42)) + _("Number of Cylinders"), 0, cyl_count, 42)) )) ) ) Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-lib.ycp Tue Oct 28 20:11:06 2008 @@ -112,7 +112,7 @@ Storage::GetUnusedPartitionSlots(disk_device, slots); y2milestone("slots %1", slots); - // sort primary, extended and logical slots + // individual sort primary, extended and logical slots map<symbol, list> ret = $[]; list<map> tmp = []; @@ -180,6 +180,7 @@ "create" : true, "disk_device" : disk_device, "cyl_size" : disk["cyl_size"]:0, + "cyl_count" : disk["cyl_count"]:0, "slots" : slots ]; if (DlgCreatePartition(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] r52643 - /trunk/storage/libstorage/src/Partition.h
by aschnell＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: aschnell Date: Tue Oct 28 20:04:57 2008 New Revision: 52643 URL: http://svn.opensuse.org/viewcvs/yast?rev=52643&view=rev Log: - tiny simplification Modified: trunk/storage/libstorage/src/Partition.h Modified: trunk/storage/libstorage/src/Partition.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Partition… ============================================================================== --- trunk/storage/libstorage/src/Partition.h (original) +++ trunk/storage/libstorage/src/Partition.h Tue Oct 28 20:04:57 2008 @@ -31,7 +31,7 @@ unsigned long cylStart() const { return reg.start(); } unsigned long cylSize() const { return reg.len(); } - unsigned long cylEnd() const { return reg.start()+reg.len()-1; } + unsigned long cylEnd() const { return reg.end(); } const Region& region() const { return reg; } const std::list<string> udevId() const; const string& udevPath() const; -- 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] r52642 - in /trunk/gtk/src: Makefile.am icons/pkg-install-upgrade.png icons/pkg-upgrade.png ygtkzyppwrapper.cc
by rpmcruz＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: rpmcruz Date: Tue Oct 28 19:47:30 2008 New Revision: 52642 URL: http://svn.opensuse.org/viewcvs/yast?rev=52642&view=rev Log: Renamed install-upgrade to just upgrade. Added: trunk/gtk/src/icons/pkg-upgrade.png (with props) Removed: trunk/gtk/src/icons/pkg-install-upgrade.png Modified: trunk/gtk/src/Makefile.am trunk/gtk/src/ygtkzyppwrapper.cc Modified: trunk/gtk/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/Makefile.am?rev=52642&r1… ============================================================================== --- trunk/gtk/src/Makefile.am (original) +++ trunk/gtk/src/Makefile.am Tue Oct 28 19:47:30 2008 @@ -95,7 +95,7 @@ icons/pkg-remove.png \ icons/pkg-install.png \ icons/pkg-install-auto.png \ - icons/pkg-install-upgrade.png \ + icons/pkg-upgrade.png \ icons/pkg-installed-locked.png \ icons/pkg-unlocked.png \ icons/pkg-installed-upgradable-locked.png \ Added: trunk/gtk/src/icons/pkg-upgrade.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-upgrade.png?re… ============================================================================== Binary file - no diff available. Modified: trunk/gtk/src/ygtkzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkzyppwrapper.cc?rev=5… ============================================================================== --- trunk/gtk/src/ygtkzyppwrapper.cc (original) +++ trunk/gtk/src/ygtkzyppwrapper.cc Tue Oct 28 19:47:30 2008 @@ -40,8 +40,8 @@ available = loadPixbuf ("pkg-available.png"); available_locked = loadPixbuf ("pkg-available-locked.png"); to_install = loadPixbuf ("pkg-install.png"); + to_install_upgrade = loadPixbuf ("pkg-upgrade.png"); to_remove = loadPixbuf ("pkg-remove.png"); - to_install_upgrade = loadPixbuf ("pkg-install-upgrade.png"); to_auto_install = loadPixbuf ("pkg-install-auto.png"); to_auto_remove = loadPixbuf ("pkg-remove-auto.png"); } -- 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] r52641 - in /trunk/storage/storage/src: include/ep-hd-dialogs.ycp include/ep-main.ycp modules/Makefile.am modules/Region.ycp
by aschnell＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: aschnell Date: Tue Oct 28 19:45:18 2008 New Revision: 52641 URL: http://svn.opensuse.org/viewcvs/yast?rev=52641&view=rev Log: - validate manual region Added: trunk/storage/storage/src/modules/Region.ycp Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp trunk/storage/storage/src/include/ep-main.ycp trunk/storage/storage/src/modules/Makefile.am Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Tue Oct 28 19:45:18 2008 @@ -96,7 +96,7 @@ y2milestone("MiniWorkflowStepPartitionSize data:%1", data); integer cyl_size = data["cyl_size"]:0; - list slots = data["slots", data["type"]:`unknown]:[]; + list< list<integer> > slots = data["slots", data["type"]:`unknown]:[]; list<integer> slot = slots[0]:[]; list<integer> region = data["region"]:slot; @@ -193,17 +193,20 @@ case `manual_region: { - integer tmp1 = (integer) UI::QueryWidget(`id(`start_cyl), `Value); - integer tmp2 = (integer) UI::QueryWidget(`id(`num_cyls), `Value); + region = [ (integer) UI::QueryWidget(`id(`start_cyl), `Value), + (integer) UI::QueryWidget(`id(`num_cyls), `Value) ]; - if (false) // TODO + boolean valid = find(list<integer> slot, slots, { + return Region::Inside(slot, region); + }) != nil; + + if (!valid) { + // error popup Popup::Error(_("The region is invalid.")); widget = `again; } - region = [ tmp1, tmp2 ]; - break; } } Modified: trunk/storage/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-m… ============================================================================== --- trunk/storage/storage/src/include/ep-main.ycp (original) +++ trunk/storage/storage/src/include/ep-main.ycp Tue Oct 28 19:45:18 2008 @@ -26,6 +26,7 @@ import "DevicesSelectionBox"; import "Integer"; import "String"; + import "Region"; include "partitioning/lvm_ui_dialogs.ycp"; Modified: trunk/storage/storage/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Make… ============================================================================== --- trunk/storage/storage/src/modules/Makefile.am (original) +++ trunk/storage/storage/src/modules/Makefile.am Tue Oct 28 19:45:18 2008 @@ -21,7 +21,8 @@ MiniWorkflow.ycp \ Greasemonkey.ycp \ DevicesSelectionBox.ycp \ - DualMultiSelectionBox.ycp + DualMultiSelectionBox.ycp \ + Region.ycp EXTRA_DIST = $(module_DATA) Added: trunk/storage/storage/src/modules/Region.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Regi… ============================================================================== --- trunk/storage/storage/src/modules/Region.ycp (added) +++ trunk/storage/storage/src/modules/Region.ycp Tue Oct 28 19:45:18 2008 @@ -0,0 +1,39 @@ +/** + * File: Region.ycp + * Package: yast2-storage + * Summary: Expert Partitioner + * Authors: Arvin Schnell <aschnell(a)suse.de> + * + * A region is a list of two integers, the first being the start and the + * second the length. + */ +{ + module "Region"; + + + integer Start(list<integer> a) + { + return a[0]:0; + } + + + integer Length(list<integer> a) + { + return a[1]:0; + } + + + integer End(list<integer> a) + { + return a[0]:0 + a[1]:0 - 1; + } + + + /** + * Checks whether region b lies within region a. + */ + global boolean Inside(list<integer> a, list<integer> b) + { + return Start(b) >= Start(a) && End(b) <= End(a); + } +} -- 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] r52640 - in /trunk/gtk: ./ src/ src/icons/
by rpmcruz＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: rpmcruz Date: Tue Oct 28 19:36:49 2008 New Revision: 52640 URL: http://svn.opensuse.org/viewcvs/yast?rev=52640&view=rev Log: * src/Makefile.am, src/YGPackageSelector.cc & src/ygtkzyppwrapper.cc: install quality PNG icons, instead of embeding XPM ones. Added: trunk/gtk/src/hr.xpm trunk/gtk/src/icons/harddisk-full.png (with props) trunk/gtk/src/icons/harddisk.png (with props) trunk/gtk/src/icons/pkg-available-locked.png (with props) trunk/gtk/src/icons/pkg-available.png (with props) trunk/gtk/src/icons/pkg-install-auto.png (with props) trunk/gtk/src/icons/pkg-install-upgrade.png (with props) trunk/gtk/src/icons/pkg-install.png (with props) trunk/gtk/src/icons/pkg-installed-locked.png (with props) trunk/gtk/src/icons/pkg-installed-upgradable-locked.png (with props) trunk/gtk/src/icons/pkg-installed-upgradable.png (with props) trunk/gtk/src/icons/pkg-installed.png (with props) trunk/gtk/src/icons/pkg-locked.png (with props) trunk/gtk/src/icons/pkg-remove-auto.png (with props) trunk/gtk/src/icons/pkg-remove.png (with props) trunk/gtk/src/icons/pkg-unlocked.png (with props) Removed: trunk/gtk/src/icons/harddisk-full.xpm trunk/gtk/src/icons/harddisk.xpm trunk/gtk/src/icons/hr.xpm trunk/gtk/src/icons/pkg-available-locked.xpm trunk/gtk/src/icons/pkg-available.xpm trunk/gtk/src/icons/pkg-install-auto.xpm trunk/gtk/src/icons/pkg-install.xpm trunk/gtk/src/icons/pkg-installed-locked.xpm trunk/gtk/src/icons/pkg-installed-upgradable-locked.xpm trunk/gtk/src/icons/pkg-installed-upgradable.xpm trunk/gtk/src/icons/pkg-installed.xpm trunk/gtk/src/icons/pkg-locked.xpm trunk/gtk/src/icons/pkg-remove-auto.xpm trunk/gtk/src/icons/pkg-remove.xpm trunk/gtk/src/icons/pkg-unlocked.xpm Modified: trunk/gtk/ChangeLog trunk/gtk/src/Makefile.am trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/ygtkrichtext.c trunk/gtk/src/ygtkzyppwrapper.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=52640&r1=52639… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Tue Oct 28 19:36:49 2008 @@ -13,6 +13,9 @@ * src/YGPackageSelector.cc: honor enableRepoMgr flag. + * src/Makefile.am, src/YGPackageSelector.cc & src/ygtkzyppwrapper.cc: + install quality PNG icons, instead of embeding XPM ones. + 2008-10-26 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc (Categories): ensure Categories item Modified: trunk/gtk/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/Makefile.am?rev=52640&r1… ============================================================================== --- trunk/gtk/src/Makefile.am (original) +++ trunk/gtk/src/Makefile.am Tue Oct 28 19:36:49 2008 @@ -1,7 +1,10 @@ +DATADIR=/usr/share/YaST2/gtk/ + AM_CFLAGS = $(GTK_CFLAGS) \ -DY2LOG=\"ui-gtk\" \ -DTHEMEDIR=\"${themedir}/current\" \ - -DLOCALEDIR=\"${localedir}\" + -DLOCALEDIR=\"${localedir}\" \ + -DDATADIR=\"${DATADIR}\" AM_CXXFLAGS = $(AM_CFLAGS) noinst_HEADERS = $(wildcard *.h) @@ -69,7 +72,7 @@ yzyppwrapper.cc \ yzypptags.cc \ ygtkzyppwrapper.cc -# should only append ygtkrichtext.c if WITH_GTKHTML or WEBKIT isn't set +# should (maybe?) only append ygtkrichtext.c if WITH_GTKHTML or WEBKIT isn't set dummy_SOURCES = dummy.cc dummy_LDADD = libpy2gtk.la @@ -82,23 +85,26 @@ INCLUDES = -I$(srcdir)/include -I$(includedir) -I$(includedir)/yui $(ZYPP_CFLAGS) $(GTKHTML_CFLAGS) $(WEBKIT_CFLAGS) -EXTRA_DIST = \ - icons/pkg-available-locked.xpm \ - icons/pkg-installed-upgradable.xpm \ - icons/pkg-remove-auto.xpm \ - icons/pkg-available.xpm \ - icons/pkg-installed.xpm \ - icons/pkg-remove.xpm \ - icons/pkg-install-auto.xpm \ - icons/pkg-install.xpm \ +sharedir = $(DATADIR) +dist_share_DATA = \ + icons/pkg-available-locked.png \ + icons/pkg-installed-upgradable.png \ + icons/pkg-remove-auto.png \ + icons/pkg-available.png \ + icons/pkg-installed.png \ + icons/pkg-remove.png \ + icons/pkg-install.png \ + icons/pkg-install-auto.png \ + icons/pkg-install-upgrade.png \ + icons/pkg-installed-locked.png \ + icons/pkg-unlocked.png \ + icons/pkg-installed-upgradable-locked.png \ + icons/pkg-locked.png \ icons/pkg-tiles-mode.xpm \ - icons/pkg-installed-locked.xpm \ icons/pkg-list-mode.xpm \ - icons/pkg-unlocked.xpm \ - icons/pkg-installed-upgradable-locked.xpm \ - icons/pkg-locked.xpm \ - icons/harddisk.xpm \ - icons/harddisk-full.xpm \ - icons/hr.xpm \ - pkg-selector-help.h + icons/harddisk.png \ + icons/harddisk-full.png +EXTRA_DIST = $(dist_share_DATA) \ + pkg-selector-help.h \ + hr.xpm 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 Oct 28 19:36:49 2008 @@ -25,13 +25,10 @@ #include "ygtkzyppwrapper.h" // utilities -static GtkWidget *createImageFromXPM (const char **xpm) +static GtkWidget *image_new_from_file (const char *filename) { - GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data (xpm); - GtkWidget *image = gtk_image_new_from_pixbuf (pixbuf); - gtk_widget_show (image); - g_object_unref (pixbuf); - return image; + std::string file = std::string (DATADIR) + "/" + filename; + return gtk_image_new_from_file (file.c_str()); } static GdkPixbuf *loadThemeIcon (const char *icon, int size) @@ -236,11 +233,6 @@ _allModified : 2, _allLocked : 2, _allUnlocked : 2, _allCanLock : 2; }; -#include "icons/pkg-list-mode.xpm" -#include "icons/pkg-tiles-mode.xpm" -#include "icons/pkg-locked.xpm" -#include "icons/pkg-unlocked.xpm" - class PackagesView { public: @@ -330,23 +322,22 @@ struct inner { static void appendItem (GtkWidget *menu, const char *label, - const char *tooltip, const char *stock_icon, const char **xpm_icon, - bool sensitive, + const char *tooltip, const char *icon, bool sensitive, void (& callback) (GtkMenuItem *item, View *pThis), View *pThis) { GtkWidget *item; - if (stock_icon || xpm_icon) { + if (icon) { if (label) { item = gtk_image_menu_item_new_with_mnemonic (label); - GtkWidget *icon; - if (stock_icon) - icon = gtk_image_new_from_stock (stock_icon, GTK_ICON_SIZE_MENU); + GtkWidget *image; + if (*icon == 'g') + image = gtk_image_new_from_stock (icon, GTK_ICON_SIZE_MENU); else - icon = createImageFromXPM (xpm_icon); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), icon); + image = image_new_from_file (icon); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); } else - item = gtk_image_menu_item_new_from_stock (stock_icon, NULL); + item = gtk_image_menu_item_new_from_stock (icon, NULL); } else item = gtk_menu_item_new_with_mnemonic (label); @@ -392,28 +383,28 @@ bool empty = true, canLock = packages.canLock(), unlocked = packages.unlocked(); bool locked = !unlocked && canLock; if (packages.notInstalled()) - inner::appendItem (menu, _("_Install"), 0, GTK_STOCK_SAVE, 0, + inner::appendItem (menu, _("_Install"), 0, GTK_STOCK_SAVE, !locked, inner::install_cb, this), empty = false; if (packages.upgradable()) - inner::appendItem (menu, _("_Upgrade"), 0, GTK_STOCK_GOTO_TOP, 0, + inner::appendItem (menu, _("_Upgrade"), 0, GTK_STOCK_GOTO_TOP, !locked, inner::install_cb, this), empty = false; if (packages.installed()) - inner::appendItem (menu, _("_Remove"), 0, GTK_STOCK_DELETE, 0, + inner::appendItem (menu, _("_Remove"), 0, GTK_STOCK_DELETE, !locked, inner::remove_cb, this), empty = false; if (packages.modified()) - inner::appendItem (menu, _("_Undo"), 0, GTK_STOCK_UNDO, 0, + inner::appendItem (menu, _("_Undo"), 0, GTK_STOCK_UNDO, true, inner::undo_cb, this), empty = false; if (canLock) { if (packages.locked()) - inner::appendItem (menu, _("_Unlock"), _(lock_tooltip), 0, pkg_unlocked_xpm, - true, inner::unlock_cb, this), empty = false; + inner::appendItem (menu, _("_Unlock"), _(lock_tooltip), "pkg-unlocked.png", + true, inner::unlock_cb, this), empty = false; if (unlocked) - inner::appendItem (menu, _("_Lock"), _(lock_tooltip), 0, pkg_locked_xpm, - true, inner::lock_cb, this), empty = false; + inner::appendItem (menu, _("_Lock"), _(lock_tooltip), "pkg-locked.png", + true, inner::lock_cb, this), empty = false; } if (!empty) gtk_menu_shell_append (GTK_MENU_SHELL (menu), gtk_separator_menu_item_new()); - inner::appendItem (menu, 0, 0, GTK_STOCK_SELECT_ALL, 0, + inner::appendItem (menu, 0, 0, GTK_STOCK_SELECT_ALL, true, inner::select_all_cb, this); gtk_menu_attach_to_widget (GTK_MENU (menu), m_widget, NULL); @@ -647,9 +638,9 @@ if (!isTree) { GtkWidget *buttons = gtk_vbox_new (FALSE, 0), *button; - button = create_toggle_button (pkg_list_mode_xpm, _("View as list"), NULL); + button = create_toggle_button ("pkg-list-mode.xpm", _("View as list"), NULL); gtk_box_pack_start (GTK_BOX (buttons), button, FALSE, TRUE, 0); - button = create_toggle_button (pkg_tiles_mode_xpm, _("View as grid"), button); + button = create_toggle_button ("pkg-tiles-mode.xpm", _("View as grid"), button); gtk_box_pack_start (GTK_BOX (buttons), button, FALSE, TRUE, 0); gtk_widget_show_all (buttons); @@ -720,7 +711,7 @@ { m_view->unselectAll(); } private: - GtkWidget *create_toggle_button (const char **xpm, const char *tooltip, GtkWidget *member) + GtkWidget *create_toggle_button (const char *icon, const char *tooltip, GtkWidget *member) { GSList *group = NULL; if (member) @@ -741,7 +732,7 @@ g_signal_connect (G_OBJECT (button), "toggle-changed", G_CALLBACK (mode_toggled_cb), this); - GtkWidget *image = createImageFromXPM (xpm); + GtkWidget *image = image_new_from_file (icon); gtk_container_add (GTK_CONTAINER (button), image); return button; } @@ -793,7 +784,7 @@ action = _("install"); } else - action = _("Remove"); + action = _("remove"); text = action + " " + package->name(); if (package->isAuto()) { text = "\t" + text; @@ -920,10 +911,6 @@ } }; -#include "icons/pkg-installed.xpm" -#include "icons/pkg-installed-upgradable.xpm" -#include "icons/pkg-available.xpm" - class Collections { public: @@ -1399,14 +1386,14 @@ GtkWidget *button; GSList *group; - button = createButton (_("_Available"), pkg_available_xpm, NULL); + button = createButton (_("_Available"), "pkg-available.png", NULL); group = ygtk_toggle_button_get_group (YGTK_TOGGLE_BUTTON (button)); gtk_box_pack_start (GTK_BOX (m_box), button, TRUE, TRUE, 0); if (!updateMode) { - button = createButton (_("_Upgrades"), pkg_installed_upgradable_xpm, group); + button = createButton (_("_Upgrades"), "pkg-installed-upgradable.png", group); gtk_box_pack_start (GTK_BOX (m_box), button, TRUE, TRUE, 0); } - button = createButton (_("_Installed"), pkg_installed_xpm, group); + button = createButton (_("_Installed"), "pkg-installed.png", group); gtk_box_pack_start (GTK_BOX (m_box), button, TRUE, TRUE, 0); button = createButton (_("A_ll"), 0, group); gtk_box_pack_start (GTK_BOX (m_box), button, FALSE, TRUE, 0); @@ -1417,13 +1404,13 @@ return m_selected; } - GtkWidget *createButton (const char *label, const char **xpm, GSList *group) + GtkWidget *createButton (const char *label, const char *icon, GSList *group) { GtkWidget *button = ygtk_toggle_button_new (group); gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE); GtkWidget *hbox = gtk_hbox_new (FALSE, 0); - if (xpm) - gtk_box_pack_start (GTK_BOX (hbox), createImageFromXPM (xpm), FALSE, TRUE, 0); + if (icon) + gtk_box_pack_start (GTK_BOX (hbox), image_new_from_file (icon), FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new_with_mnemonic (label), TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (button), hbox); @@ -1764,8 +1751,8 @@ gtk_widget_set_tooltip_markup (m_lock_button, lock_tooltip); g_signal_connect (G_OBJECT (m_lock_button), "toggled", G_CALLBACK (locked_toggled_cb), this); - m_locked_image = createImageFromXPM (pkg_locked_xpm); - m_unlocked_image = createImageFromXPM (pkg_unlocked_xpm); + m_locked_image = image_new_from_file ("pkg-locked.png"); + m_unlocked_image = image_new_from_file ("pkg-unlocked.png"); g_object_ref_sink (G_OBJECT (m_locked_image)); g_object_ref_sink (G_OBJECT (m_unlocked_image)); @@ -2232,9 +2219,6 @@ } }; -#include "icons/harddisk.xpm" -#include "icons/harddisk-full.xpm" - class DiskView : public Ypp::Disk::Listener { GtkWidget *m_widget; @@ -2263,8 +2247,8 @@ m_widget = createMenuButton (m_model); g_object_unref (G_OBJECT (m_model)); - m_diskPixbuf = gdk_pixbuf_new_from_xpm_data (harddisk_xpm); - m_diskFullPixbuf = gdk_pixbuf_new_from_xpm_data (harddisk_full_xpm); + m_diskPixbuf = YGUtils::loadPixbuf (std::string (DATADIR) + "/harddisk.png"); + m_diskFullPixbuf = YGUtils::loadPixbuf (std::string (DATADIR) + "/harddisk-full.png"); Ypp::get()->getDisk()->setListener (this); update(); Added: trunk/gtk/src/hr.xpm URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/hr.xpm?rev=52640&view=au… ============================================================================== --- trunk/gtk/src/hr.xpm (added) +++ trunk/gtk/src/hr.xpm Tue Oct 28 19:36:49 2008 @@ -0,0 +1,173 @@ +/* XPM */ +static const char * hr_xpm[] = { +"200 1 169 2", +" c None", +". c #F0F8F0", +"+ c #EEF8EF", +"@ c #EEF7ED", +"# c #EDF6EC", +"$ c #EBF6EB", +"% c #E9F4E9", +"& c #E9F4E8", +"* c #E7F3E7", +"= c #E6F3E6", +"- c #E4F2E4", +"; c #E2F1E3", +"> c #E1F1E1", +", c #E0F0E0", +"' c #DFEFDF", +") c #DDEFDE", +"! c #DCEEDD", +"~ c #DBEEDB", +"{ c #DAEDDA", +"] c #D8EDD8", +"^ c #D7ECD7", +"/ c #D5EBD5", +"( c #D4EBD4", +"_ c #D3EAD3", +": c #D2EAD2", +"< c #D0E9D0", +"[ c #CFE8CF", +"} c #CEE8CE", +"| c #CCE7CC", +"1 c #CBE6CB", +"2 c #CAE5CA", +"3 c #C9E5C9", +"4 c #C7E4C7", +"5 c #C6E4C6", +"6 c #C4E3C4", +"7 c #C3E2C3", +"8 c #C2E2C2", +"9 c #C1E1C0", +"0 c #BFE1C0", +"a c #BEE0BE", +"b c #BDE0BC", +"c c #BBDFBB", +"d c #BADEBA", +"e c #B8DEB8", +"f c #B7DDB7", +"g c #B6DCB6", +"h c #B5DBB5", +"i c #B3DBB3", +"j c #B2DAB2", +"k c #B1DAB1", +"l c #AFD9AF", +"m c #AED8AE", +"n c #ADD8AD", +"o c #ABD7AC", +"p c #AAD6AA", +"q c #A8D6A9", +"r c #A7D5A7", +"s c #A6D5A6", +"t c #A4D4A4", +"u c #A3D3A3", +"v c #A2D3A2", +"w c #A0D2A0", +"x c #A0D1A0", +"y c #9ED19E", +"z c #9CD19D", +"A c #9BCF9B", +"B c #9ACF9A", +"C c #99CF99", +"D c #98CE97", +"E c #96CD97", +"F c #95CC94", +"G c #94CC94", +"H c #92CB92", +"I c #91CA91", +"J c #90CA8F", +"K c #8EC98E", +"L c #8DC88D", +"M c #8BC88C", +"N c #8AC88B", +"O c #89C689", +"P c #87C788", +"Q c #86C586", +"R c #85C585", +"S c #84C484", +"T c #82C483", +"U c #81C380", +"V c #7FC37F", +"W c #7EC27E", +"X c #7DC17D", +"Y c #7BC17C", +"Z c #7ABF7B", +"` c #79BF79", +" . c #78BF78", +".. c #76BE76", +"+. c #75BE75", +"@. c #74BD73", +"#. c #73BC72", +"$. c #71BB71", +"%. c #70BA70", +"&. c #6FBA6E", +"*. c #6EBA6E", +"=. c #EFF7EF", +"-. c #EEF7EE", +";. c #ECF6EC", +">. c #EAF5EA", +",. c #E9F5E9", +"'. c #E8F4E8", +"). c #E4F3E4", +"!. c #E3F1E3", +"~. c #E2F1E2", +"{. c #DFF0DF", +"]. c #DEEFDD", +"^. c #DCEFDC", +"/. c #DAEED9", +"(. c #D8ECD8", +"_. c #D7ECD6", +":. c #D6ECD6", +"<. c #D4EAD4", +"[. c #D2EAD1", +"}. c #D1E9D1", +"|. c #CDE7CD", +"1. c #CBE7CB", +"2. c #CAE6CA", +"3. c #C8E5C9", +"4. c #C7E5C7", +"5. c #C6E4C5", +"6. c #C5E3C4", +"7. c #C0E1C1", +"8. c #BFE1BF", +"9. c #BDE0BE", +"0. c #BDDFBC", +"a. c #BCDEBB", +"b. c #B4DBB5", +"c. c #B2DAB1", +"d. c #B0DAB0", +"e. c #B0D9B0", +"f. c #AED9AE", +"g. c #ACD8AC", +"h. c #ACD8AB", +"i. c #AAD6A9", +"j. c #A7D6A8", +"k. c #A6D4A6", +"l. c #A5D4A5", +"m. c #A3D3A4", +"n. c #A1D2A1", +"o. c #9FD29F", +"p. c #9CD09C", +"q. c #9BD09C", +"r. c #98CE99", +"s. c #97CE98", +"t. c #96CD96", +"u. c #95CD95", +"v. c #93CC93", +"w. c #8FCA8F", +"x. c #8DC88C", +"y. c #8CC88B", +"z. c #8AC78A", +"A. c #88C687", +"B. c #86C587", +"C. c #84C585", +"D. c #82C382", +"E. c #80C381", +"F. c #80C280", +"G. c #7EC27F", +"H. c #7CC07B", +"I. c #7AC07B", +"J. c #75BD75", +"K. c #74BD74", +"L. c #6EBB6E", +". =.-.;.>.,.'.* = ).!.~., {.].^.~ /.(._.:.<._ [.}.[ |.| 1.2.3.4.5.6.7 8 7.8.9.0.a.d e f g b.i c.d.e.f.g.h.i.q j.k.l.m.v n.o.y p.q.B r.s.t.u.v.H I w.K x.y.z.O A.B.C.S D.E.F.G.X H.I.` ...J.K.#.$.%.L.*.*.L.%.$.#.K.J... .` I.H.X G.F.E.D.S C.B.A.O z.y.x.K w.I H v.u.t.s.r.B q.p.y o.n.v m.l.k.j.q i.h.g.f.e.d.c.i b.g f e d a.0.9.8.7.8 7 6.5.4.3.2.1.| |.[ }.[._ <.:._.(./.~ ^.].{., ~.!.).= * '.,.>.;.-.=.. "}; Added: trunk/gtk/src/icons/harddisk-full.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/harddisk-full.png?… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/harddisk.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/harddisk.png?rev=5… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/pkg-available-locked.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-available-lock… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/pkg-available.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-available.png?… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/pkg-install-auto.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-install-auto.p… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/pkg-install-upgrade.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-install-upgrad… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/pkg-install.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-install.png?re… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/pkg-installed-locked.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-installed-lock… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/pkg-installed-upgradable-locked.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-installed-upgr… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/pkg-installed-upgradable.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-installed-upgr… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/pkg-installed.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-installed.png?… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/pkg-locked.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-locked.png?rev… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/pkg-remove-auto.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-remove-auto.pn… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/pkg-remove.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-remove.png?rev… ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/pkg-unlocked.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/pkg-unlocked.png?r… ============================================================================== Binary file - no diff available. Modified: trunk/gtk/src/ygtkrichtext.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkrichtext.c?rev=52640… ============================================================================== --- trunk/gtk/src/ygtkrichtext.c (original) +++ trunk/gtk/src/ygtkrichtext.c Tue Oct 28 19:36:49 2008 @@ -684,7 +684,7 @@ state->htags = g_list_append (state->htags, tag); } -#include "icons/hr.xpm" +#include "hr.xpm" static void rt_end_element (GMarkupParseContext *context, Modified: trunk/gtk/src/ygtkzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkzyppwrapper.cc?rev=5… ============================================================================== --- trunk/gtk/src/ygtkzyppwrapper.cc (original) +++ trunk/gtk/src/ygtkzyppwrapper.cc Tue Oct 28 19:36:49 2008 @@ -9,16 +9,8 @@ #include "ygtkzyppwrapper.h" #include "YGUtils.h" -#include "icons/pkg-installed.xpm" -#include "icons/pkg-installed-upgradable.xpm" -#include "icons/pkg-installed-upgradable-locked.xpm" -#include "icons/pkg-installed-locked.xpm" -#include "icons/pkg-available.xpm" -#include "icons/pkg-available-locked.xpm" -#include "icons/pkg-install.xpm" -#include "icons/pkg-remove.xpm" -#include "icons/pkg-install-auto.xpm" -#include "icons/pkg-remove-auto.xpm" +static GdkPixbuf *loadPixbuf (const char *icon) +{ return YGUtils::loadPixbuf (std::string (DATADIR) + "/" + icon); } // bridge as we don't want to mix c++ class polymorphism and gobject static void ygtk_zypp_model_entry_changed (YGtkZyppModel *model, Ypp::Pool::Iter iter); @@ -38,20 +30,20 @@ struct PackageIcons { GdkPixbuf *installed, *installed_upgradable, *installed_locked, *installed_upgradable_locked, *available, *available_locked, - *to_install, *to_remove, *to_auto_install, *to_auto_remove; + *to_install, *to_install_upgrade, *to_remove, *to_auto_install, + *to_auto_remove; PackageIcons() { - installed = gdk_pixbuf_new_from_xpm_data (pkg_installed_xpm); - installed_upgradable = - gdk_pixbuf_new_from_xpm_data (pkg_installed_upgradable_xpm); - installed_locked = gdk_pixbuf_new_from_xpm_data (pkg_installed_locked_xpm); - installed_upgradable_locked = - gdk_pixbuf_new_from_xpm_data (pkg_installed_upgradable_locked_xpm); - available = gdk_pixbuf_new_from_xpm_data (pkg_available_xpm); - available_locked = gdk_pixbuf_new_from_xpm_data (pkg_available_locked_xpm); - to_install = gdk_pixbuf_new_from_xpm_data (pkg_install_xpm); - to_remove = gdk_pixbuf_new_from_xpm_data (pkg_remove_xpm); - to_auto_install = gdk_pixbuf_new_from_xpm_data (pkg_install_auto_xpm); - to_auto_remove = gdk_pixbuf_new_from_xpm_data (pkg_remove_auto_xpm); + installed = loadPixbuf ("pkg-installed.png"); + installed_upgradable = loadPixbuf ("pkg-installed-upgradable.png"); + installed_locked = loadPixbuf ("pkg-installed-locked.png"); + installed_upgradable_locked = loadPixbuf ("pkg-installed-upgradable-locked.png"); + available = loadPixbuf ("pkg-available.png"); + available_locked = loadPixbuf ("pkg-available-locked.png"); + to_install = loadPixbuf ("pkg-install.png"); + to_remove = loadPixbuf ("pkg-remove.png"); + to_install_upgrade = loadPixbuf ("pkg-install-upgrade.png"); + to_auto_install = loadPixbuf ("pkg-install-auto.png"); + to_auto_remove = loadPixbuf ("pkg-remove-auto.png"); } ~PackageIcons() { g_object_unref (G_OBJECT (installed)); @@ -62,6 +54,7 @@ g_object_unref (G_OBJECT (available_locked)); g_object_unref (G_OBJECT (to_install)); g_object_unref (G_OBJECT (to_remove)); + g_object_unref (G_OBJECT (to_install_upgrade)); g_object_unref (G_OBJECT (to_auto_install)); g_object_unref (G_OBJECT (to_auto_remove)); } @@ -269,8 +262,11 @@ if (package->toInstall()) { if (auto_) pixbuf = icons->to_auto_install; - else + else { pixbuf = icons->to_install; + if (package->isInstalled()) + pixbuf = icons->to_install_upgrade; + } } else if (package->toRemove()) { if (auto_) @@ -296,7 +292,8 @@ else pixbuf = icons->available; } - g_value_set_object (value, (GObject *) pixbuf); + if (pixbuf) // otherwise it would crash (give it broken icon?) + g_value_set_object (value, (GObject *) pixbuf); break; } case YGtkZyppModel::NAME_COLUMN: -- 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] r52639 - /trunk/storage/libstorage/src/Dm.cc
by aschnell＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: aschnell Date: Tue Oct 28 18:42:36 2008 New Revision: 52639 URL: http://svn.opensuse.org/viewcvs/yast?rev=52639&view=rev Log: - fixed debug message Modified: trunk/storage/libstorage/src/Dm.cc Modified: trunk/storage/libstorage/src/Dm.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dm.cc?rev… ============================================================================== --- trunk/storage/libstorage/src/Dm.cc (original) +++ trunk/storage/libstorage/src/Dm.cc Tue Oct 28 18:42:36 2008 @@ -38,10 +38,12 @@ getTableInfo(); } + Dm::~Dm() - { - y2debug( "destructed dem dev %s", dev.c_str() ); - } +{ + y2deb("destructed dm dev " << dev); +} + unsigned Dm::dmMajor() { -- 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] r52638 - in /trunk/storage/storage/src/include: ep-hd-dialogs.ycp ep-hd-lib.ycp
by aschnell＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: aschnell Date: Tue Oct 28 18:07:44 2008 New Revision: 52638 URL: http://svn.opensuse.org/viewcvs/yast?rev=52638&view=rev Log: - work on bug #431583 Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp trunk/storage/storage/src/include/ep-hd-lib.ycp Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Tue Oct 28 18:07:44 2008 @@ -96,7 +96,8 @@ y2milestone("MiniWorkflowStepPartitionSize data:%1", data); integer cyl_size = data["cyl_size"]:0; - list<integer> slot = data["slots", data["type"]:`unknown]:[]; + list slots = data["slots", data["type"]:`unknown]:[]; + list<integer> slot = slots[0]:[]; list<integer> region = data["region"]:slot; integer size_k = (region[1]:0 * cyl_size) / 1024; @@ -124,9 +125,9 @@ `LeftRadioButtonWithAttachment(`id(`manual_region), `opt(`notify), _("Custom Region"), `VBox(`id(`manual_region_attachment), `MinWidth(10, `IntField(`id(`start_cyl), `opt(`shrinkable), - _("Start Cylinder"), 0, 1000 /* TODO */, 42)), - `MinWidth(10, `IntField(`id(`end_cyl), `opt(`shrinkable), - _("End Cylinder"), 0, 1000 /* TODO */, 42)) + _("Start Cylinder"), 0, 10000 /* TODO */, 42)), + `MinWidth(10, `IntField(`id(`num_cyls), `opt(`shrinkable), + _("Number of Cylinders"), 0, 10000 /* TODO */, 42)) )) ) ) @@ -149,7 +150,7 @@ switch (widget) { case `max_size: - UI::ChangeWidget(`id(`manual_size_attachment), `Enabled, false); + UI::ChangeWidget(`id(`manual_size_attachment), `Enabled, false); UI::ChangeWidget(`id(`manual_region_attachment), `Enabled, false); break; @@ -166,24 +167,44 @@ case `next: what = (symbol) UI::QueryWidget(`id(`size), `Value); - if (what == `manual_size) + switch (what) { - string tmp = (string) UI::QueryWidget(`id(`size_input), `Value); - if (!Storage::HumanStringToKByte(tmp, size_k)) + case `manual_size: { - // error popup, %1 and %2 are replaced by sizes - Popup::Error(sformat(_("The size entered is invalid. Enter a value like \"%1\" or \"%2\"."), - Storage::KByteToHumanString(500*1024), - Storage::KByteToHumanString(1024*1024))); - widget = `again; + string tmp = (string) UI::QueryWidget(`id(`size_input), `Value); + if (!Storage::HumanStringToKByte(tmp, size_k)) + { + // error popup, %1 and %2 are replaced by sizes + Popup::Error(sformat(_("The size entered is invalid. Enter a value like \"%1\" or \"%2\"."), + Storage::KByteToHumanString(500*1024), + Storage::KByteToHumanString(1024*1024))); + widget = `again; + } + else if (size_k < min_size_k || size_k > max_size_k) + { + // error popup, %1 and %2 are replaced by sizes + Popup::Error(sformat(_("The size entered is invalid. Enter a size between %1 and %2."), + Storage::KByteToHumanString(min_size_k), + Storage::KByteToHumanString(max_size_k))); + widget = `again; + } + break; } - else if (size_k < min_size_k || size_k > max_size_k) + + case `manual_region: { - // error popup, %1 and %2 are replaced by sizes - Popup::Error(sformat(_("The size entered is invalid. Enter a size between %1 and %2."), - Storage::KByteToHumanString(min_size_k), - Storage::KByteToHumanString(max_size_k))); - widget = `again; + integer tmp1 = (integer) UI::QueryWidget(`id(`start_cyl), `Value); + integer tmp2 = (integer) UI::QueryWidget(`id(`num_cyls), `Value); + + if (false) // TODO + { + Popup::Error(_("The region is invalid.")); + widget = `again; + } + + region = [ tmp1, tmp2 ]; + + break; } } @@ -208,6 +229,12 @@ data["region"] = [ slot[0]:0, num_cyl ]; break; } + + case `manual_region: + { + data["region"] = region; + break; + } } if (data["type"]:`unknown == `extended) Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-lib.ycp Tue Oct 28 18:07:44 2008 @@ -106,31 +106,31 @@ } - map GetPossibleSlots(map disk, string disk_device) + map<symbol, list> GetPossibleSlots(map disk, string disk_device) { list<map> slots = []; Storage::GetUnusedPartitionSlots(disk_device, slots); y2milestone("slots %1", slots); - // find biggest primary, extended and logical slot + // sort primary, extended and logical slots - map ret = $[]; + map<symbol, list> ret = $[]; list<map> tmp = []; tmp = filter(map slot, slots, { return slot["primary_possible"]:false; }); tmp = sort(map a, map b, tmp, { return a["region", 1]:0 > b["region", 1]:0; }); if (size(tmp) > 0) - ret[`primary] = tmp[0, "region"]:[]; + ret[`primary] = maplist(map slot, tmp, { return slot["region"]:[]; }); tmp = filter(map slot, slots, { return slot["extended_possible"]:false; }); tmp = sort(map a, map b, tmp, { return a["region", 1]:0 > b["region", 1]:0; }); if (size(tmp) > 0) - ret[`extended] = tmp[0, "region"]:[]; + ret[`extended] = maplist(map slot, tmp, { return slot["region"]:[]; }); tmp = filter(map slot, slots, { return slot["logical_possible"]:false; }); tmp = sort(map a, map b, tmp, { return a["region", 1]:0 > b["region", 1]:0; }); if (size(tmp) > 0) - ret[`logical] = tmp[0, "region"]:[]; + ret[`logical] = maplist(map slot, tmp, { return slot["region"]:[]; }); if (size(ret) == 0) { -- 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] r52637 - /trunk/autoinstallation/src/clients/inst_autoconfigure.ycp
by ug＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: ug Date: Tue Oct 28 17:29:45 2008 New Revision: 52637 URL: http://svn.opensuse.org/viewcvs/yast?rev=52637&view=rev Log: fix Modified: trunk/autoinstallation/src/clients/inst_autoconfigure.ycp Modified: trunk/autoinstallation/src/clients/inst_autoconfigure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/ins… ============================================================================== --- trunk/autoinstallation/src/clients/inst_autoconfigure.ycp (original) +++ trunk/autoinstallation/src/clients/inst_autoconfigure.ycp Tue Oct 28 17:29:45 2008 @@ -65,8 +65,9 @@ } if( haskey( process, "script" ) ) { string debug = ( process["script","debug"]:true ? "-x" : "" ); - string scriptName = sformat("%1-%2.log", stage,resource); + string scriptName = sformat("%1-%2", stage,resource); string scriptPath = sformat("%1/%2", AutoinstConfig::scripts_dir, scriptName); + SCR::Write(.target.string, scriptPath, process["script","source"]:"echo Empty script!"); string executionString = sformat("/bin/sh %1 %2 2&> %3/%4.log ", debug, scriptPath, AutoinstConfig::logs_dir, scriptName ); SCR::Execute (.target.bash, executionString); } -- 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] r52636 - /trunk/gtk/src/yzypptags.cc
by rpmcruz＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: rpmcruz Date: Tue Oct 28 17:21:31 2008 New Revision: 52636 URL: http://svn.opensuse.org/viewcvs/yast?rev=52636&view=rev Log: Modified a couple of icons. Modified: trunk/gtk/src/yzypptags.cc Modified: trunk/gtk/src/yzypptags.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzypptags.cc?rev=52636&r… ============================================================================== --- trunk/gtk/src/yzypptags.cc (original) +++ trunk/gtk/src/yzypptags.cc Tue Oct 28 17:21:31 2008 @@ -60,6 +60,7 @@ const char * zypp_tag_enum_to_icon (YPkgGroupEnum group) { + // NOTE: some icons are customized (bug 404818) switch (group) { case PK_GROUP_ENUM_ACCESSIBILITY: return( "package_main" ); @@ -68,15 +69,15 @@ case PK_GROUP_ENUM_GAMES: return( "package_games" ); case PK_GROUP_ENUM_GRAPHICS: return( "package_graphics" ); case PK_GROUP_ENUM_INTERNET: return( "package_network" ); - case PK_GROUP_ENUM_OFFICE: return( "package_office_addressbook" ); + case PK_GROUP_ENUM_OFFICE: return( "applications-office" ); case PK_GROUP_ENUM_OTHER: return( "package_main" ); case PK_GROUP_ENUM_PROGRAMMING: return( "package_development" ); case PK_GROUP_ENUM_MULTIMEDIA: return( "package_multimedia" ); - case PK_GROUP_ENUM_SYSTEM: return( "yast-system" ); + case PK_GROUP_ENUM_SYSTEM: return( "applications-system" ); case PK_GROUP_ENUM_DESKTOP_GNOME: return( "pattern-gnome" ); case PK_GROUP_ENUM_DESKTOP_KDE: return( "pattern-kde" ); - case PK_GROUP_ENUM_DESKTOP_XFCE: return( "package_utility_desktop" ); - case PK_GROUP_ENUM_DESKTOP_OTHER: return( "package_utility_desktop" ); + case PK_GROUP_ENUM_DESKTOP_XFCE: return( "pattern-xfce" ); + case PK_GROUP_ENUM_DESKTOP_OTHER: return( "user-desktop" ); case PK_GROUP_ENUM_PUBLISHING: return( "package_main" ); case PK_GROUP_ENUM_SERVERS: return( "package_editors" ); case PK_GROUP_ENUM_FONTS: return( "package_main" ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0