October 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41412 - /trunk/ca-management/src/YaPI/CaManagement.pm
by mcalmer＠svn.opensuse.org 12 Oct '07

12 Oct '07

Author: mcalmer Date: Fri Oct 12 17:56:09 2007 New Revision: 41412 URL: http://svn.opensuse.org/viewcvs/yast?rev=41412&view=rev Log: fix error message Modified: trunk/ca-management/src/YaPI/CaManagement.pm Modified: trunk/ca-management/src/YaPI/CaManagement.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/YaPI/CaManagem… ============================================================================== --- trunk/ca-management/src/YaPI/CaManagement.pm (original) +++ trunk/ca-management/src/YaPI/CaManagement.pm Fri Oct 12 17:56:09 2007 @@ -2296,7 +2296,7 @@ }; if($@) { - return $self->SetError( summary => __("Creating request failed."), + return $self->SetError( summary => __("Signing Certificate failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); } -- 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] r41411 - in /trunk/gtk: ./ tests/
by rpmcruz＠svn.opensuse.org 12 Oct '07

12 Oct '07

Author: rpmcruz Date: Fri Oct 12 17:20:06 2007 New Revision: 41411 URL: http://svn.opensuse.org/viewcvs/yast?rev=41411&view=rev Log: Forgot to commit the test images. Added: trunk/gtk/tests/movie1.mng (with props) trunk/gtk/tests/movie2.mng (with props) trunk/gtk/tests/movie3.mng (with props) trunk/gtk/tests/movie4.mng (with props) trunk/gtk/tests/movie5.mng (with props) trunk/gtk/tests/movie6.mng (with props) trunk/gtk/tests/movie7.mng (with props) trunk/gtk/tests/movie8.mng (with props) Removed: trunk/gtk/tests/movie-endless.mng trunk/gtk/tests/movie-loop3.mng Modified: trunk/gtk/ChangeLog Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=41411&r1=41410… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Fri Oct 12 17:20:06 2007 @@ -1,7 +1,7 @@ 2007-10-12 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/ygdkmngloader.h/c / src/YGImage.cc: added support for inline MNG - images. + images. Fixed ticks per second. * tests/YGImage.ycp: added a bunch of MNGs I found... 2007-10-11 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> Added: trunk/gtk/tests/movie1.mng URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/movie1.mng?rev=41411&v… ============================================================================== Binary file - no diff available. Added: trunk/gtk/tests/movie2.mng URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/movie2.mng?rev=41411&v… ============================================================================== Binary file - no diff available. Added: trunk/gtk/tests/movie3.mng URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/movie3.mng?rev=41411&v… ============================================================================== Binary file - no diff available. Added: trunk/gtk/tests/movie4.mng URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/movie4.mng?rev=41411&v… ============================================================================== Binary file - no diff available. Added: trunk/gtk/tests/movie5.mng URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/movie5.mng?rev=41411&v… ============================================================================== Binary file - no diff available. Added: trunk/gtk/tests/movie6.mng URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/movie6.mng?rev=41411&v… ============================================================================== Binary file - no diff available. Added: trunk/gtk/tests/movie7.mng URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/movie7.mng?rev=41411&v… ============================================================================== Binary file - no diff available. Added: trunk/gtk/tests/movie8.mng URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/movie8.mng?rev=41411&v… ============================================================================== Binary file - no diff available. -- 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] r41410 - /tags/branch-SLE-10-SP1-2_13_13/product-creator/
by jsuchome＠svn.opensuse.org 12 Oct '07

12 Oct '07

Author: jsuchome Date: Fri Oct 12 16:49:08 2007 New Revision: 41410 URL: http://svn.opensuse.org/viewcvs/yast?rev=41410&view=rev Log: Created tag branch-SLE-10-SP1-2_13_13 for product-creator Added: tags/branch-SLE-10-SP1-2_13_13/product-creator/ - copied from r41409, branches/SuSE-SLE-10-SP1-Branch/product-creator/ -- 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] r41409 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: VERSION package/yast2-product-creator.changes src/Kiwi.ycp src/data/sysconfig.product-creator src/kiwi_dialogs.ycp src/wizards.ycp
by jsuchome＠svn.opensuse.org 12 Oct '07

12 Oct '07

