February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55755 - /branches/tmp/lslezak/core/configure.in.in
by lslezak＠svn.opensuse.org 25 Feb '09

25 Feb '09

Author: lslezak Date: Wed Feb 25 17:49:09 2009 New Revision: 55755 URL: http://svn.opensuse.org/viewcvs/yast?rev=55755&view=rev Log: - renamed service config files to match the DBus service name Modified: branches/tmp/lslezak/core/configure.in.in Modified: branches/tmp/lslezak/core/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/configure.in… ============================================================================== --- branches/tmp/lslezak/core/configure.in.in (original) +++ branches/tmp/lslezak/core/configure.in.in Wed Feb 25 17:49:09 2009 @@ -171,8 +171,8 @@ scr/doc/intro_to_scr.html dbus/namespace_service/Yast_dbus_names.h dbus/namespace_service/org.opensuse.yast.modules.policy - dbus/namespace_service/org.opensuse.yast.modules.conf - dbus/namespace_service/org.opensuse.yast.modules.service.in + dbus/namespace_service/org.opensuse.YaST.modules.conf + dbus/namespace_service/org.opensuse.YaST.modules.service.in dbus/SCR_service/org.opensuse.yast.SCR.conf dbus/SCR_service/org.opensuse.yast.SCR.service.in dbus/SCR_service/scr_names.h -- 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] r55754 - /branches/tmp/lslezak/core/dbus/namespace_service/
by lslezak＠svn.opensuse.org 25 Feb '09

25 Feb '09

Author: lslezak Date: Wed Feb 25 17:48:32 2009 New Revision: 55754 URL: http://svn.opensuse.org/viewcvs/yast?rev=55754&view=rev Log: - renamed service config files to match the DBus service name Added: branches/tmp/lslezak/core/dbus/namespace_service/org.opensuse.YaST.modules.conf.in (props changed) - copied unchanged from r55753, branches/tmp/lslezak/core/dbus/namespace_service/org.opensuse.yast.modules.conf.in branches/tmp/lslezak/core/dbus/namespace_service/org.opensuse.YaST.modules.service.in.in (props changed) - copied unchanged from r55753, branches/tmp/lslezak/core/dbus/namespace_service/org.opensuse.yast.modules.service.in.in Removed: branches/tmp/lslezak/core/dbus/namespace_service/org.opensuse.yast.modules.conf.in branches/tmp/lslezak/core/dbus/namespace_service/org.opensuse.yast.modules.service.in.in Modified: branches/tmp/lslezak/core/dbus/namespace_service/Makefile.am Modified: branches/tmp/lslezak/core/dbus/namespace_service/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/Makefile.am (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/Makefile.am Wed Feb 25 17:48:32 2009 @@ -2,7 +2,7 @@ # Makefile.am for dbus/service # -EXTRA_DIST=org.opensuse.yast.modules.service.in.in org.opensuse.yast.modules.conf.in org.opensuse.yast.modules.policy.in \ +EXTRA_DIST=org.opensuse.YaST.modules.service.in.in org.opensuse.YaST.modules.conf.in org.opensuse.yast.modules.policy.in \ Yast_dbus_names.h.in AM_CXXFLAGS = -DY2LOG=\"DBus-service\" -DSUSEVERSION=\"${SUSEVERSION}\" @@ -34,12 +34,12 @@ # Can't use autoconf only because @ybindir@ expands to '${prefix}/...'. # So must use %YBINDIR% and expand it via sed during make # Ouch, ouch, ouch -dbus_services_in_files = org.opensuse.yast.modules.service.in +dbus_services_in_files = org.opensuse.YaST.modules.service.in dbus_services_DATA = $(dbus_services_in_files:.service.in=.service) $(dbus_services_DATA): $(dbus_services_in_files) sed -e "s|\%YBINDIR\%|$(ybindir)|" $< > $@ # service config dbus_confdir = `pkg-config --print-errors --variable sysconfdir dbus-1`/dbus-1/system.d -dbus_conf_DATA = org.opensuse.yast.modules.conf +dbus_conf_DATA = org.opensuse.YaST.modules.conf -- 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] r55753 - in /branches/tmp/lslezak/core: ./ dbus/namespace_service/
by lslezak＠svn.opensuse.org 25 Feb '09

25 Feb '09