Author: jsuchome Date: Fri Oct 12 16:49:02 2007 New Revision: 41409 URL: http://svn.opensuse.org/viewcvs/yast?rev=41409&view=rev Log: - fix adding CD/DVD/SLP repositories (#333106) - show correct list of repositories when going back (#332253) - use system repositories when none is specified (#332253) - menubutton for adding system repositories (#332253) - added SUPPORTED_BOOT_IMAGES to /etc/sysconfig/product-creator: possibility to limit list of offered boot images (#331733) - append image name to defaultdestination and defaultroot (#327057) - 2.13.13 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/data/sysconfig.product-creator branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Fri Oct 12 16:49:02 2007 @@ -1 +1 @@ -2.13.12 +2.13.13 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Fri Oct 12 16:49:02 2007 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Fri Oct 12 11:15:01 CEST 2007 - jsuchome(a)suse.cz + +- fix adding CD/DVD/SLP repositories (#333106) +- show correct list of repositories when going back (#332253) +- use system repositories when none is specified (#332253) +- menubutton for adding system repositories (#332253) +- added SUPPORTED_BOOT_IMAGES to /etc/sysconfig/product-creator: + possibility to limit list of offered boot images (#331733) +- append image name to defaultdestination and defaultroot (#327057) +- 2.13.13 + +------------------------------------------------------------------- Tue Oct 2 11:49:14 CEST 2007 - jsuchome(a)suse.cz - copy whole content of imported kiwi config directory (#330052) Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp Fri Oct 12 16:49:02 2007 @@ -30,6 +30,9 @@ // directory for saving image configurations global string images_dir = Directory::vardir + "/product-creator/images"; + // bug 331733 + global string supported_boot_images = ""; + // directories with user-made templated global list<string> templates_dirs = []; @@ -40,6 +43,9 @@ // repositories used for current configuration global map <integer,map> current_repositories = $[]; + // initial system repositories + global map <integer,map> initial_repositories = $[]; + // where the kiwi configuration files are stored string config_dir = ""; @@ -313,8 +319,11 @@ tmp_dir = Directory::tmpdir; chroot_dir = tmp_dir + "/myphysical"; if (KiwiConfig["defaultroot"]:"" != "") - chroot_dir = KiwiConfig["defaultroot"]:""; - + { + chroot_dir = + KiwiConfig["defaultroot"]:"" + "/" + KiwiConfig["name"]:""; + KiwiConfig["defaultroot"] = chroot_dir; + } list packages_list = []; list patterns_list = []; @@ -507,7 +516,7 @@ } string write_string = Map2XML (write_list[0]:$[], 0); - config_dir = tmp_dir + "/" + get_config_dir (KiwiConfig["name"]:"", task); + config_dir = tmp_dir + "/" + KiwiConfig["name"]:""; SCR::Execute (.target.mkdir, config_dir); SCR::Write (.target.string, config_dir + "/config.xml", write_string); foreach (string dir, ["root_dir", "config_dir"], { @@ -613,6 +622,7 @@ update_output (); integer status = (integer) SCR::Read (.background.status); +y2internal ("status: %1", status); if (status != 0) { UI::ReplaceWidget (`id (`rp), `HBox ( @@ -670,7 +680,7 @@ if (!FileUtils::Exists (images_dir)) SCR::Execute (.target.mkdir, images_dir); SCR::Execute (.target.bash, sformat ("cp -ar %1 %2/", config_dir, images_dir)); - return (images_dir + get_config_dir (KiwiConfig["name"]:"", task)); + return (images_dir + KiwiConfig["name"]:""); } /** @@ -774,6 +784,10 @@ (string) SCR::Read (.sysconfig.product-creator.IMAGE_CONFIGURATIONS); if (dir != nil && dir != "") images_dir = dir; + supported_boot_images = + (string) SCR::Read (.sysconfig.product-creator.SUPPORTED_BOOT_IMAGES); + if (supported_boot_images == nil) + supported_boot_images = ""; return ReadImageTemplates (); } Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/data/sysconfig.product-creator URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/data/sysconfig.product-creator (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/data/sysconfig.product-creator Fri Oct 12 16:49:02 2007 @@ -18,3 +18,15 @@ # # IMAGE_CONFIGURATIONS="/var/lib/YaST2/product-creator/images" + +## Path: System/Yast2/Product-creator +## Description: YaST2 Product Creator +## Type: string(template) +## Default: none +# +# Which boot images are offered for configuration. Use comma separated list +# of image types (like "iso,xen,usb") or special value "template" for +# supporting only image types found in imported configurations. +# +# +SUPPORTED_BOOT_IMAGES="" Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Fri Oct 12 16:49:02 2007 @@ -18,6 +18,7 @@ import "Kiwi"; import "Popup"; import "SourceDialogs"; + import "SourceManager"; import "Summary"; import "URL"; import "Wizard"; @@ -1475,7 +1476,7 @@ _("Select Output Directory for the created image.") + // help text for kiwi UI preparation, cont. - _("Modify the list of Package Repositories that will be used for creating the image. If the list is empty, current system repositories will be used.") + + _("Modify the list of Package Repositories that will be used for creating the image. Use Add From System to add one of current system repository.") + // help text for kiwi UI preparation, cont. _("Use Next to continue with the configuration."); @@ -1492,14 +1493,42 @@ ]; map task2label = $[ // combo box item - "pxe" : _("Network Boot Image") + "pxe" : _("Network Boot Image"), + // combo box item + "iso" : _("Live ISO Image"), + // combo box item + "xen" : _("Xen Image"), + // combo box item + "usb" : _("USB Stick Image"), + // combo box item + "vmx" : _("Virtual Disk Image") ]; - // on start, show the default YaST sources - if (Config == $[]) + list type_items = basic_type_items; + list default_type_items = basic_type_items; + + string supported_images = Kiwi::supported_boot_images; + if (supported_images != "" && supported_images != "template") { + type_items = []; // will be read from template..., or: + foreach (string type, splitstring (supported_images,","), + { + if (haskey (task2label, type)) + { + type_items = add (type_items, + `item (`id (type), task2label[type]:type)); + } + }); + default_type_items = type_items; } - else if (Config["sources"]:[] != [] && repositories == $[]) + if (!contains (["iso", "xen", "usb", "vmx"], kiwi_task)) + type_items = add (type_items, + `item (`id (kiwi_task), task2label[kiwi_task]:kiwi_task, true)); + list present_types = maplist ( + term it, (list<term>)type_items, ``(it[0,0]:"")); + + // on start, show the default YaST sources + if (Config["sources"]:[] != [] && repositories == $[]) { integer i = 0; foreach (string src, Config["sources"]:[], { @@ -1509,6 +1538,10 @@ i = i + 1; }); } + list system_repo_items = maplist (integer id, map repo, + Kiwi::initial_repositories, { + return `item (`id (id), repo["url"]:""); + }); void update_repo_table () { UI::ChangeWidget (`id (`repositories), `Items, maplist ( @@ -1540,18 +1573,22 @@ if (Config["iso-directory"]:"" != "") UI::ChangeWidget(`id(`out_dir), `Value, Config["iso-directory"]:""); update_repo_table (); - list type_items = basic_type_items; + list type_its = supported_images != "template" ? default_type_items: []; boolean primary = false; foreach (string type, map data, Config["type"]:$[], { if (!primary) kiwi_task = type; if (data["primary"]:"" == "true") primary = true; - if (!contains (["iso", "xen", "usb", "vmx"], type)) - type_items = add (type_items, + if ((supported_images == "" && !contains (present_types, type)) || + supported_images == "template") + { + type_its = add (type_its, `item (`id (kiwi_task), task2label[kiwi_task]:kiwi_task)); + present_types = union (present_types, [type]); + } }); - UI::ChangeWidget (`id (`type), `Items, type_items); + UI::ChangeWidget (`id (`type), `Items, type_its); UI::ChangeWidget (`id (`type), `Value, kiwi_task); } @@ -1562,10 +1599,6 @@ ); }); - list type_items = basic_type_items; - if (!contains (["iso", "xen", "usb", "vmx"], kiwi_task)) - type_items = add (type_items, - `item (`id (kiwi_task), task2label[kiwi_task]:kiwi_task, true)); term contents = `VBox ( new_configuration ? `VBox ( @@ -1582,6 +1615,7 @@ // radio button label _("Base on Template")) ), + template_items == [] ? `VSpacing (0) : `HBox ( `HSpacing (2.5), `ComboBox (`id (`template), `opt (`notify, `hstretch), "", @@ -1601,7 +1635,7 @@ ) : `Left (`Label (`id (`config), name)), // combo box label - `ComboBox (`id (`type), `opt (`notify, `hstretch), _("Image Type"), + `ComboBox (`id (`type), `opt (`notify, `hstretch), _("I&mage Type"), type_items), `HBox ( // text entry label @@ -1609,12 +1643,14 @@ `VBox ( `Label (""), `PushButton (`id (`browse), Label::BrowseButton ()) - ), + ) + /* `VBox ( `Label (""), // checkbox label `CheckBox (`id (`append), _("A&ppend Name"), append_name) ) + */ ), `VSpacing (0.2), `Table (`id(`repositories), `header ( @@ -1623,6 +1659,9 @@ ), `HBox ( `PushButton (`id (`add), Label::AddButton ()), + // menu butto label + `MenuButton (`id (`addsystem), _("A&dd From System"), + system_repo_items), `PushButton (`id (`edit), Label::EditButton ()), `PushButton (`id (`delete), Label::DeleteButton ()), `HStretch () @@ -1644,8 +1683,10 @@ if (new_configuration) { UI::SetFocus (`id (`config)); - UI::ChangeWidget (`id (`template), `Enabled, false); + if (template_items != []) + UI::ChangeWidget (`id (`template), `Enabled, false); UI::ChangeWidget (`id (`import), `Enabled, false); + UI::ChangeWidget (`id (`config), `ValidChars, String::CAlnum ()); } any ret = nil; while (true) @@ -1658,7 +1699,8 @@ } else if (ret == "rb_dir") { - UI::ChangeWidget (`id (`template), `Enabled, false); + if (template_items != []) + UI::ChangeWidget (`id (`template), `Enabled, false); UI::ChangeWidget (`id (`import), `Enabled, true); if (kiwi_configuration == "") ret = `import; @@ -1691,14 +1733,43 @@ string dir = (string) UI::QueryWidget (`id (`template), `Value); update_config (dir, Kiwi::Templates[dir]:$[]); } + else if (is (ret, integer)) // system repository selected + { + map system_repo = Kiwi::initial_repositories[(integer)ret]:$[]; + boolean present = false; + foreach (integer id, map repo, repositories, { + if (repo["url"]:"" == system_repo["url"]:"") + { + present = true; + break; + } + }); + if (present) continue; + repositories[size (repositories)] = system_repo; + update_repo_table (); + } else if (ret == `add) { Wizard::CreateDialog (); - string url = ""; - if (SourceDialogs::TypeDialog () == `next && - SourceDialogs::EditDialog () == `next) + string url = ""; + symbol type_ret = SourceDialogs::TypeDialog (); + + if ((type_ret == `next || type_ret == `finish)) { - url = SourceDialogs::GetURL (); + // FIXME SLP code for SLE10SP1 only, adapt for 10.3... + if (type_ret == `finish && SourceDialogs::GetURL () == "slp://") + { + string service = SourceManager::AddSourceTypeSLP (); + if (service != nil) + { + url = service; + } + } + else + { + if (SourceDialogs::EditDialog () == `next) + url = SourceDialogs::GetURL (); + } } Wizard::CloseDialog (); if (url != "") @@ -1711,7 +1782,7 @@ break; } }); - if (present) break; + if (present) continue; map parsed = URL::Parse(url); if (parsed["scheme"]:"" == "pkg") @@ -1802,6 +1873,14 @@ UI::SetFocus (`id (`out_dir)); continue; } + if (repositories == $[]) + { + // error popup + Popup::Error(_("Specify at least one package repository.")); + UI::SetFocus (`id (`repositories)); + continue; + } + kiwi_task = (string) UI::QueryWidget (`id (`type), `Value); break; } @@ -1816,12 +1895,9 @@ { Config["kiwi_configuration_" + kiwi_task] = kiwi_configuration; Config["_imported"] = true; - Config["iso-directory"] = out_dir; + Config["iso-directory"] = out_dir + + (new_configuration ? "/" + name : ""); Config["name"] = name; - /* - Config["sources"] = maplist ( - integer id, string repo, repositories, ``(repo)); - */ Config["sources"] = maplist ( integer id, map repo, repositories, ``(repo["url"]:"")); if (Config["sources"]:[] != []) @@ -1855,13 +1931,8 @@ }); Pkg::SourceLoad(); } - else - { - // reenable original sources - Pkg::SourceRestore (); - Pkg::SourceLoad(); - } ProductCreator::Config = Config; + Kiwi::current_repositories = repositories; Kiwi::kiwi_task = kiwi_task; } y2milestone("Returning %1", ret); Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp Fri Oct 12 16:49:02 2007 @@ -143,7 +143,7 @@ */ symbol InitRepositories () { - Kiwi::current_repositories = Kiwi::InitCurrentRepositories (); + Kiwi::initial_repositories = Kiwi::InitCurrentRepositories (); Kiwi::Read (); return `next; } -- 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] r41408 - /tags/stable-2_16_0/tv/
by lslezak＠svn.opensuse.org 12 Oct '07