Author: lslezak Date: Wed Feb 25 17:34:27 2009 New Revision: 55753 URL: http://svn.opensuse.org/viewcvs/yast?rev=55753&view=rev Log: - better string constant expansion Added: branches/tmp/lslezak/core/dbus/namespace_service/org.opensuse.yast.modules.service.in.in Removed: branches/tmp/lslezak/core/dbus/namespace_service/org.opensuse.yast.modules.service.in Modified: branches/tmp/lslezak/core/configure.in.in branches/tmp/lslezak/core/dbus/namespace_service/Makefile.am branches/tmp/lslezak/core/dbus/namespace_service/Yast_dbus_names.h.in branches/tmp/lslezak/core/dbus/namespace_service/org.opensuse.yast.modules.conf.in Modified: branches/tmp/lslezak/core/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/configure.in… ============================================================================== --- branches/tmp/lslezak/core/configure.in.in (original) +++ branches/tmp/lslezak/core/configure.in.in Wed Feb 25 17:34:27 2009 @@ -136,10 +136,22 @@ ACCESS_MODE=deny fi +YAST_DBUS_SERVICE=org.opensuse.YaST.modules +AC_SUBST(YAST_DBUS_SERVICE) +YAST_DBUS_RAW_INTERFACE=org.opensuse.YaST.Values +AC_SUBST(YAST_DBUS_RAW_INTERFACE) +YAST_DBUS_YCP_INTERFACE=org.opensuse.YaST.YCPValues +AC_SUBST(YAST_DBUS_YCP_INTERFACE) +YAST_DBUS_MGR_INTERFACE=org.opensuse.YaST.modules.ModuleManager +AC_SUBST(YAST_DBUS_MGR_INTERFACE) + +YAST_POLKIT_PREFIX_MANAGER=org.opensuse.yast.module-manager +AC_SUBST(YAST_POLKIT_PREFIX_MANAGER) YAST_SCR_SERVICE=org.opensuse.yast.SCR YAST_SCR_INTERFACE=org.opensuse.yast.SCR YAST_SCR_SERVICE_METHODS=$YAST_SCR_SERVICE.Methods + # @ybindir@ expands to ${prefix}/lib/..., force full expansion here YAST_SCR_SERVICE_DIR=$ybindir AC_SUBST(YAST_SCR_SERVICE) @@ -153,14 +165,14 @@ AC_SUBST(HAVE_POLKIT) AM_CONDITIONAL([HAVE_POLKIT], [test "x$HAVE_POLKIT" = x1]) -YAST_DBUS_SERVICE=org.opensuse.yast.modules -AC_SUBST(YAST_DBUS_SERVICE) - ## and generate the output AC_CONFIG_FILES([ scr/doc/SCR.html scr/doc/intro_to_scr.html dbus/namespace_service/Yast_dbus_names.h + dbus/namespace_service/org.opensuse.yast.modules.policy + dbus/namespace_service/org.opensuse.yast.modules.conf + dbus/namespace_service/org.opensuse.yast.modules.service.in dbus/SCR_service/org.opensuse.yast.SCR.conf dbus/SCR_service/org.opensuse.yast.SCR.service.in dbus/SCR_service/scr_names.h Modified: branches/tmp/lslezak/core/dbus/namespace_service/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/Makefile.am (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/Makefile.am Wed Feb 25 17:34:27 2009 @@ -2,7 +2,7 @@ # Makefile.am for dbus/service # -EXTRA_DIST=org.opensuse.yast.modules.service.in org.opensuse.yast.modules.conf.in org.opensuse.yast.modules.policy \ +EXTRA_DIST=org.opensuse.yast.modules.service.in.in org.opensuse.yast.modules.conf.in org.opensuse.yast.modules.policy.in \ Yast_dbus_names.h.in AM_CXXFLAGS = -DY2LOG=\"DBus-service\" -DSUSEVERSION=\"${SUSEVERSION}\" @@ -31,29 +31,15 @@ # FIXME?? dbus pkgconfig provides only 'session_bus_services_dir' dbus_servicesdir = `pkg-config --print-errors --variable prefix dbus-1`/share/dbus-1/system-services +# Can't use autoconf only because @ybindir@ expands to '${prefix}/...'. +# So must use %YBINDIR% and expand it via sed during make +# Ouch, ouch, ouch dbus_services_in_files = org.opensuse.yast.modules.service.in - dbus_services_DATA = $(dbus_services_in_files:.service.in=.service) - $(dbus_services_DATA): $(dbus_services_in_files) - sed -e "s|\@YBINDIR\@|$(ybindir)|" $< > $@ + sed -e "s|\%YBINDIR\%|$(ybindir)|" $< > $@ # service config - dbus_confdir = `pkg-config --print-errors --variable sysconfdir dbus-1`/dbus-1/system.d - -dbus_conf_in_files = org.opensuse.yast.modules.conf.in - -dbus_conf_DATA = $(dbus_conf_in_files:.conf.in=.conf) - -# set access mode according to the PolicyKit status -# if policykit is disabled only root can access the service -if HAVE_POLKIT -dbus_access_mode=allow -else -dbus_access_mode=deny -endif - -$(dbus_conf_DATA): $(dbus_conf_in_files) - sed -e "s|\@ACCESS_MODE\@|$(dbus_access_mode)|" $< > $@ +dbus_conf_DATA = org.opensuse.yast.modules.conf Modified: branches/tmp/lslezak/core/dbus/namespace_service/Yast_dbus_names.h.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/Yast_dbus_names.h.in (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/Yast_dbus_names.h.in Wed Feb 25 17:34:27 2009 @@ -10,16 +10,16 @@ #define YAST_DBUS_SERVICE_NAME "@YAST_DBUS_SERVICE@" // interface name for marshalled YCPValues - using (bsv) DBus structure -#define YAST_DBUS_YCP_INTERFACE "org.opensuse.yast.modules.YCPValues" +#define YAST_DBUS_YCP_INTERFACE "@YAST_DBUS_YCP_INTERFACE@" // interface name for raw (direct) DBus values -#define YAST_DBUS_RAW_INTERFACE "org.opensuse.yast.modules.Values" +#define YAST_DBUS_RAW_INTERFACE "@YAST_DBUS_RAW_INTERFACE@" // interface name for management functions (Import, Lock...) -#define YAST_DBUS_MGR_INTERFACE "org.opensuse.yast.modules.ModuleManager" +#define YAST_DBUS_MGR_INTERFACE "@YAST_DBUS_MGR_INTERFACE@" // prefix for PolicyKit action IDs - namespace calls #define YAST_POLKIT_PREFIX_MODULES "org.opensuse.yast.modules" // prefix for PolicyKit action IDs - manager calls -#define YAST_POLKIT_PREFIX_MANAGER "org.opensuse.yast.module_manager" +#define YAST_POLKIT_PREFIX_MANAGER "@YAST_POLKIT_PREFIX_MANAGER@" #define YAST_DBUS_MANAGER_IMPORT_METHOD "Import" Modified: branches/tmp/lslezak/core/dbus/namespace_service/org.opensuse.yast.modules.conf.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/org.opensuse.yast.modules.conf.in (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/org.opensuse.yast.modules.conf.in Wed Feb 25 17:34:27 2009 @@ -1,11 +1,15 @@ <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> <busconfig> <policy user="root"> - <allow own="org.opensuse.yast.modules"/> - <allow send_interface="org.opensuse.yast.modules.Methods"/> + <allow own="@YAST_DBUS_SERVICE@"/> + <allow send_interface="@YAST_DBUS_MGR_INTERFACE@"/> + <allow send_interface="@YAST_DBUS_RAW_INTERFACE@"/> + <allow send_interface="@YAST_DBUS_YCP_INTERFACE@"/> </policy> <policy context="default"> - <deny own="org.opensuse.yast.modules"/> - <@ACCESS_MODE@ send_interface="org.opensuse.yast.modules.Methods"/> + <deny own="@YAST_DBUS_SERVICE@"/> + <@ACCESS_MODE@ send_interface="@YAST_DBUS_MGR_INTERFACE@"/> + <@ACCESS_MODE@ send_interface="@YAST_DBUS_RAW_INTERFACE@"/> + <@ACCESS_MODE@ send_interface="@YAST_DBUS_YCP_INTERFACE@"/> </policy> </busconfig> Added: branches/tmp/lslezak/core/dbus/namespace_service/org.opensuse.yast.modules.service.in.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/org.opensuse.yast.modules.service.in.in (added) +++ branches/tmp/lslezak/core/dbus/namespace_service/org.opensuse.yast.modules.service.in.in Wed Feb 25 17:34:27 2009 @@ -0,0 +1,5 @@ +# DBus service activation config +[D-BUS Service] +Name=@YAST_DBUS_SERVICE@ +Exec=%YBINDIR%/Yast_dbus_server +User=root -- 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] r55752 - in /trunk/autoinstallation: package/autoyast2.changes src/modules/Profile.ycp
by ug＠svn.opensuse.org 25 Feb '09

25 Feb '09

Author: ug Date: Wed Feb 25 17:16:34 2009 New Revision: 55752 URL: http://svn.opensuse.org/viewcvs/yast?rev=55752&view=rev Log: LVM and RAID code from the Middle Ages dropped Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/Profile.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Feb 25 17:16:34 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 25 17:08:20 CET 2009 - ug(a)suse.de + +- very old LVM and RAID code dropped + +------------------------------------------------------------------- Wed Feb 18 11:00:34 CET 2009 - ug(a)suse.de - Classes did not work without Rules anymore (bnc#476456) Modified: trunk/autoinstallation/src/modules/Profile.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Pro… ============================================================================== --- trunk/autoinstallation/src/modules/Profile.ycp (original) +++ trunk/autoinstallation/src/modules/Profile.ycp Wed Feb 25 17:16:34 2009 @@ -429,105 +429,6 @@ return true; } - /** - * Provide Compatibility to older distributions. - * @param list lvm_standalone Stand alone LVM configuration - * @return list LVM configuration integrated into partitioning resource - */ - global define list<map> convertLVM (list<map> lvm_standalone ) - { - list<map> all_lvm = []; - - foreach (map group, lvm_standalone, ``{ - map new_lvm = $[]; - string vg = group["lvm_name"]:""; - - new_lvm["device"] = sformat("/dev/%1", vg ); - new_lvm["use"] = "all"; - new_lvm["pesize"] = group["pesize"]:""; - list partitions = maplist(map lv, group["logical_volumes"]:[], ``{ - - symbol lv_fs = `reiser; - string lv_fs_tmp = lv["lv_fs"]:"reiser"; - term tfs = toterm(lv_fs_tmp); - lv_fs = (symbol)symbolof(tfs); - - return( $[ "filesystem": lv_fs, - "lv_name": lv["lv_name"]:"", - "mount": lv["lv_mount"]:"", - "size": lv["lv_size"]:"", - "stripes": lv["stripes"]:1 - ]); - }); - new_lvm["partitions"] = partitions; - all_lvm = add (all_lvm, new_lvm); - - }); - y2milestone("Converted LVM: %1", all_lvm); - - return (all_lvm); - } - - /** - * Provide Compatibility to older distributions. - * @param list raid_standalone Stand alone RAID configuration - * @return map RAID configuration integrated into partitioning resource - */ - global define map convertRAID (list<map> raid_standalone ) - { - map raid = $[]; - - raid["device"] = "/dev/md"; - raid["use"] = "all"; - - list partitions = maplist(map r, raid_standalone, ``{ - - symbol fs = r["filesystem"]:`reiser; - - - map raid_options = $[]; - - raid_options["chunk_size"] = r["chunk_size"]:""; - raid_options["raid_type"] = r["raid_type"]:"raid1"; - raid_options["parity_algorithm"] = r["parity_algorithm"]:""; - raid_options["persistent_superblock"] = r["persistent_superblock"]:false; - - integer nr = tointeger(substring(r["device_name"]:"/dev/md0", 7)); - - - - map ret = $[ - "raid_options" : raid_options, - "format" : r["format"]:false, - "partition_nr" : nr - - ]; - - if (haskey(r, "mount")) - { - ret["mount"] = r["mount"]:""; - } - if (haskey(r, "partition_id")) - { - ret["partition_id"] = r["partition_id"]:131; - } - if (haskey(r, "filesystem")) - { - ret["filesystem"] = fs; - } - if (haskey(r, "lvm_group")) - { - ret["lvm_group"] = r["lvm_group"]:""; - } - - return (ret); - - }); - raid["partitions"] = partitions; - - return (raid); - } - /** * General compatibility issues @@ -630,25 +531,6 @@ _current["networking"] = net; } - // RAID - list<map> old_raid = _current["raid"]:[]; - if (size(old_raid) > 0 ) - { - map new_raid = convertRAID(old_raid); - list d = _current["partitioning"]:[]; - d =add (d, new_raid ); - _current["partitioning"] = d; - } - - // LVM - list<map> old_lvm = _current["lvm"]:[]; - if (size(old_lvm) > 0 ) - { - list<map> new_lvm = convertLVM(old_lvm); - list<map> d = _current["partitioning"]:[]; - d = (list<map>) union (d, new_lvm ); - _current["partitioning"] = d; - } return _current; } -- 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] r55751 - in /trunk/sudo/src: complex.ycp dialog-user.ycp
by kmachalkova＠svn.opensuse.org 25 Feb '09

25 Feb '09

Author: kmachalkova Date: Wed Feb 25 17:06:58 2009 New Revision: 55751 URL: http://svn.opensuse.org/viewcvs/yast?rev=55751&view=rev Log: Move user selection into the pop-up - #421053 Modified: trunk/sudo/src/complex.ycp trunk/sudo/src/dialog-user.ycp Modified: trunk/sudo/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/complex.ycp?rev=55751&r… ============================================================================== --- trunk/sudo/src/complex.ycp (original) +++ trunk/sudo/src/complex.ycp Wed Feb 25 17:06:58 2009 @@ -83,11 +83,8 @@ UI::OpenDialog(`opt(`decorated), `VBox( `Frame( _("Add New Host to the Alias"), - `VBox( - `HSpacing(40), - `VSpacing(0.5), - `TextEntry(`id("host_name"),_("Hostname or Network"), new_host), - `VSpacing(0.5) + `MarginBox(1,1, + `InputField(`id("host_name"),_("Hostname or Network"), new_host) ) ), `HBox( @@ -116,6 +113,37 @@ return (new_host) ; } +string AddUserDialog( list <string> users ) { + string new_user =""; + + UI::OpenDialog(`opt(`decorated), `VBox( + `Frame( + _("Add New User to the Alias"), + `MarginBox(1,1, + `ComboBox(`id("user_name"),_("Local and System Users (Groups)"), users) + ) + ), + `HBox( + `PushButton(`id(`ok), Label::OKButton()), + `HSpacing(1), + `PushButton(`id(`cancel), Label::CancelButton()) + ) + )); + + any ret = nil; + while (true) { + ret = UI::UserInput(); + if (ret == `ok) { + new_user = (string) UI::QueryWidget(`id("user_name"), `Value); + break; + } else if (ret == `cancel) { + break; + } + } + UI::CloseDialog(); + return (new_user) ; +} + boolean ValidateCommand(string cmd){ if(FileUtils::Exists(cmd) || contains(Sudo::GetAliasNames("command"), cmd) || cmd == "ALL" ) return true; Modified: trunk/sudo/src/dialog-user.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/dialog-user.ycp?rev=557… ============================================================================== --- trunk/sudo/src/dialog-user.ycp (original) +++ trunk/sudo/src/dialog-user.ycp Wed Feb 25 17:06:58 2009 @@ -9,22 +9,15 @@ include "sudo/complex.ycp"; include "sudo/helps.ycp"; -any RedrawUserAlias(string name, list <string> members, list <string> users) { +void RedrawUserAlias( list <string> members ) { list <term> items = []; - if (name != "") { - UI::ChangeWidget(`id("user_alias_name"), `Value, name); - } - foreach(string it, members, { items = add(items, `item(`id(it),it)); }); + UI::ChangeWidget(`id("user_alias_members"),`Items, items); UI::ChangeWidget(`id("remove_member"), `Enabled, (items != [])); - - UI::ReplaceWidget(`id("all_users_replace"), - `ComboBox(`id("all_users"),_("Local and System Users"), sort(string s, string t, users, ``( s < t)))); - } any AddEditUserAliasDialog (string what) { @@ -47,35 +40,25 @@ name = (string) it["name"]:""; caption = _("Existing User Alias"); } + users = (list <string>) sort( string s1, string s2, users, ``( s1 < s2 ) ); term contents = `VBox ( - `TextEntry(`id("user_alias_name"),_("Alias Name (in CAPITALS)")), + `Left( `InputField(`id("user_alias_name"),_("Alias Name (in CAPITALS)"))), `VSpacing(1), - `HBox( - `VBox( - `opt(`hstretch), - `Left(`ReplacePoint(`id("all_users_replace"), - `ComboBox(`id("all_users"),_("Local and System Users"), []) - )), - `Table(`id("user_alias_members"), `opt(`hstretch,`vstretch), `header(_("Alias Members")),[]) - ), - `HSquash( - `VBox ( - `VSpacing(1.1), - `PushButton ( `id ( "add_member" ), `opt ( `hstretch, `key_F3 ), " " + Label::AddButton() + " "), - `PushButton ( `id ( "remove_member" ), `opt ( `hstretch, `key_F5 ), " " + Label::DeleteButton() + " "), - `Empty(`opt(`vstretch)) - ) - ) - - ) + `Table(`id("user_alias_members"), `opt(`hstretch,`vstretch), `header(_("Alias Members")),[]), + `HBox ( + `PushButton ( `id ( "add_member" ), `opt ( `key_F3 ), " " + Label::AddButton() + " "), + `PushButton ( `id ( "remove_member" ), `opt ( `key_F5 ), " " + Label::DeleteButton() + " "), + `HStretch() + ) ); Wizard::SetContentsButtons(caption, contents,HELPS["user_alias"]:"",Label::CancelButton(), Label::OKButton()); Wizard::HideAbortButton(); UI::ChangeWidget (`id("user_alias_name"), `ValidChars, "_0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"); + UI::ChangeWidget(`id("user_alias_name"), `Value, name); - RedrawUserAlias(name, alias_members,users); + RedrawUserAlias( alias_members ); any ret = nil; while(true) { @@ -112,23 +95,24 @@ break; /* add users*/ }else if(ret == "add_member"){ - string new_member = (string) UI::QueryWidget(`id("all_users"),`Value); + string new_member = AddUserDialog( users ); - alias_members = add(alias_members, new_member); - users = filter(string s, users, ``(s != new_member)); - RedrawUserAlias("",alias_members, users); + if (new_member != "") + { + alias_members = add(alias_members, new_member); + users = filter(string s, users, ``(s != new_member)); + } + RedrawUserAlias( alias_members ); /* delete users */ - }else if (ret == "remove_member"){ + }else if (ret == "remove_member"){ string current_item = (string) UI::QueryWidget(`id("user_alias_members"), `CurrentItem); alias_members = filter(string s, alias_members, ``(s != current_item)); users = add(users, current_item); - UI::ReplaceWidget(`id("all_users_replace"), - `ComboBox(`id("all_users"),_("Local and System Users"),users)); - RedrawUserAlias("",alias_members, users); + RedrawUserAlias(alias_members); /* unknown */ } else { y2error("unexpected retcode: %1", ret); - continue; + continue; } } -- 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] r55750 - /trunk/devtools/devtools/bin/y2autoconf
by mvidner＠svn.opensuse.org 25 Feb '09