12 Oct '07

Author: lslezak Date: Fri Oct 12 15:39:03 2007 New Revision: 41408 URL: http://svn.opensuse.org/viewcvs/yast?rev=41408&view=rev Log: Created tag stable-2_16_0 for tv Added: tags/stable-2_16_0/tv/ - copied from r41407, trunk/tv/ -- 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] r41407 - in /trunk/tv: VERSION package/yast2-tv.changes src/ui.ycp
by lslezak＠svn.opensuse.org 12 Oct '07

12 Oct '07

Author: lslezak Date: Fri Oct 12 15:38:53 2007 New Revision: 41407 URL: http://svn.opensuse.org/viewcvs/yast?rev=41407&view=rev Log: - fixed state of the buttons in the expert dialog in Gtk UI (#327492), don't recreate the table if not necessary - 2.16.0 Modified: trunk/tv/VERSION trunk/tv/package/yast2-tv.changes trunk/tv/src/ui.ycp Modified: trunk/tv/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/VERSION?rev=41407&r1=41406&r2… ============================================================================== --- trunk/tv/VERSION (original) +++ trunk/tv/VERSION Fri Oct 12 15:38:53 2007 @@ -1 +1 @@ -2.15.7 +2.16.0 Modified: trunk/tv/package/yast2-tv.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/package/yast2-tv.changes?rev=… ============================================================================== --- trunk/tv/package/yast2-tv.changes (original) +++ trunk/tv/package/yast2-tv.changes Fri Oct 12 15:38:53 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Oct 12 15:36:53 CEST 2007 - lslezak(a)suse.cz + +- fixed state of the buttons in the expert dialog in Gtk UI + (#327492), don't recreate the table if not necessary +- 2.16.0 + +------------------------------------------------------------------- Thu Aug 23 09:14:16 CEST 2007 - lslezak(a)suse.cz - don't read/write hwcfg files, remove the old files from Modified: trunk/tv/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/src/ui.ycp?rev=41407&r1=41406… ============================================================================== --- trunk/tv/src/ui.ycp (original) +++ trunk/tv/src/ui.ycp Fri Oct 12 15:38:53 2007 @@ -868,6 +868,9 @@ UI::ChangeWidget (`id(`parameter_entry), `Label, sformat(parameter_label, selected_parameter)); UI::ChangeWidget (`id(`parameter_entry), `Value, value); + UI::ChangeWidget (`id(`parameter_entry), `Enabled, true); + UI::ChangeWidget (`id(`set_button), `Enabled, true); + UI::ChangeWidget (`id(`reset_button), `Enabled, true); } // Set the value in the table @@ -894,29 +897,8 @@ { parameters = add (parameters, selected_parameter, value); - // Redraw the table - if (dvb) - { - if (index == 1) - { - UI::ChangeWidget ( `id(`parameters_table), `Items, - Tv::ModuleParametersAsItems(Tv::dvb_modules, selected_module, parameters)); - } - else - { - UI::ChangeWidget ( `id(`parameters_table), `Items, - Tv::ModuleParametersAsItems(Tv::dvb_core_drivers, selected_module, parameters)); - } - } - else if (!radio) - UI::ChangeWidget (`id(`parameters_table), `Items, - Tv::ModuleParametersAsItems(Tv::kernel_modules, selected_module, parameters)); - else - UI::ChangeWidget (`id(`parameters_table), `Items, - Tv::ModuleParametersAsItems(Tv::radio_modules, selected_module, parameters)); - - UI::ChangeWidget (`id(`parameters_table), `CurrentItem, - selected_parameter); + string current = (string) UI::QueryWidget (`id(`parameters_table), `CurrentItem); + UI::ChangeWidget(`id(`parameters_table), `Item(current, 1), value); } } } @@ -933,29 +915,8 @@ { parameters = add (parameters, selected_parameter, ""); - // Redraw the table - if (dvb) - { - if (index == 1) - { - UI::ChangeWidget ( `id(`parameters_table), `Items, - Tv::ModuleParametersAsItems(Tv::dvb_modules, selected_module, parameters)); - } - else - { - UI::ChangeWidget ( `id(`parameters_table), `Items, - Tv::ModuleParametersAsItems(Tv::dvb_core_drivers, selected_module, parameters)); - } - } - else if (!radio) - UI::ChangeWidget ( `id(`parameters_table), `Items, - Tv::ModuleParametersAsItems(Tv::kernel_modules, selected_module, parameters)); - else - UI::ChangeWidget ( `id(`parameters_table), `Items, - Tv::ModuleParametersAsItems(Tv::radio_modules, selected_module, parameters)); - - UI::ChangeWidget ( `id(`parameters_table), `CurrentItem, - selected_parameter); + string current = (string) UI::QueryWidget (`id(`parameters_table), `CurrentItem); + UI::ChangeWidget(`id(`parameters_table), `Item(current, 1), value); } } } while (ret != `back && ret != `abort && ret != `next); -- 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] r41406 - in /trunk/gtk: ChangeLog src/YGImage.cc src/ygdkmngloader.c src/ygdkmngloader.h tests/Image.ycp tests/ImageMng.ycp
by rpmcruz＠svn.opensuse.org 12 Oct '07