25 Feb '09

Author: mvidner Date: Wed Feb 25 16:56:52 2009 New Revision: 55750 URL: http://svn.opensuse.org/viewcvs/yast?rev=55750&view=rev Log: Fixed bootstrapping via Makefile.cvs Modified: trunk/devtools/devtools/bin/y2autoconf Modified: trunk/devtools/devtools/bin/y2autoconf URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/y2autoconf… ============================================================================== --- trunk/devtools/devtools/bin/y2autoconf (original) +++ trunk/devtools/devtools/bin/y2autoconf Wed Feb 25 16:56:52 2009 @@ -398,7 +398,15 @@ ); # mark created packages with the devtools version -my $devtools_version = `y2tool version`; +my $devtools_version; +if ($#ARGV >= 0 && $ARGV[0] eq "--bootstrap") +{ + $devtools_version = $VERSION; +} +else +{ + $devtools_version = `y2tool version`; +} chomp $devtools_version; # main program -- 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] r55749 - /tags/stable-2_18_6/printer/
by jsmeix＠svn.opensuse.org 25 Feb '09

25 Feb '09

Author: jsmeix Date: Wed Feb 25 16:44:30 2009 New Revision: 55749 URL: http://svn.opensuse.org/viewcvs/yast?rev=55749&view=rev Log: Created tag stable-2_18_6 for printer Added: tags/stable-2_18_6/printer/ - copied from r55748, trunk/printer/ -- 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] r55748 - in /trunk/printer: VERSION package/yast2-printer.changes src/Printer.ycp src/basicadd.ycp src/basicmodify.ycp src/connectionwizard.ycp src/helps.ycp src/printer_proposal.ycp
by jsmeix＠svn.opensuse.org 25 Feb '09

25 Feb '09

Author: jsmeix Date: Wed Feb 25 16:44:22 2009 New Revision: 55748 URL: http://svn.opensuse.org/viewcvs/yast?rev=55748&view=rev Log: - Added a "More Drivers" functionality to basicadd.ycp and basicmodify.ycp (see Novell/Suse Bugzilla bnc#468046). - Fixed the test whether there is a valid driver and a valid connection before a queue is set up in printer_proposal.ycp. - 2.18.6 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/Printer.ycp trunk/printer/src/basicadd.ycp trunk/printer/src/basicmodify.ycp trunk/printer/src/connectionwizard.ycp trunk/printer/src/helps.ycp trunk/printer/src/printer_proposal.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=55748&r1=557… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Wed Feb 25 16:44:22 2009 @@ -1 +1 @@ -2.18.5 +2.18.6 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Wed Feb 25 16:44:22 2009 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Feb 25 16:19:45 CET 2009 - jsmeix(a)suse.de + +- Added a "More Drivers" functionality to basicadd.ycp and + basicmodify.ycp (see Novell/Suse Bugzilla bnc#468046). +- Fixed the test whether there is a valid driver and a valid + connection before a queue is set up in printer_proposal.ycp. +- 2.18.6 + +------------------------------------------------------------------- Tue Feb 17 12:34:16 CET 2009 - jsmeix(a)suse.de - Removed Firewall Settings which were added in version 2.17.29 Modified: trunk/printer/src/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printer.ycp?rev=5574… ============================================================================== --- trunk/printer/src/Printer.ycp (original) +++ trunk/printer/src/Printer.ycp Wed Feb 25 16:44:22 2009 @@ -108,6 +108,67 @@ global string lower_alnum_chars = number_chars + lower_chars; /** + * Explicite listing of all known manufacturers in a standard installation + * which one gets as output from the command + * lpinfo -l -m | grep make-and-model | cut -s -d '=' -f 2 | cut -s -d ' ' -f 2 | sort -f -u + * and then a bit changing it (in particular removing duplicates and nonsense entries). + * The current list was made on openSUSE 11.0. + */ +global list< string > known_manufacturers = [ "Generic", + "Alps", + "Anitech", + "Apollo", + "Apple", + "Brother", + "Canon", + "Citizen", + "CItoh", + "Compaq", + "DEC", + "Dell", + "Dymo", + "Epson", + "Fujifilm", + "Fujitsu", + "Gestetner", + "Heidelberg", + "Hitachi", + "HP", + "IBM", + "Infotec", + "Kodak", + "KS", + "Kyocera", + "Lanier", + "Lexmark", + "Minolta", + "Mitsubishi", + "NEC", + "NRG", + "Oce", + "Oki", + "Olivetti", + "Olympus", + "Panasonic", + "PCPI", + "QMS", + "Raven", + "Ricoh", + "Samsung", + "Savin", + "Seiko", + "Sharp", + "Shinko", + "Sony", + "Star", + "Tally", + "Tektronix", + "Toshiba", + "Xerox", + "Zebra" + ]; + +/** * PPD database: * the database is created anew in Printer::CreateDatabase() which calls * the bash script "/usr/lib/YaST2/bin/create_ppd_database" @@ -1233,8 +1294,8 @@ ); if( size( driver_items ) == 0 ) { // If the driver_items list is empty (e.g. because of a too restrictive driver_filter_string), - // show a meaningful text as fallback entry. - driver_string = _("No matching driver found."); + // show a meaningful text as fallback entry ('More Drivers' is a button label). + driver_string = _("No matching driver found. Change the search string or try 'More Drivers'."); driver_items = [ `item( `id( -1 ), driver_string ) ]; // Invalidate selected_ppds_index to be on the safe side. // Otherwise it is possible to set up a queue with a previously selected driver @@ -1616,7 +1677,7 @@ * Add new queue or overwrite existing queue * @return true on success */ -global boolean AddQueue( string queue_name ) +global boolean AddQueue( string queue_name, string default_paper_size ) { // Delete ' characters because they are used for quoting in the bash commandline below: queue_name = deletechars( queue_name, "'" ); string uri = deletechars( connections[selected_connections_index,"uri"]:"", "'" ); @@ -1659,6 +1720,25 @@ Printerlib::ExecuteBashCommand( "/usr/sbin/lpadmin -h localhost -x '" + queue_name + "'" ); return false; } + // Try to set the requested default_paper_size if it is an available choice for this queue. + // If no default_paper_size is requested, the CUPS default is used. + // For the CUPS 1.3 default see http://www.cups.org/str.php?L2846 + // For CUPS 1.4 the default depends on the "DefaultPaperSize" setting in cupsd.conf + // see https://bugzilla.novell.com/show_bug.cgi?id=395760 + // and http://www.cups.org/str.php?L2848 + if( "" != default_paper_size ) + { // The following command fails intentionally if the queue has no PPD file - i.e. when it is a "raw" queue + // (a queue with a "System V style interface script" cannot be set up with YaST). + // '\>' is used to find an available choice also when it is the last value on the line. + // Note the YCP quoting: \\< becomes \< and \\> becomes \> in the commandline. + commandline = "lpoptions -h localhost -p '" + queue_name + "' -l | grep '^PageSize.*\\<" + default_paper_size + "\\>'"; + if( Printerlib::ExecuteBashCommand( commandline ) ) + { commandline = "/usr/sbin/lpadmin -h localhost -p '" + queue_name + "' -o 'PageSize=" + default_paper_size + "'"; + // Do not care if it fails to set the default_paper_size (i.e. show no error message to the user) + // because the default_paper_size setting is nice to have but not mandatoty for a working queue: + Printerlib::ExecuteBashCommand( commandline ); + } + } return true; } Modified: trunk/printer/src/basicadd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicadd.ycp?rev=557… ============================================================================== --- trunk/printer/src/basicadd.ycp (original) +++ trunk/printer/src/basicadd.ycp Wed Feb 25 16:44:22 2009 @@ -110,39 +110,47 @@ ), `VStretch(), `VBox - ( `HBox - ( `ReplacePoint + ( `Left + ( `Label + ( // Caption for a printer driver selection: + _("Assign Driver") + ) + ), + `HBox + ( `PushButton + ( `id(`apply_driver_filter), + // This button must be the default + // (it is activated when the user pressed the Enter key) + // because when the user has clicked into TextEntry to enter something + // it is normal to finish entering by pressing the Enter key + // but if the Enter key was linked to 'Next' or 'Back', + // the user would get the wrong action. + `opt(`default), + // Label of a PushButton to search a list for a search string + // and then show the search result: + _("&Search") + ), + `ReplacePoint ( `id(`driver_filter_input_replace_point), `InputField - ( `id(`driver_filter_input), `opt(`hstretch), - // Caption for a printer driver selection: - _("Search for &Drivers"), + ( `id(`driver_filter_input), + `opt(`hstretch), + // No InputField header because there is the "Caption for a printer driver selection": + "", driver_filter_input_text ) ), - `VBox - ( `Label(""), - `HBox - ( `PushButton - ( `id(`apply_driver_filter), - // This button must be the default - // (it is activated when the user pressed the Enter key) - // because when the user has clicked into TextEntry to enter something - // it is normal to finish entering by pressing the Enter key - // but if the Enter key was linked to 'Next' or 'Back', - // the user would get the wrong action. - `opt(`default), - // Label of a PushButton to search a list for a search string - // and then show the search result: - _("&Show Matching Drivers") - ), - `PushButton - ( `id(`add_driver), - // Label of a PushButton to go to the "Add Driver" dialog - // to install a new driver (and perhaps download it before): - _("&Add Driver") - ) - ) + `HStretch(), + `PushButton + ( `id(`more_drivers), + // Label of a PushButton to show more available printer drivers: + _("More &Drivers") + ), + `PushButton + ( `id(`add_driver), + // Label of a PushButton to go to the "Add Driver" dialog + // to install a new driver (and perhaps download it before): + _("&Add Driver") ) ), `ReplacePoint @@ -157,20 +165,39 @@ "", [ `item( `id( -1 ), _("Select a driver.") ) ] ) + ), + `RadioButtonGroup + ( `id(`paper_size_radio_buttons), + `HBox + ( `Label + ( // Label of a RadioButtonGroup to specify the default paper size: + _("Default paper size (if printer and driver supports it)") + ), + // Have none of the RadioButtons preselected which means that + // by default the CUPS default is used for the default paper size. + // For the CUPS 1.3 default see http://www.cups.org/str.php?L2846 + // For CUPS 1.4 the default depends on the "DefaultPaperSize" setting in cupsd.conf + // see https://bugzilla.novell.com/show_bug.cgi?id=395760 + // and http://www.cups.org/str.php?L2848 + `HSpacing( 2 ), + `RadioButton( `id(`a4), "A&4" ), + `HSpacing( 1 ), + `RadioButton( `id(`letter), "Le&tter" ), + `HStretch() + ) ) ), `VStretch(), - `HBox + `Left ( `ReplacePoint ( `id(`queue_name_input_replace_point), - `TextEntry + `InputField ( `id(`queue_name_input), // Header of a TextEntry to enter the queue name: _("Set &Name"), queue_name_proposal ) - ), - `HStretch() + ) ) ); // According to http://en.opensuse.org/YaST/Style_Guide#Single_Configuration.2FOverview.2FE… @@ -259,10 +286,18 @@ } queue_name = validated_queue_name; } + string default_paper_size = ""; + any paper_size = UI::QueryWidget( `id(`paper_size_radio_buttons), `CurrentButton ); + if( `a4 == paper_size ) + { default_paper_size = "A4"; + } + if( `letter == paper_size ) + { default_paper_size = "Letter"; + } Wizard::DisableBackButton(); Wizard::DisableNextButton(); // No error messages here because Printer::AddQueue already shows them: - Printer::AddQueue( queue_name ); + Printer::AddQueue( queue_name, default_paper_size ); // After a local queue was added, enforce to show also local queues // in particular when no local queues were shown before: Printer::queue_filter_show_local = true; @@ -333,10 +368,20 @@ { queue_name_proposal = Printer::NewQueueName( tolower( model ) ); driver_filter_input_text = model; driver_filter_string = filterchars( tolower( model ), Printer::lower_alnum_chars ); - // Match at the beginning also if the connection is from the connection wizard - // because here the model is only the manufacturer name (or "Generic" or "Raw Queue") - // so that match at the beginning is exactly right for connections from the connection wizard: - driver_filter_string = "^" + driver_filter_string; + // The first word in the driver_filter_string is usually the first word of the manufacturer name. + // This fuzzy match is intended so that e.g. "Kyocera" and "Kyocera Mita" result the same. + string manufacturer = splitstring( driver_filter_string, " " )[0]:""; + // Match at the beginning only if the first word in the driver_filter_string + // is actually a known manufacturer name + // (there is only "Kyocera" but not "Kyocera Mita" in the known_manufacturers list). + foreach( string known_manufacturer, + Printer::known_manufacturers, + { if( manufacturer == tolower( known_manufacturer ) ) + { driver_filter_string = "^" + driver_filter_string; + break; + } + } + ); } if( "" == driver_filter_string ) { // Set a fallback driver_filter_string which does not match to anything @@ -348,8 +393,8 @@ UI::ReplaceWidget( `id(`driver_filter_input_replace_point), `InputField ( `id(`driver_filter_input), `opt(`hstretch), - // Caption for a printer driver selection: - _("Search for &Drivers"), + // No InputField header because there is the "Caption for a printer driver selection": + "", driver_filter_input_text ) ); @@ -365,11 +410,12 @@ ) ); UI::ReplaceWidget( `id(`queue_name_input_replace_point), - `TextEntry( `id(`queue_name_input), - // Header of a TextEntry to enter the queue name: - _("Set &Name"), - queue_name_proposal - ) + `InputField + ( `id(`queue_name_input), + // Header of a TextEntry to enter the queue name: + _("Set &Name"), + queue_name_proposal + ) ); continue; } @@ -400,8 +446,8 @@ UI::ReplaceWidget( `id(`driver_filter_input_replace_point), `InputField ( `id(`driver_filter_input), `opt(`hstretch), - // Caption for a printer driver selection: - _("Search for &Drivers"), + // No InputField header because there is the "Caption for a printer driver selection": + "", driver_filter_input_text ) ); @@ -418,6 +464,153 @@ ); continue; } + if( ret == `more_drivers ) + { driver_filter_string = ""; + boolean valid_driver_found = false; + list driver_items = []; + // Use the existing value of model because for each subsequent run of this more_drivers section + // the existing value of model is shortened at the end (the last word is removed) to get + // more and mor derivers for each subsequent run of this more_drivers section. + y2milestone( "More drivers for '%1'", model ); + if( "" != model + && "unknown" != tolower( model ) + ) + { // If the model string does not contain a space, + // model_words is a singleton list which contains only model. + list <string> model_words = splitstring( model, " " ); + if( size( model_words ) >= 2 ) + { // If there are less than two words the following does not make sense. + // Try to find the word which contains a model number. + // This is usually the first word which contains a number. + string model_number_word = ""; + foreach( string word, + model_words, + { if( "" != filterchars( word, Printer::number_chars ) ) + { model_number_word = word; + break; + } + } + ); + // Provide visible feeback what is going on: + UI::ReplaceWidget( `id(`driver_filter_input_replace_point), + `InputField + ( `id(`driver_filter_input), + `opt(`hstretch), + // No InputField header because there is the "Caption for a printer driver selection": + "", + model_number_word + ) + ); + driver_filter_string = filterchars( tolower( model_number_word ), Printer::lower_alnum_chars ); + if( "" != driver_filter_string ) + { driver_items = Printer::DriverItems( driver_filter_string, true ); + // Printer::DriverItems may result a driver_items list with one single element + // [ `item( `id( -1 ), _("No matching driver found.") ) ] + // to show at least a meaningful text as fallback entry to the user + // or Printer::DriverItems may result a driver_items list with the first item + // [ `item( `id( -1 ), _("Select a driver.") ), ... ] + // when Printer::DriverItems could not preselect a driver item. + // If a valid driver was found (but perhaps none was preselected), + // there would be a non-negative id value of the first or second element + // which is driver_items[0,0,0] or driver_items[1,0,0] + // (id[0] is the value of the id, see the comment in Printer::DriverItems). + if( driver_items[0,0,0]:-1 >= 0 + || driver_items[1,0,0]:-1 >= 0 + ) + { valid_driver_found = true; + } + } + } + } + // Use the manufacturer when the existing value of model cannot be used + // or when nothing was found above: + if( ! valid_driver_found ) + { driver_filter_string = ""; + string model = Printer::connections[Printer::selected_connections_index,"model"]:""; + if( "" != model + && "unknown" != tolower( model ) + ) + { // The first word in the driver_filter_string is usually the first word of the manufacturer name. + // This fuzzy match is intended so that e.g. "Kyocera" and "Kyocera Mita" are the same. + string manufacturer = splitstring( model, " " )[0]:""; + if( "" != manufacturer ) + { // Even more fuzziness for very ambiguous manufacturer names: + if( "hewlett" == substring( tolower( driver_filter_string ), 0, 7 ) ) + { // Let "Hewlett-Packard", "Hewlett Packard", and "HP be the same: + manufacturer = "HP"; + } + if( "oki" == substring( tolower( driver_filter_string ), 0, 3 ) ) + { // Let "Oki", "Okidata", and "Okipage" be the same: + manufacturer = "Oki"; + } + driver_filter_string = tolower( manufacturer ); + // Match at the beginning only if the driver_filter_string is actually a known manufacturer: + foreach( string known_manufacturer, + Printer::known_manufacturers, + { if( driver_filter_string == tolower( known_manufacturer ) ) + { driver_filter_string = "^" + driver_filter_string; + break; + } + } + ); + // Provide visible feeback what is going on: + UI::ReplaceWidget( `id(`driver_filter_input_replace_point), + `InputField + ( `id(`driver_filter_input), + `opt(`hstretch), + // No InputField header because there is the "Caption for a printer driver selection": + "", + manufacturer + ) + ); + driver_items = Printer::DriverItems( driver_filter_string, true ); + // Printer::DriverItems may result a driver_items list with one single element + // [ `item( `id( -1 ), _("No matching driver found.") ) ] + // to show at least a meaningful text as fallback entry to the user + // or Printer::DriverItems may result a driver_items list with the first item + // [ `item( `id( -1 ), _("Select a driver.") ), ... ] + // when Printer::DriverItems could not preselect a driver item. + // If a valid driver was found (but perhaps none was preselected), + // there would be a non-negative id value of the first or second element + // which is driver_items[0,0,0] or driver_items[1,0,0] + // (id[0] is the value of the id, see the comment in Printer::DriverItems). + if( driver_items[0,0,0]:-1 >= 0 + || driver_items[1,0,0]:-1 >= 0 + ) + { valid_driver_found = true; + } + } + } + } + // Nothing was found above. + // Fall back to show all drivers: + if( ! valid_driver_found ) + { // Provide visible feeback what is going on: + UI::ReplaceWidget( `id(`driver_filter_input_replace_point), + `InputField + ( `id(`driver_filter_input), + `opt(`hstretch), + // No InputField header because there is the "Caption for a printer driver selection": + "", + _("any model") + ) + ); + driver_items = Printer::DriverItems( "", true ); + } + UI::ReplaceWidget( `id(`driver_selection_replace_point), + `SelectionBox + ( `id(`driver_selection), + // By default there is no UserInput() + // if only something was selected in the SelectionBox + // (without clicking additionally a button) + // but the notify option forces UserInput() in this case: + `opt(`notify), + "", + driver_items + ) + ); + continue; + } y2milestone( "Ignoring unexpected returncode in BasicAddDialog: %1", ret ); continue; } Modified: trunk/printer/src/basicmodify.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicmodify.ycp?rev=… ============================================================================== --- trunk/printer/src/basicmodify.ycp (original) +++ trunk/printer/src/basicmodify.ycp Wed Feb 25 16:44:22 2009 @@ -293,39 +293,10 @@ ), `VStretch(), `VBox - ( `HBox - ( `ReplacePoint - ( `id(`driver_filter_input_replace_point), - `InputField - ( `id(`driver_filter_input), `opt(`hstretch), - // Caption for a printer driver selection: - _("Search for &Drivers"), - driver_filter_input_text - ) - ), - `VBox - ( `Label(""), - `HBox - ( `PushButton - ( `id(`apply_driver_filter), - // This button must be the default - // (it is activated when the user pressed the Enter key) - // because when the user has clicked into TextEntry to enter something - // it is normal to finish entering by pressing the Enter key - // but if the Enter key was linked to 'Next' or 'Back', - // the user would get the wrong action. - `opt(`default), - // Label of a PushButton to search a list for a search string - // and then show the search result: - _("&Show Matching Drivers") - ), - `PushButton - ( `id(`add_driver), - // Label of a PushButton to go to the "Add Driver" dialog - // to install a new driver (and perhaps download it before): - _("&Add Driver") - ) - ) + ( `Left + ( `Label + ( // Caption for a printer driver selection: + _("Driver") ) ), `ReplacePoint @@ -335,6 +306,43 @@ `Left( driver_options_content ) ) ), + `HBox + ( `PushButton + ( `id(`apply_driver_filter), + // This button must be the default + // (it is activated when the user pressed the Enter key) + // because when the user has clicked into TextEntry to enter something + // it is normal to finish entering by pressing the Enter key + // but if the Enter key was linked to 'Next' or 'Back', + // the user would get the wrong action. + `opt(`default), + // Label of a PushButton to search a list for a search string + // and then show the search result: + _("&Search") + ), + `ReplacePoint + ( `id(`driver_filter_input_replace_point), + `InputField + ( `id(`driver_filter_input), + `opt(`hstretch), + // No InputField header because there is the "Caption for a printer driver selection": + "", + driver_filter_input_text + ) + ), + `HStretch(), + `PushButton + ( `id(`more_drivers), + // Label of a PushButton to show more available printer drivers: + _("More &Drivers") + ), + `PushButton + ( `id(`add_driver), + // Label of a PushButton to go to the "Add Driver" dialog + // to install a new driver (and perhaps download it before): + _("&Add Driver") + ) + ), `ReplacePoint ( `id(`driver_selection_replace_point), `SelectionBox @@ -674,12 +682,13 @@ driver_filter_string = "qqqqqqqqqq"; } UI::ReplaceWidget( `id(`driver_filter_input_replace_point), - `InputField - ( `id(`driver_filter_input), `opt(`hstretch), - // Caption for a printer driver selection: - _("Search for &Drivers"), - driver_filter_input_text - ) + `InputField + ( `id(`driver_filter_input), + `opt(`hstretch), + // No InputField header because there is the "Caption for a printer driver selection": + "", + driver_filter_input_text + ) ); UI::ReplaceWidget( `id(`driver_selection_replace_point), `SelectionBox( `id(`driver_selection), @@ -805,12 +814,13 @@ { driver_filter_input_text = _("any model"); } UI::ReplaceWidget( `id(`driver_filter_input_replace_point), - `InputField - ( `id(`driver_filter_input), `opt(`hstretch), - // Caption for a printer driver selection: - _("Search for &Drivers"), - driver_filter_input_text - ) + `InputField + ( `id(`driver_filter_input), + `opt(`hstretch), + // No InputField header because there is the "Caption for a printer driver selection": + "", + driver_filter_input_text + ) ); UI::ReplaceWidget( `id(`driver_selection_replace_point), `SelectionBox( `id(`driver_selection), @@ -827,6 +837,153 @@ ); continue; } + if( ret == `more_drivers ) + { driver_filter_string = ""; + boolean valid_driver_found = false; + list driver_items = []; + // Use the existing value of model because for each subsequent run of this more_drivers section + // the existing value of model is shortened at the end (the last word is removed) to get + // more and mor derivers for each subsequent run of this more_drivers section. + y2milestone( "More drivers for '%1'", model ); + if( "" != model + && "unknown" != tolower( model ) + ) + { // If the model string does not contain a space, + // model_words is a singleton list which contains only model. + list <string> model_words = splitstring( model, " " ); + if( size( model_words ) >= 2 ) + { // If there are less than two words the following does not make sense. + // Try to find the word which contains a model number. + // This is usually the first word which contains a number. + string model_number_word = ""; + foreach( string word, + model_words, + { if( "" != filterchars( word, Printer::number_chars ) ) + { model_number_word = word; + break; + } + } + ); + // Provide visible feeback what is going on: + UI::ReplaceWidget( `id(`driver_filter_input_replace_point), + `InputField + ( `id(`driver_filter_input), + `opt(`hstretch), + // No InputField header because there is the "Caption for a printer driver selection": + "", + model_number_word + ) + ); + driver_filter_string = filterchars( tolower( model_number_word ), Printer::lower_alnum_chars ); + if( "" != driver_filter_string ) + { driver_items = Printer::DriverItems( driver_filter_string, true ); + // Printer::DriverItems may result a driver_items list with one single element + // [ `item( `id( -1 ), _("No matching driver found.") ) ] + // to show at least a meaningful text as fallback entry to the user + // or Printer::DriverItems may result a driver_items list with the first item + // [ `item( `id( -1 ), _("Select a driver.") ), ... ] + // when Printer::DriverItems could not preselect a driver item. + // If a valid driver was found (but perhaps none was preselected), + // there would be a non-negative id value of the first or second element + // which is driver_items[0,0,0] or driver_items[1,0,0] + // (id[0] is the value of the id, see the comment in Printer::DriverItems). + if( driver_items[0,0,0]:-1 >= 0 + || driver_items[1,0,0]:-1 >= 0 + ) + { valid_driver_found = true; + } + } + } + } + // Use the manufacturer when the existing value of model cannot be used + // or when nothing was found above: + if( ! valid_driver_found ) + { driver_filter_string = ""; + string model = Printer::connections[Printer::selected_connections_index,"model"]:""; + if( "" != model + && "unknown" != tolower( model ) + ) + { // The first word in the driver_filter_string is usually the first word of the manufacturer name. + // This fuzzy match is intended so that e.g. "Kyocera" and "Kyocera Mita" are the same. + string manufacturer = splitstring( model, " " )[0]:""; + if( "" != manufacturer ) + { // Even more fuzziness for very ambiguous manufacturer names: + if( "hewlett" == substring( tolower( driver_filter_string ), 0, 7 ) ) + { // Let "Hewlett-Packard", "Hewlett Packard", and "HP be the same: + manufacturer = "HP"; + } + if( "oki" == substring( tolower( driver_filter_string ), 0, 3 ) ) + { // Let "Oki", "Okidata", and "Okipage" be the same: + manufacturer = "Oki"; + } + driver_filter_string = tolower( manufacturer ); + // Match at the beginning only if the driver_filter_string is actually a known manufacturer: + foreach( string known_manufacturer, + Printer::known_manufacturers, + { if( driver_filter_string == tolower( known_manufacturer ) ) + { driver_filter_string = "^" + driver_filter_string; + break; + } + } + ); + // Provide visible feeback what is going on: + UI::ReplaceWidget( `id(`driver_filter_input_replace_point), + `InputField + ( `id(`driver_filter_input), + `opt(`hstretch), + // No InputField header because there is the "Caption for a printer driver selection": + "", + manufacturer + ) + ); + driver_items = Printer::DriverItems( driver_filter_string, true ); + // Printer::DriverItems may result a driver_items list with one single element + // [ `item( `id( -1 ), _("No matching driver found.") ) ] + // to show at least a meaningful text as fallback entry to the user + // or Printer::DriverItems may result a driver_items list with the first item + // [ `item( `id( -1 ), _("Select a driver.") ), ... ] + // when Printer::DriverItems could not preselect a driver item. + // If a valid driver was found (but perhaps none was preselected), + // there would be a non-negative id value of the first or second element + // which is driver_items[0,0,0] or driver_items[1,0,0] + // (id[0] is the value of the id, see the comment in Printer::DriverItems). + if( driver_items[0,0,0]:-1 >= 0 + || driver_items[1,0,0]:-1 >= 0 + ) + { valid_driver_found = true; + } + } + } + } + // Nothing was found above. + // Fall back to show all drivers: + if( ! valid_driver_found ) + { // Provide visible feeback what is going on: + UI::ReplaceWidget( `id(`driver_filter_input_replace_point), + `InputField + ( `id(`driver_filter_input), + `opt(`hstretch), + // No InputField header because there is the "Caption for a printer driver selection": + "", + _("any model") + ) + ); + driver_items = Printer::DriverItems( "", true ); + } + UI::ReplaceWidget( `id(`driver_selection_replace_point), + `SelectionBox + ( `id(`driver_selection), + // By default there is no UserInput() + // if only something was selected in the SelectionBox + // (without clicking additionally a button) + // but the notify option forces UserInput() in this case: + `opt(`notify), + "", + driver_items + ) + ); + continue; + } y2milestone( "Ignoring unexpected returncode in BasicModifyDialog: %1", ret ); continue; } Modified: trunk/printer/src/connectionwizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/connectionwizard.ycp… ============================================================================== --- trunk/printer/src/connectionwizard.ycp (original) +++ trunk/printer/src/connectionwizard.ycp Wed Feb 25 16:44:22 2009 @@ -42,61 +42,8 @@ string connection_uri=""; string connection_model=""; -list< string > known_manufacturers = [ "Generic", - "Alps", - "Anitech", - "Apollo", - "Apple", - "Brother", - "Canon", - "Citizen", - "CItoh", - "Compaq", - "DEC", - "Dell", - "Dymo", - "Epson", - "Fujifilm", - "Fujitsu", - "Gestetner", - "Heidelberg", - "Hitachi", - "HP", - "IBM", - "Infotec", - "Kodak", - "KS", - "Kyocera", - "Lanier", - "Lexmark", - "Minolta", - "Mitsubishi", - "NEC", - "NRG", - "Oce", - "Oki", - "Olivetti", - "Olympus", - "Panasonic", - "PCPI", - "QMS", - "Raven", - "Ricoh", - "Samsung", - "Savin", - "Seiko", - "Sharp", - "Shinko", - "Sony", - "Star", - "Tally", - "Tektronix", - "Toshiba", - "Xerox", - "Zebra" - ]; -list< string > manufacturers_for_using_driver = prepend( add( known_manufacturers, "Raw Queue" ), "" ); -list< string > manufacturers_for_raw_queue = prepend( known_manufacturers, "Raw Queue" ); +list< string > manufacturers_for_using_driver = prepend( add( Printer::known_manufacturers, "Raw Queue" ), "" ); +list< string > manufacturers_for_raw_queue = prepend( Printer::known_manufacturers, "Raw Queue" ); string getCurrentDeviceURI() { if( "" != Printer::connections[Printer::selected_connections_index,"uri"]:"") @@ -139,7 +86,7 @@ `opt(`editable), // Header for a ComboBox to keep the printer model or select another manufacturer: _("Keep the printer model or select another &manufacturer"), - prepend( add( known_manufacturers, "Raw Queue" ), current_model_info ) + prepend( add( Printer::known_manufacturers, "Raw Queue" ), current_model_info ) ) ); } Modified: trunk/printer/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/helps.ycp?rev=55748&… ============================================================================== --- trunk/printer/src/helps.ycp (original) +++ trunk/printer/src/helps.ycp Wed Feb 25 16:44:22 2009 @@ -62,9 +62,7 @@ It is possible to have several different print queues for the same printer device. For example a second queue with a monochrome-only driver for a color device -or a PostScript queue and a queue with a PCL driver for a PostScript+PCL -printer or a queue to print on one side only of a sheet of paper and one for two sided -printing. +or a PostScript queue and a queue with a PCL driver for a PostScript+PCL printer. </p>") + // Overview dialog help 2/7: _("<p> Modified: trunk/printer/src/printer_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printer_proposal.ycp… ============================================================================== --- trunk/printer/src/printer_proposal.ycp (original) +++ trunk/printer/src/printer_proposal.ycp Wed Feb 25 16:44:22 2009 @@ -214,12 +214,25 @@ string driver_filter_string = "^" + filterchars( tolower( model ), Printer::lower_alnum_chars ); if( "^" != driver_filter_string ) { list drivers = Printer::DriverItems( driver_filter_string, true ); - if( size(drivers) > 0 ) - { y2internal("Available drivers: %1", drivers); - y2internal("Selected driver: %1", drivers[0]:nil); - Printer::selected_ppds_index = drivers[0,0,0]:-1; - Printer::selected_connections_index = printer[0,0]:-1; - if( Printer::AddQueue( queue_name ) ) + // Printer::DriverItems may result a drivers list with one single element + // [ `item( `id( -1 ), _("No matching driver found.") ) ] + // to show at least a meaningful text as fallback entry to the user + // or Printer::DriverItems may result a drivers list with the first item + // [ `item( `id( -1 ), _("Select a driver.") ), ... ] + // when Printer::DriverItems could not preselect a driver item. + // In contrast if a valid driver was found and preselected, there would be + // a non-negative id value of the first element which is drivers[0,0,0] + // (id[0] is the value of the id, see the comment in Printer::DriverItems). + // Only a test if both selected_ppds_index and selected_connections_index + // are non-negative makes sure that there is a valid driver and a valid connection. + y2internal("Available drivers: %1", drivers); + Printer::selected_ppds_index = drivers[0,0,0]:-1; + Printer::selected_connections_index = printer[0,0]:-1; + if( Printer::selected_ppds_index >= 0 + && Printer::selected_connections_index >= 0 + ) + { y2internal("Selected driver: %1", drivers[0]:nil); + if( Printer::AddQueue( queue_name, "" ) ) { already_set_up_uris = add( already_set_up_uris, uri ); // Autodetect queues again so that Printer::NewQueueName // can compare with existing queue names but ignore whatever failures -- 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] r55747 - /trunk/core/base/tools/tty_wrapper/tty_wrapper.cc
by mvidner＠svn.opensuse.org 25 Feb '09