12 Oct '07

Author: rpmcruz Date: Fri Oct 12 14:35:29 2007 New Revision: 41406 URL: http://svn.opensuse.org/viewcvs/yast?rev=41406&view=rev Log: * src/ygdkmngloader.h/c / src/YGImage.cc: added support for inline MNG images. Fixed ticks per second. * tests/YGImage.ycp: added a bunch of MNGs I found... Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGImage.cc trunk/gtk/src/ygdkmngloader.c trunk/gtk/src/ygdkmngloader.h trunk/gtk/tests/Image.ycp trunk/gtk/tests/ImageMng.ycp Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=41406&r1=41405… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Fri Oct 12 14:35:29 2007 @@ -1,3 +1,9 @@ +2007-10-12 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/ygdkmngloader.h/c / src/YGImage.cc: added support for inline MNG + images. + * tests/YGImage.ycp: added a bunch of MNGs I found... + 2007-10-11 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc: speed up Patterns view. Modified: trunk/gtk/src/YGImage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGImage.cc?rev=41406&r1=… ============================================================================== --- trunk/gtk/src/YGImage.cc (original) +++ trunk/gtk/src/YGImage.cc Fri Oct 12 14:35:29 2007 @@ -125,15 +125,24 @@ alt_text = g_strdup (text->value_cstr()); initOptions (opt); - GdkPixbufLoader *loader = gdk_pixbuf_loader_new(); - g_signal_connect (G_OBJECT (loader), "area-prepared", - G_CALLBACK (image_loaded_cb), this); - GError *error = 0; - if (!gdk_pixbuf_loader_write (loader, - byteblock->value(), byteblock->size(), &error)) - g_warning ("Could not load image from data blocks: %s", error->message); - gdk_pixbuf_loader_close (loader, &error); + if (m_isAnimation && ygdk_mng_pixbuf_is_data_mng (byteblock->value(), byteblock->size())) + { + GdkPixbufAnimation *pixbuf; + pixbuf = ygdk_mng_pixbuf_new_from_data (byteblock->value(), byteblock->size(), &error); + loadAnimation (pixbuf, error ? error->message : "(undefined)"); + } + else + { + GdkPixbufLoader *loader = gdk_pixbuf_loader_new(); + g_signal_connect (G_OBJECT (loader), "area-prepared", + G_CALLBACK (image_loaded_cb), this); + + if (!gdk_pixbuf_loader_write (loader, + byteblock->value(), byteblock->size(), &error)) + g_warning ("Could not load image from data blocks: %s", error->message); + gdk_pixbuf_loader_close (loader, &error); + } } virtual ~YGImage() Modified: trunk/gtk/src/ygdkmngloader.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygdkmngloader.c?rev=4140… ============================================================================== --- trunk/gtk/src/ygdkmngloader.c (original) +++ trunk/gtk/src/ygdkmngloader.c Fri Oct 12 14:35:29 2007 @@ -30,47 +30,58 @@ //** Utilities to read the MNG file -typedef gboolean (*ChunkParser)(YGdkMngPixbuf*, guint8*, GError**); - -struct ChunkLoad { - guint8 Id; - ChunkParser Function; - -}; +typedef struct DataStream { + const guint8 *data; + const long size; + long offset; +} DataStream; +static DataStream data_stream_constructor (const guint8 *raw_data, long size) +{ + DataStream data = { raw_data, size, 0 }; + return data; +} -static gboolean read_signature (FILE *file) +static gboolean read_signature (DataStream *data) { - guchar buf[8]; - fread (buf, 1, 8, file); - return memcmp (buf, "\212MNG\r\n\032\n", 8) == 0; + if (data->offset+8 > data->size) + return FALSE; + data->offset += 8; + return memcmp (data->data + data->offset-8, "\212MNG\r\n\032\n", 8) == 0; } -static gboolean read_uint8 (FILE *file, guint8 *value) +static gboolean read_uint8 (DataStream *data, guint8 *value) { - return fread (value, 1, 1, file) >= 1; + if (data->offset+1 > data->size) + return FALSE; + *value = data->data [data->offset++]; + return TRUE; } -static gboolean read_uint32 (FILE *file, guint32 *value) +static gboolean read_uint32 (DataStream *data, guint32 *value) { - guint8 buffer[4]; - if (fread (buffer, 1, 4, file) < 4) + if (data->offset+4 > data->size) return FALSE; - *value = buffer[0] << 24; *value |= buffer[1] << 16; - *value |= buffer[2] << 8; *value |= buffer[3]; + *value = data->data[data->offset+0] << 24; + *value |= data->data[data->offset+1] << 16; + *value |= data->data[data->offset+2] << 8; + *value |= data->data[data->offset+3]; + data->offset += 4; return TRUE; } -static gboolean read_data (FILE *file, guint32 size, GdkPixbufLoader *loader, +static gboolean read_data (DataStream *data, guint32 size, GdkPixbufLoader *loader, GError **error) { - guchar data [size]; - if (fread (data, 1, size, file) < size) + if (data->offset+size > data->size) { g_set_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_CORRUPT_IMAGE, "Unexpected end of file when reading PNG chunk"); return FALSE; } - return gdk_pixbuf_loader_write (loader, data, size, error); + gboolean ret; + ret = gdk_pixbuf_loader_write (loader, data->data + data->offset, size, error); + data->offset += size; + return ret; } static void image_prepared_cb (GdkPixbufLoader *loader, YGdkMngPixbuf *mng_pixbuf) @@ -91,17 +102,34 @@ { FILE *file = fopen (filename, "rb"); if (!file) - return FALSE; - return read_signature (file); + goto is_file_mng_failed; + + guchar raw_data [8]; + if (fread (raw_data, 1, 8, file) < 8) + goto is_file_mng_failed; + + gboolean ret = ygdk_mng_pixbuf_is_data_mng (raw_data, 8); + fclose (file); + return ret; + +is_file_mng_failed: + fclose (file); + return FALSE; +} + +gboolean ygdk_mng_pixbuf_is_data_mng (const guint8 *raw_data, long size) +{ + DataStream data = data_stream_constructor (raw_data, size); + return read_signature (&data); } +#define SET_ERROR(msg) { error = TRUE; \ + g_set_error (error_msg, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_CORRUPT_IMAGE, msg); } + GdkPixbufAnimation *ygdk_mng_pixbuf_new_from_file (const gchar *filename, GError **error_msg) { gboolean error = FALSE; - #define SET_ERROR(msg) { error = TRUE; \ - g_set_error (error_msg, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_CORRUPT_IMAGE, msg); } - FILE *file = fopen (filename, "rb"); if (!file) { @@ -109,7 +137,31 @@ return NULL; } - if (!read_signature (file)) + fseek (file, 0, SEEK_END); + long file_size = ftell (file); + fseek (file, 0, SEEK_SET); + + GdkPixbufAnimation *mng_pixbuf = 0; + guchar *data = mmap (NULL, file_size, PROT_READ, MAP_PRIVATE, + fileno (file), 0); + if (data == MAP_FAILED) + SET_ERROR ("Could not map file") + else + { + mng_pixbuf = ygdk_mng_pixbuf_new_from_data (data, file_size, error_msg); + munmap (data, file_size); + } + fclose (file); + return mng_pixbuf; +} + +GdkPixbufAnimation *ygdk_mng_pixbuf_new_from_data (const guint8 *raw_data, long size, + GError **error_msg) +{ + DataStream data = data_stream_constructor (raw_data, size); + + gboolean error = FALSE; + if (!read_signature (&data)) { SET_ERROR ("Not a MNG file") return NULL; @@ -119,19 +171,19 @@ mng_pixbuf->iteration_max = 0x7fffffff; guint32 chunk_size, chunk_id; - long offset; + long chunk_offset; GdkPixbufLoader *loader = NULL; /* currently loading... */ gboolean first_read = TRUE; do { - error = !read_uint32 (file, &chunk_size); - error = error || !read_uint32 (file, &chunk_id); + error = !read_uint32 (&data, &chunk_size); + error = error || !read_uint32 (&data, &chunk_id); if (error) { SET_ERROR ("Unexpected end of file on new chunk") break; } - offset = ftell (file) + chunk_size + 4/*CRC*/; + chunk_offset = data.offset + chunk_size + 4/*CRC*/; if (first_read && chunk_id != MNG_UINT_MHDR) { @@ -154,9 +206,9 @@ if (chunk_size == 7*4) { // Read MHDR chunk data - error = !read_uint32 (file, &mng_pixbuf->frame_width); - error = error || !read_uint32 (file, &mng_pixbuf->frame_height); - error = error || !read_uint32 (file, &mng_pixbuf->ticks_per_second); + error = !read_uint32 (&data, &mng_pixbuf->frame_width); + error = error || !read_uint32 (&data, &mng_pixbuf->frame_height); + error = error || !read_uint32 (&data, &mng_pixbuf->ticks_per_second); if (error) SET_ERROR ("Unexpected end of file on MHDR chunk") /* Next atttributes: Nominal_layer_count, Nominal_frame_count, @@ -165,7 +217,7 @@ mng_pixbuf->frame_height <= 0 || mng_pixbuf->ticks_per_second < 0) SET_ERROR ("Invalid MHDR parameter") -fprintf(stderr, "ticks per second: %d\n", mng_pixbuf->ticks_per_second); +//fprintf(stderr, "ticks per second: %d\n", mng_pixbuf->ticks_per_second); } else SET_ERROR ("MHDR chunk must be 28 bytes long") @@ -191,12 +243,12 @@ { // Read TERM chunk data guint8 t; - error = !read_uint8 (file, &t); // term action + error = !read_uint8 (&data, &t); // term action if (t == 3 && chunk_size == 2+8) { - error = error || !read_uint8 (file, &t); // after term action - error = error || !read_uint32 (file, &mng_pixbuf->last_frame_delay); - error = error || !read_uint32 (file, &mng_pixbuf->iteration_max); + error = error || !read_uint8 (&data, &t); // after term action + error = error || !read_uint32 (&data, &mng_pixbuf->last_frame_delay); + error = error || !read_uint32 (&data, &mng_pixbuf->iteration_max); if (error) SET_ERROR ("Unexpected end of file on TERM chunk") } @@ -226,8 +278,8 @@ // loading a PNG stream if (loader) { - fseek (file, -8, SEEK_CUR); - if (!read_data (file, chunk_size+8+4, loader, error_msg)) + data.offset -= 8; + if (!read_data (&data, chunk_size+8+4, loader, error_msg)) error = TRUE; else if (chunk_id == MNG_UINT_IEND) { @@ -240,7 +292,7 @@ } } - fseek (file, offset, SEEK_SET); + data.offset = chunk_offset; first_read = FALSE; } while (chunk_id != MNG_UINT_MEND && !error); @@ -249,11 +301,11 @@ g_object_unref (G_OBJECT (mng_pixbuf)); return NULL; } - #undef SET_ERROR - return GDK_PIXBUF_ANIMATION (mng_pixbuf); } +#undef SET_ERROR + static gboolean ygdk_mng_pixbuf_is_static_image (GdkPixbufAnimation *anim) { return FALSE; @@ -314,7 +366,7 @@ static int ygdk_mng_pixbuf_iter_get_delay_time (GdkPixbufAnimationIter *iter) { YGdkMngPixbufIter *mng_iter = YGDK_MNG_PIXBUF_ITER (iter); - int delay = mng_iter->mng_pixbuf->ticks_per_second; + int delay = 1000.0 / mng_iter->mng_pixbuf->ticks_per_second; if (mng_iter->cur_frame == g_list_length (mng_iter->mng_pixbuf->frames)-1) delay += mng_iter->mng_pixbuf->last_frame_delay; return delay; Modified: trunk/gtk/src/ygdkmngloader.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygdkmngloader.h?rev=4140… ============================================================================== --- trunk/gtk/src/ygdkmngloader.h (original) +++ trunk/gtk/src/ygdkmngloader.h Fri Oct 12 14:35:29 2007 @@ -44,8 +44,10 @@ GdkPixbufAnimationClass parent_class; } YGdkMngPixbufClass; -GdkPixbufAnimation *ygdk_mng_pixbuf_new_from_file (const gchar *filename, GError **error_msg); +GdkPixbufAnimation *ygdk_mng_pixbuf_new_from_file (const gchar *filename, GError **error); +GdkPixbufAnimation *ygdk_mng_pixbuf_new_from_data (const guint8 *data, long size, GError **error); gboolean ygdk_mng_pixbuf_is_file_mng (const gchar *filename); +gboolean ygdk_mng_pixbuf_is_data_mng (const guint8 *data, long size); GType ygdk_mng_pixbuf_get_type (void) G_GNUC_CONST; Modified: trunk/gtk/tests/Image.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/Image.ycp?rev=41406&r1… ============================================================================== --- trunk/gtk/tests/Image.ycp (original) +++ trunk/gtk/tests/Image.ycp Fri Oct 12 14:35:29 2007 @@ -1,5 +1,5 @@ // Image test -string filename = "image.gif"; +string filename = "tests/image.gif"; { UI::OpenDialog ( Modified: trunk/gtk/tests/ImageMng.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/ImageMng.ycp?rev=41406… ============================================================================== --- trunk/gtk/tests/ImageMng.ycp (original) +++ trunk/gtk/tests/ImageMng.ycp Fri Oct 12 14:35:29 2007 @@ -1,4 +1,6 @@ // Image test +// TODO: make it getting the filename as an argument + { UI::OpenDialog ( `VBox ( @@ -10,8 +12,14 @@ `Frame ("Which MNG file:", `RadioButtonGroup (`id(`rb), `VBox( - `Left (`RadioButton(`id (`endless), `opt(`notify), "&Endless")), - `Left (`RadioButton(`id (`loop3), `opt(`notify), "&Loop 3")) + `Left (`RadioButton(`id (`movie1), `opt(`notify), "&Movie1")), + `Left (`RadioButton(`id (`movie2), `opt(`notify), "&Movie2")), + `Left (`RadioButton(`id (`movie3), `opt(`notify), "&Movie3")), + `Left (`RadioButton(`id (`movie4), `opt(`notify), "&Movie4")), + `Left (`RadioButton(`id (`movie5), `opt(`notify), "&Movie5")), + `Left (`RadioButton(`id (`movie6), `opt(`notify), "&Movie6")), + `Left (`RadioButton(`id (`movie7), `opt(`notify), "&Movie7")), + `Left (`RadioButton(`id (`movie8), `opt(`notify), "&Movie8")) ) ) ), @@ -52,10 +60,26 @@ } string filename = ""; - if ((boolean) UI::QueryWidget(`id(`loop3), `Value)) - filename = "movie-loop3.mng"; + if ((boolean) UI::QueryWidget(`id(`movie1), `Value)) + filename = "tests/movie1.mng"; + else if ((boolean) UI::QueryWidget(`id(`movie2), `Value)) + filename = "tests/movie2.mng"; + else if ((boolean) UI::QueryWidget(`id(`movie3), `Value)) + filename = "tests/movie3.mng"; + else if ((boolean) UI::QueryWidget(`id(`movie4), `Value)) + filename = "tests/movie4.mng"; + else if ((boolean) UI::QueryWidget(`id(`movie5), `Value)) + filename = "tests/movie5.mng"; + else if ((boolean) UI::QueryWidget(`id(`movie6), `Value)) + filename = "tests/movie6.mng"; + else if ((boolean) UI::QueryWidget(`id(`movie7), `Value)) + filename = "tests/movie7.mng"; else - filename = "movie-endless.mng"; + filename = "tests/movie8.mng"; + + // to test inline images, uncomment next line and pass it to `Image + //byteblock data = (byteblock) SCR::Read (.target.byte, filename); + UI::ReplaceWidget (`replace_image, `Image (`opt (`animated, effect_opt, zerowidth, zeroheight), filename, filename + " not found")); -- 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] r41405 - /branches/tmp/sh/mod-ui/qt/src/yast2.png
by sh-sh-sh＠svn.opensuse.org 12 Oct '07