25 Feb '09

Author: mvidner Date: Wed Feb 25 15:40:00 2009 New Revision: 55747 URL: http://svn.opensuse.org/viewcvs/yast?rev=55747&view=rev Log: Also take care of the input part, when finishing (bnc#470645). Modified: trunk/core/base/tools/tty_wrapper/tty_wrapper.cc Modified: trunk/core/base/tools/tty_wrapper/tty_wrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/base/tools/tty_wrapper/tty_… ============================================================================== --- trunk/core/base/tools/tty_wrapper/tty_wrapper.cc (original) +++ trunk/core/base/tools/tty_wrapper/tty_wrapper.cc Wed Feb 25 15:40:00 2009 @@ -145,6 +145,11 @@ if (finish) { + // read the remaining pieces + std::string std_out(subprocess.read()); + output(std_out, 1); + std::string err_out(subprocess.readErr()); + output(err_out, 2); // SIGCHLD received, return the exit status return subprocess.close(); } -- 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] r55746 - /tags/branch-Code-11-2_17_73/network/
by jsrain＠svn.opensuse.org 25 Feb '09

25 Feb '09

Author: jsrain Date: Wed Feb 25 14:56:15 2009 New Revision: 55746 URL: http://svn.opensuse.org/viewcvs/yast?rev=55746&view=rev Log: Created tag branch-Code-11-2_17_73 for network Added: tags/branch-Code-11-2_17_73/network/ - copied from r55745, branches/SuSE-Code-11-Branch/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0