12 Oct '07

Author: sh-sh-sh Date: Fri Oct 12 13:28:49 2007 New Revision: 41405 URL: http://svn.opensuse.org/viewcvs/yast?rev=41405&view=rev Log: cruft Removed: branches/tmp/sh/mod-ui/qt/src/yast2.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] r41404 - /trunk/devtools/devtools/skeletons/trans/yast2-trans-XXpkgXX.spec.in
by keichwa＠svn.opensuse.org 12 Oct '07

12 Oct '07

Author: keichwa Date: Fri Oct 12 13:27:16 2007 New Revision: 41404 URL: http://svn.opensuse.org/viewcvs/yast?rev=41404&view=rev Log: use BuildArch Modified: trunk/devtools/devtools/skeletons/trans/yast2-trans-XXpkgXX.spec.in Modified: trunk/devtools/devtools/skeletons/trans/yast2-trans-XXpkgXX.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/tran… ============================================================================== --- trunk/devtools/devtools/skeletons/trans/yast2-trans-XXpkgXX.spec.in (original) +++ trunk/devtools/devtools/skeletons/trans/yast2-trans-XXpkgXX.spec.in Fri Oct 12 13:27:16 2007 @@ -1,9 +1,9 @@ @HEADER-COMMENT@ @HEADER@ -BuildRequires: pkgconfig yast2-devtools -BuildArchitectures: noarch -Provides: locale(yast2:@LL@) +BuildRequires: pkgconfig yast2-devtools +BuildArch: noarch +Provides: locale(yast2:@LL@) Summary: YaST2 translations for XXpkgXX localization %define Y2LANG XXpkgXX -- 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] r41403 - /branches/tmp/sh/mod-ui/qt/fonts/unused/
by sh-sh-sh＠svn.opensuse.org 12 Oct '07

12 Oct '07

Author: sh-sh-sh Date: Fri Oct 12 13:22:32 2007 New Revision: 41403 URL: http://svn.opensuse.org/viewcvs/yast?rev=41403&view=rev Log: cruft Removed: branches/tmp/sh/mod-ui/qt/fonts/unused/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0