July 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r49504 - /trunk/core/agent-resolver/doc/resolveragent.txt
by mvidner＠svn.opensuse.org 30 Jul '08

30 Jul '08

Author: mvidner Date: Wed Jul 30 10:39:10 2008 New Revision: 49504 URL: http://svn.opensuse.org/viewcvs/yast?rev=49504&view=rev Log: converted to HTML Modified: trunk/core/agent-resolver/doc/resolveragent.txt Modified: trunk/core/agent-resolver/doc/resolveragent.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-resolver/doc/resolver… ============================================================================== --- trunk/core/agent-resolver/doc/resolveragent.txt (original) +++ trunk/core/agent-resolver/doc/resolveragent.txt Wed Jul 30 10:39:10 2008 @@ -1,3 +1,4 @@ +<pre> Some notes about the resolver agent General @@ -55,20 +56,21 @@ To write info paths -Write(.resolver.modified, <string>) -Write(.resolver.backup, <string>) -Write(.resolver.process, <string>) -Write(.resolver.process_id, <string>) -Write(.resolver.script, <string>) -Write(.resolver.info, <string>) +Write(.resolver.modified, <i>string</i>) +Write(.resolver.backup, <i>string</i>) +Write(.resolver.process, <i>string</i>) +Write(.resolver.process_id, <i>string</i>) +Write(.resolver.script, <i>string</i>) +Write(.resolver.info, <i>string</i>) -Write(.resolver.write_header, <boolean>) +Write(.resolver.write_header, <i>boolean</i>) just change the in-memory copy of /etc/resolv.conf Use -Write (.resolv, <any value>) +Write (.resolv, <i>any value</i>) to 'flush' the data to /etc/resolv.conf. This is also done when un-mounting the agent. +</pre> -- 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] r49503 - /trunk/core/agent-dummy/doc/dummyagent.txt
by mvidner＠svn.opensuse.org 30 Jul '08

30 Jul '08

Author: mvidner Date: Wed Jul 30 10:28:08 2008 New Revision: 49503 URL: http://svn.opensuse.org/viewcvs/yast?rev=49503&view=rev Log: converted to HTML Modified: trunk/core/agent-dummy/doc/dummyagent.txt Modified: trunk/core/agent-dummy/doc/dummyagent.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-dummy/doc/dummyagent.… ============================================================================== --- trunk/core/agent-dummy/doc/dummyagent.txt (original) +++ trunk/core/agent-dummy/doc/dummyagent.txt Wed Jul 30 10:28:08 2008 @@ -1,5 +1,6 @@ -Interface Specification For Dummy-Agent -======================================= +<title>Interface Specification For Dummy-Agent</title> +<h1>Interface Specification For Dummy-Agent</h1> +<pre> $Id$ 1. What is the dummy-agent? @@ -107,3 +108,4 @@ DataMap( [ map read1, map read2, ... ], any default); ... +</pre> -- 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] r49502 - in /trunk/packager: package/yast2-packager.changes src/clients/repositories.ycp
by lslezak＠svn.opensuse.org 30 Jul '08

30 Jul '08

Author: lslezak Date: Wed Jul 30 09:37:46 2008 New Revision: 49502 URL: http://svn.opensuse.org/viewcvs/yast?rev=49502&view=rev Log: - display autorefresh column in the repository config module (bnc#384132) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/repositories.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Jul 30 09:37:46 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jul 30 09:36:40 CEST 2008 - lslezak(a)suse.cz + +- display autorefresh column in the repository config module + (bnc#384132) + +------------------------------------------------------------------- Tue Jul 29 07:10:57 CEST 2008 - lslezak(a)suse.cz - added yast2-transfer to BuildRequires Modified: trunk/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositorie… ============================================================================== --- trunk/packager/src/clients/repositories.ycp (original) +++ trunk/packager/src/clients/repositories.ycp Wed Jul 30 09:37:46 2008 @@ -129,6 +129,7 @@ PriorityToString(priority), // corresponds to the "Enable/Disable" button source[ "enabled" ]:true ? UI::Glyph (`CheckMark) : "", + source[ "autorefresh" ]:true ? UI::Glyph (`CheckMark) : "", // translators: unknown name for a given source alias, generalData[ "url" ]:"" @@ -372,7 +373,10 @@ // table header - priority of the repository - keep the translation as short as possible! _("Priority"), // table header - is the repo enabled? - keep the translation as short as possible! - _("Enabled"), + `Center(_("Enabled")), + // table header - is autorefresh enabled for the repo? + // keep the translation as short as possible! + `Center(_("Autorefresh")), // table header - name of the repo _("Name"), // table header - URL of the repo -- 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] r49501 - /tags/stable-2_17_0/instserver/
by lslezak＠svn.opensuse.org 30 Jul '08

30 Jul '08

Author: lslezak Date: Wed Jul 30 09:20:22 2008 New Revision: 49501 URL: http://svn.opensuse.org/viewcvs/yast?rev=49501&view=rev Log: Created tag stable-2_17_0 for instserver Added: tags/stable-2_17_0/instserver/ - copied from r49500, trunk/instserver/ -- 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] r49500 - in /trunk/instserver: VERSION package/yast2-instserver.changes src/Instserver.ycp src/dialogs.ycp
by lslezak＠svn.opensuse.org 30 Jul '08

30 Jul '08

Author: lslezak Date: Wed Jul 30 09:18:00 2008 New Revision: 49500 URL: http://svn.opensuse.org/viewcvs/yast?rev=49500&view=rev Log: - fixed service name in the firewallconfiguration, install the needed packages before reading service files (bnc#403377) - added firewall config in the FTP server configuration dialog - 2.17.0 Modified: trunk/instserver/VERSION trunk/instserver/package/yast2-instserver.changes trunk/instserver/src/Instserver.ycp trunk/instserver/src/dialogs.ycp Modified: trunk/instserver/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/VERSION?rev=49500&r1=… ============================================================================== --- trunk/instserver/VERSION (original) +++ trunk/instserver/VERSION Wed Jul 30 09:18:00 2008 @@ -1 +1 @@ -2.16.5 +2.17.0 Modified: trunk/instserver/package/yast2-instserver.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/package/yast2-instser… ============================================================================== --- trunk/instserver/package/yast2-instserver.changes (original) +++ trunk/instserver/package/yast2-instserver.changes Wed Jul 30 09:18:00 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Jul 30 09:13:55 CEST 2008 - lslezak(a)suse.cz + +- fixed service name in the firewallconfiguration, install the + needed packages before reading service files (bnc#403377) +- added firewall config in the FTP server configuration dialog +- 2.17.0 + +------------------------------------------------------------------- Fri May 16 16:40:22 CEST 2008 - jsrain(a)suse.cz - added categories Settings and System into desktop file Modified: trunk/instserver/src/Instserver.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/src/Instserver.ycp?re… ============================================================================== --- trunk/instserver/src/Instserver.ycp (original) +++ trunk/instserver/src/Instserver.ycp Wed Jul 30 09:18:00 2008 @@ -246,20 +246,18 @@ return ret; } -/** - * Setup FTP server - * @param string inst server root - * @param string ftp server root - * @return boolean - */ -global boolean SetupFTP(string dir, string ftproot, string ftpalias) { - +global boolean InstallFTPPackages() +{ string help = _("The FTP installation server requires an FTP server package. The vsftpd package will now be installed. "); if ( !Package::InstalledAll( [ "xinetd", "vsftpd", "openslp-server", "yast2-inetd" ] ) ) { y2milestone("some packages are not installed"); } + else + { + return true; + } if ( !Package::InstallAll( [ "xinetd", "vsftpd" , "openslp-server", "yast2-inetd"])) { Report::Error( Message::CannotContinueWithoutPackagesInstalled() ); @@ -267,6 +265,22 @@ return false; } + return true; +} + +/** + * Setup FTP server + * @param string inst server root + * @param string ftp server root + * @return boolean + */ +global boolean SetupFTP(string dir, string ftproot, string ftpalias) { + + if (!InstallFTPPackages()) + { + return false; + } + // create repository directory if it doesn't exist SCR::Execute(.target.bash, sformat("[ -d %1 ] || /bin/mkdir %1", dir)); @@ -360,15 +374,8 @@ } } - -/** - * Setup HTTP server - * @param string inst server root - * @param string alias - * @return boolean - */ -global boolean SetupHTTP(string dir, string alias) { - +global boolean InstallHTTPPackages() +{ string help = _("The HTTP installation server requires an HTTP server package. The apache2 package will now be installed."); if ( !Package::InstalledAll( [ "apache2" , "openslp-server" ] ) ) { @@ -382,6 +389,22 @@ } } + return true; +} + +/** + * Setup HTTP server + * @param string inst server root + * @param string alias + * @return boolean + */ +global boolean SetupHTTP(string dir, string alias) { + + if (!InstallHTTPPackages()) + { + return false; + } + if ((integer)SCR::Read(.target.size, "/etc/apache2/conf.d/inst_server.conf.in") > 0 ) { string conf = (string)SCR::Read(.target.string, "/etc/apache2/conf.d/inst_server.conf.in"); Modified: trunk/instserver/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/src/dialogs.ycp?rev=4… ============================================================================== --- trunk/instserver/src/dialogs.ycp (original) +++ trunk/instserver/src/dialogs.ycp Wed Jul 30 09:18:00 2008 @@ -1306,7 +1306,7 @@ // firewall widget using CWM map<string, any> fw_settings = $[ - "services": [ "nfs-server" ], + "services": [ "service:nfs-kernel-server" ], "display_details": true, ]; @@ -1382,6 +1382,13 @@ * @return dialog result */ any FtpDialog () { + // firewall widget using CWM + map<string, any> fw_settings = $[ + "services": [ "service:vsftpd" ], + "display_details": true, + ]; + + map<string,any> fw_cwm_widget = CWMFirewallInterfaces::CreateOpenFirewallWidget(fw_settings); /* Instserver configure2 dialog caption */ string caption = _("Installation Server -- FTP"); @@ -1393,7 +1400,9 @@ `HVSquash( `VBox( `Left(`TextEntry(`id(`ftproot), _("&FTP Server Root Directory:"), ftproot )), - `Left(`TextEntry(`id(`ftpalias), _("&Directory Alias:"), ftpalias )) + `Left(`TextEntry(`id(`ftpalias), _("&Directory Alias:"), ftpalias )), + `VSpacing(1), + fw_cwm_widget["custom_widget"]:`Empty() ) ); @@ -1401,10 +1410,24 @@ Wizard::SetContentsButtons(caption, contents, HELPS["ftp"]:"ftp", Label::BackButton(), Label::NextButton()); + // install packages before calling SuSEFirewall::Read() + // to read the service definition file + if (!Instserver::InstallFTPPackages()) + { + y2error("FTP server package is not installed, cannot continue"); + return `abort; + } + + // initialize the firewall widget (set the current value) + CWMFirewallInterfaces::OpenFirewallInit (fw_cwm_widget, ""); + any ret = nil; + map event = $[]; + while(true) { - ret = UI::UserInput(); + event = UI::WaitForEvent(); + ret = event["ID"]:nil; ftproot = (string)UI::QueryWidget(`id(`ftproot), `Value); ftpalias = (string)UI::QueryWidget(`id(`ftpalias), `Value); @@ -1423,6 +1446,8 @@ Instserver::ServerSettings["ftpalias"] = ftpalias; if (!Instserver::ServerSettings["dry"]:false) { + // store the firewall setting, (activation is in SetupFTP()) + CWMFirewallInterfaces::OpenFirewallStore (fw_cwm_widget, "", event); r = Instserver::SetupFTP(Instserver::ServerSettings["directory"]:"" , ftproot , ftpalias); if (!r) { @@ -1434,10 +1459,9 @@ Instserver::modified = true; break; } - else { - y2error("unexpected retcode: %1", ret); - continue; - } + + // handle the events, enable/disable the button, show the popup if the firewall button has been clicked + CWMFirewallInterfaces::OpenFirewallHandle (fw_cwm_widget, "", event); } return ret; @@ -1454,7 +1478,7 @@ // firewall widget using CWM map<string, any> fw_settings = $[ - "services": [ "http" ], + "services": [ "service:apache2" ], "display_details": true, ]; @@ -1481,6 +1505,14 @@ any ret = nil; map event = $[]; + // install packages before calling SuSEFirewall::Read() + // to read the service definition file + if (!Instserver::InstallHTTPPackages()) + { + y2error("HTTP server package is not installed, cannot continue"); + return `abort; + } + while(true) { event = UI::WaitForEvent(); -- 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] r49499 - in /trunk/update: package/yast2-update.changes yast2-update.spec.in
by coolo＠svn.opensuse.org 30 Jul '08

30 Jul '08

Author: coolo Date: Wed Jul 30 07:19:47 2008 New Revision: 49499 URL: http://svn.opensuse.org/viewcvs/yast?rev=49499&view=rev Log: fix file list of package Modified: trunk/update/package/yast2-update.changes trunk/update/yast2-update.spec.in Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.chan… ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Wed Jul 30 07:19:47 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jul 30 07:19:56 CEST 2008 - coolo(a)suse.de + +- fix file list of package + +------------------------------------------------------------------- Thu Jul 24 12:50:06 CEST 2008 - locilka(a)suse.cz - Making possible to upgrade running system using YaST Update even Modified: trunk/update/yast2-update.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/yast2-update.spec.in?rev=… ============================================================================== --- trunk/update/yast2-update.spec.in (original) +++ trunk/update/yast2-update.spec.in Wed Jul 30 07:19:47 2008 @@ -75,6 +75,7 @@ %files FACTORY %defattr(-,root,root) @desktopdir@/update.desktop +%dir /usr/share/YaST2/control /usr/share/YaST2/control/update.xml @clientdir@/update.ycp @clientdir@/run_update.ycp -- 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] r49498 - /trunk/storage/libstorage/bindings/ycp/LibStorage.i
by aschnell＠svn.opensuse.org 29 Jul '08

29 Jul '08

Author: aschnell Date: Tue Jul 29 22:30:48 2008 New Revision: 49498 URL: http://svn.opensuse.org/viewcvs/yast?rev=49498&view=rev Log: - added struct Modified: trunk/storage/libstorage/bindings/ycp/LibStorage.i Modified: trunk/storage/libstorage/bindings/ycp/LibStorage.i URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/bindings/ycp/… ============================================================================== --- trunk/storage/libstorage/bindings/ycp/LibStorage.i (original) +++ trunk/storage/libstorage/bindings/ycp/LibStorage.i Tue Jul 29 22:30:48 2008 @@ -26,6 +26,7 @@ specialize_sequence(storage::LvmLvInfo, TO_PACK, FROM_PACK, CHECK) specialize_sequence(storage::EvmsInfo, TO_PACK, FROM_PACK, CHECK) specialize_sequence(storage::MdInfo, TO_PACK, FROM_PACK, CHECK) +specialize_sequence(storage::MdStateInfo, TO_PACK, FROM_PACK, CHECK) specialize_sequence(storage::LoopInfo, TO_PACK, FROM_PACK, CHECK) specialize_sequence(storage::DmInfo, TO_PACK, FROM_PACK, CHECK) specialize_sequence(storage::NfsInfo, TO_PACK, FROM_PACK, CHECK) -- 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] r49497 - /trunk/storage/libstorage/src/Makefile.am
by aschnell＠svn.opensuse.org 29 Jul '08

29 Jul '08

Author: aschnell Date: Tue Jul 29 22:29:24 2008 New Revision: 49497 URL: http://svn.opensuse.org/viewcvs/yast?rev=49497&view=rev Log: - cleanup Modified: trunk/storage/libstorage/src/Makefile.am Modified: trunk/storage/libstorage/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Makefile.… ============================================================================== --- trunk/storage/libstorage/src/Makefile.am (original) +++ trunk/storage/libstorage/src/Makefile.am Tue Jul 29 22:29:24 2008 @@ -75,10 +75,6 @@ pkgincludedir = $(includedir)/y2storage -# these go to $(pkgincludedir) - pkginclude_HEADERS = StorageInterface.h -#<INSTALL-HEADER-TARGET> - CLEANFILES = $(BUILT_SOURCES) -- 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] r49496 - /trunk/storage/libstorage/src/StorageInterface.h
by aschnell＠svn.opensuse.org 29 Jul '08

29 Jul '08

Author: aschnell Date: Tue Jul 29 22:29:02 2008 New Revision: 49496 URL: http://svn.opensuse.org/viewcvs/yast?rev=49496&view=rev Log: - unfortunately doxygen doesn't support small examples Modified: trunk/storage/libstorage/src/StorageInterface.h Modified: trunk/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageIn… ============================================================================== --- trunk/storage/libstorage/src/StorageInterface.h (original) +++ trunk/storage/libstorage/src/StorageInterface.h Tue Jul 29 22:29:02 2008 @@ -2226,11 +2226,6 @@ * @param precision number of fraction digits in output * @param omit_zeroes if true omit trailing zeroes for exact values * @return formatted string - * - * @example byteToHumanString(128, true, 2, true) -> "128 B" - * @example byteToHumanString(4096, true, 2, true) -> "4 kB" - * @example byteToHumanString(4096, true, 2, false) -> "4.00 kB" - * @example byteToHumanString(1024*1024, true, 2, true) -> "1 MB" */ virtual string byteToHumanString(unsigned long long size, bool classic, int precision, bool omit_zeroes) const = 0; @@ -2242,10 +2237,6 @@ * @param classic use classic locale * @param size size in bytes * @return true on successful conversion - * - * @example humanStringToByte("4kB", true, size) -> true and size = 4*1024 - * @example humanStringToByte("4 MB", true, size) -> true and size = 4*1024*1024 - * @example humanStringToByte("0.5 GB", true, size) -> true and size = 512*1024*1024 */ virtual bool humanStringToByte(const string& str, bool classic, unsigned long long& size) const = 0; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r49495 - in /branches/tmp/dmacvicar/yast-xmlui/libyui: examples/xul/mab.xul examples/xul/mozmail.xul examples/xul/top.xul src/YUIXULReader.cc
by dmacvicar＠svn.opensuse.org 29 Jul '08

29 Jul '08

Author: dmacvicar Date: Tue Jul 29 19:01:37 2008 New Revision: 49495 URL: http://svn.opensuse.org/viewcvs/yast?rev=49495&view=rev Log: some more widgets, thinking continuing using xul, a more one to one description, or both Added: branches/tmp/dmacvicar/yast-xmlui/libyui/examples/xul/mab.xul branches/tmp/dmacvicar/yast-xmlui/libyui/examples/xul/mozmail.xul branches/tmp/dmacvicar/yast-xmlui/libyui/examples/xul/top.xul Modified: branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUIXULReader.cc Added: branches/tmp/dmacvicar/yast-xmlui/libyui/examples/xul/mab.xul URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast-xmlui/liby… ============================================================================== --- branches/tmp/dmacvicar/yast-xmlui/libyui/examples/xul/mab.xul (added) +++ branches/tmp/dmacvicar/yast-xmlui/libyui/examples/xul/mab.xul Tue Jul 29 19:01:37 2008 @@ -0,0 +1,147 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> +<?xml-stylesheet href="../skin/mab.css" type="text/css"?> +<?xul-overlay href="overlay/main_menubar.xul"?> +<?xul-overlay href="overlay/icon_toolbar.xul"?> +<?xul-overlay href="overlay/search_toolbar.xul"?> +<?xul-overlay href="overlay/result_tree.xul"?> +<?xul-overlay href="overlay/detail_box.xul"?> +<?xul-overlay href="overlay/price_box.xul"?> +<?xul-overlay href="overlay/status_statusbar.xul"?> +<!DOCTYPE window [ + + <!ENTITY catalog.label "Catalog"> + <!ENTITY next.label "Next"> + <!ENTITY next.tooltip "Get Next Records"> + <!ENTITY clear.label "Clear"> + + <!ENTITY imageLarge.tooltip "Click to see the larger image"> + <!ENTITY review.label "Reviews"> + <!ENTITY info.label "Product Info"> +] +> + +<window id="amazWindow" + title="" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + width="800" + height="600" + onload="main()" + type="mab:main" + persist="screenX screenY width height sizemode"> + + +<script src="js/ProductLine.js" type="application/x-javascript"/> +<script src="js/ProductLineController.js" type="application/x-javascript"/> +<script src="js/DisplayController.js" type="application/x-javascript"/> +<script src="js/SearchController.js" type="application/x-javascript"/> +<script src="js/SearchHistory.js" type="application/x-javascript"/> +<script src="js/ProgressBar.js" type="application/x-javascript"/> +<script src="js/QueryStringBuilder.js" type="application/x-javascript"/> +<script src="js/Connection.js" type="application/x-javascript"/> +<script src="js/FileManager.js" type="application/x-javascript"/> +<script src="js/AmazonParser.js" type="application/x-javascript"/> +<script src="js/XMDManager.js" type="application/x-javascript"/> +<script src="js/DocOpenManager.js" type="application/x-javascript"/> +<script src="js/config.js" type="application/x-javascript"/> +<script src="js/utils.js" type="application/x-javascript"/> +<script src="js/mab.js" type="application/x-javascript"/> + + +<broadcaster id="isSearchRunning" disabled="true"/> + +<broadcaster id="isMabRemote" disabled="false"/> + +<commandset id="mabCommand"> +  + <commandset id="menubarCommand" /> + + <command id="newSearchCmd" oncommand="newSearch()"/> + <command id="nextCmd" oncommand="nextRecord()"/> + <command id="clearCmd" oncommand="clearAll()" /> + <command id="commentCmd" oncommand="getComment()"/> + <command id="goAmazonCmd" oncommand="goAmazon()" /> + <command id="addCartCmd" oncommand="addCart()" /> + <command id="goGoogleCmd" oncommand="goGoogle()" /> + <command id="deleteCmd" oncommand="deleteRow()"/> +</commandset> + + +<keyset> + <key id="search-key" keycode="VK_RETURN" command="newSearchCmd"/> + <key id="search-key" keycode="VK_ENTER" command="newSearchCmd"/> + <key id="delete-key" keycode="VK_DELETE" command="deleteCmd"/> +  + <key id="new-key" modifiers="accel" key="n" command="newCmd"/> + <key id="close-key" modifiers="accel" key="w" command="closeCmd"/> + <key id="save-key" modifiers="accel" key="s" command="saveCmd"/> + + <key id="review-key" modifiers="accel" key="r" command="commentCmd"/> +</keyset> + + + + +<spacer id="settings-spacer" hidden="true" search="lite" nrResult="20" persist="search nrResult"/> + +<toolbox> +  + <menubar id="main-menubar"/> +  + <toolbar id="icon-toolbar"/> +  + <toolbar id="search-toolbar"/> +</toolbox> + + +<hbox flex="1" id="main-box"> + <vbox> +  + <tree id="result-tree"/> +  + <hbox id="detail-box"/> + <separator class="groove"/> +  + <hbox id="price-box" /> + </vbox> + <splitter id="detail-comment" collapse="after" resizeafter="grow"> + <grippy /> + </splitter> +  + <tabbox flex="1" id="extra-info-tab"> + <tabs id="comment-tab"> + <tab label="&info.label;"/> + <tab label="&review.label;"/> + </tabs> + <tabpanels style="background-color: White;" flex="3"> + <tabpanel> + <iframe id="allInfo-selected" src="html/allinfo.html" flex="3" /> + </tabpanel> + <tabpanel> + <iframe id="comment-selected" src="html/comment.html" flex="3"/> + </tabpanel> + </tabpanels> + </tabbox> +</hbox> +  + <statusbar id="mab-status-bar" /> +</window> Added: branches/tmp/dmacvicar/yast-xmlui/libyui/examples/xul/mozmail.xul URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast-xmlui/liby… ============================================================================== --- branches/tmp/dmacvicar/yast-xmlui/libyui/examples/xul/mozmail.xul (added) +++ branches/tmp/dmacvicar/yast-xmlui/libyui/examples/xul/mozmail.xul Tue Jul 29 19:01:37 2008 @@ -0,0 +1,70 @@ +<?xml version="1.0"?> +<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> + + <window id="winOuter" title="Mozilla-compatible Webmail App" orient="vertical" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> + <menubar> + <menu id="mnuFile" label="File" accesskey="f"> + <menupopup id="mnupFile"> + <menuitem label="Get Text" accesskey="t"/> + <menuitem label="Add Attachment" accesskey="a"/> + <menuseparator/> + <menuitem label="Save Message/Draft" accesskey="s"/> + <menuseparator/> + <menuitem label="Exit" accesskey="x"/> + </menupopup> + </menu> + <menu id="mnuServer" label="Server" accesskey="s"> + <menupopup id="mnupServer"> + <menuitem label="Connect to Server" accesskey="c"/> + <menuitem label="Change Server" accesskey="s" disabled="true"/> + <menuseparator/> + <menuitem label="Check for New Mail" accesskey="n"/> + <menuitem label="Destroy Deleted Mail" accesskey="d"/> + </menupopup> + </menu> + <menu id="mnuMail" label="Mail" accesskey="m"> + <menupopup id="mnupMail"> + <menuitem label="New Message" accesskey="s" disabled="true"/> + <menuitem label="Forward Message" accesskey="o"/> + <menuitem label="Reply to Message" accesskey="r"/> + <menuseparator/> + <menuitem label="Find Message" accesskey="f"/> + <menuitem label="Mark Message As Important" accesskey="i"/> + <menuseparator/> + <menuitem label="Render Message as HTML" accesskey="h"/> + </menupopup> + </menu> + </menubar> + + <vbox flex="1"> + <hbox id="boxFilerNav" flex="5" style="background-color: #ffffff;"> + <vbox id="boxMailFilers" flex="1"> + <button id="butCheckEmailNow" label="Check Email Now"/> + <button id="butDelMessages" label="Flush Deleted Messages"/> + <button id="butChangeServers" label="Change Servers"/> + </vbox> + <tabbox id="windowList" flex="8"> + <tabs> + <tab label="Control"/> + <tab label="Inbox"/> + <tab label="Deleted Items"/> + </tabs> + <tabpanels flex="1"> + <tabpanel style="border: 2px solid #FFFF00"> + <object src="http://www.google.com" type="text/html" /> + </tabpanel> + <tabpanel> + <description>Inbox</description> + </tabpanel> + <tabpanel> + <description>Deleted Items</description> + </tabpanel> + </tabpanels> + </tabbox> + </hbox> + <splitter id="mainSplit" state="open" collapse="none"></splitter> + <vbox id="boxMailShow" flex="5" style="background-color: #000000; height: 100%;"> + <iframe src="about:mozilla" flex="1" /> + </vbox> + </vbox> + </window> Added: branches/tmp/dmacvicar/yast-xmlui/libyui/examples/xul/top.xul URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast-xmlui/liby… ============================================================================== --- branches/tmp/dmacvicar/yast-xmlui/libyui/examples/xul/top.xul (added) +++ branches/tmp/dmacvicar/yast-xmlui/libyui/examples/xul/top.xul Tue Jul 29 19:01:37 2008 @@ -0,0 +1,69 @@ +<?xml version="1.0"?> +<?xml-stylesheet href="chrome://global/skin" type="text/css"?> + +<window title="XUL Periodic Table" + xmlns:html="http://www.w3.org/1999/xhtml" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> + +<script> +<![CDATA[ + +function setFrame() +{ + var listBox = document.getElementById("working-list"); + var selectedItem = listBox.getSelectedItem(0); + var newPage = selectedItem.getAttribute("value"); + document.getElementById("working-frame").setAttribute("src", newPage); + var newSrc = newPage + ".txt"; + document.getElementById("source-frame").setAttribute("src", newSrc); +} + +]]> +</script> + + <hbox flex="1"> + <listbox id="working-list" style="width:10em" + onselect="setFrame();"> + <listitem value="layout.xul" label="Box Layout" selected="true" /> + <listitem value="button.xul" label="Buttons" /> + <listitem value="checkbox.xul" label="Checkboxes" /> + <listitem value="colorpicker.xul" label="Colorpickers" /> + <listitem value="cropping.xul" label="Cropping" /> + <listitem value="grid.xul" label="Grids" /> + <listitem value="image.xul" label="Images" /> + <listitem value="label.xul" label="Labels" /> + <listitem value="list.xul" label="Lists" /> + <listitem value="menubar.xul" label="Menubars, etc." /> + <listitem value="popup.xul" label="Popups" /> + <listitem value="progressmeter.xul" label="Progressmeters" /> + <listitem value="radio.xul" label="Radiobuttons" /> + <listitem value="scrolling.xul" label="Scrolling" /> + <listitem value="splitter.xul" label="Splitters" /> + <listitem value="stack.xul" label="Stacks and Decks" /> + <listitem value="tab.xul" label="Tabs" /> + <listitem value="textbox.xul" label="TextBoxes" /> + <listitem value="tree-simple.xul" label="Trees, Simple" /> + <listitem value="tree-nested.xul" label="Trees, Nested" /> + </listbox> + + <splitter collapse="before" resizebefore="closest" resizeafter="grow"> + <grippy /> + </splitter> + + <tabbox flex="1" > + <tabs> + <tab label="Examples" /> + <tab label="Source" /> + <tab label="Change log" /> + </tabs> + <tabpanels flex="1" > + <iframe id="working-frame" type="content-primary" src="layout.xul" /> + <iframe id="source-frame" type="content-primary" + src="layout.xul.txt"/> + <iframe type="content-primary" src="ChangeLog.txt" /> + </tabpanels> + </tabbox> + + </hbox> + +</window> Modified: branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUIXULReader.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast-xmlui/liby… ============================================================================== --- branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUIXULReader.cc (original) +++ branches/tmp/dmacvicar/yast-xmlui/libyui/src/YUIXULReader.cc Tue Jul 29 19:01:37 2008 @@ -26,7 +26,8 @@ #include "YSelectionBox.h" #include "YMultiSelectionBox.h" #include "YLabel.h" - +#include "YProgressBar.h" +#include "YComboBox.h" #include "YUIXULReader.h" using namespace std; @@ -119,6 +120,8 @@ } // forward declarations +static YWidget * parseMenulist( YWidget *parent, DOMElement *root ); +static YWidget * parseProgressMeter( YWidget *parent, DOMElement *root ); static YWidget * parseLabel( YWidget *parent, DOMElement *root ); static YWidget * parseListbox( YWidget *parent, DOMElement *root ); static YWidget * parseRadioGroup( YWidget *parent, DOMElement *root ); @@ -134,13 +137,38 @@ static YWidget * parseWindow( YWidget *parent, DOMElement *root ); static YWidget * parseNode( YWidget *parent, DOMElement *root ); static void parseChildren( YWidget *parent, DOMElement *root ); -static YItemCollection parseItemList( YWidget *parent, DOMElement *root ); -static YItem parseItem( YWidget *parent, DOMElement *root ); +static YItemCollection parseItemList( const string &tagname, YWidget *parent, DOMElement *root ); +static YItem parseItem( const string &tagname, YWidget *parent, DOMElement *root ); + +static YWidget * +parseProgressMeter( YWidget *parent, DOMElement *root ) +{ + int value = 0; + int maxValue = 100; + string mode = "determined"; + string label; + + DOMStringList list = root->getAttributeList(); + DOMStringList::iterator i; + for (i = list.begin(); i != list.end(); i++) + { + if ( *i == "mode" ) + mode = root->getAttribute(*i); + else if ( *i == "value" ) + value = convertToInt(root->getAttribute(*i)); + } + + YProgressBar * progressBar = YUI::widgetFactory()->createProgressBar( parent, label, maxValue ); + if ( value > 0 ) + progressBar->setValue( value ); + return progressBar; +} + static YItem -parseItem( YWidget *parent, DOMElement *root ) +parseItem( const string &tagname, YWidget *parent, DOMElement *root ) { - if ( root->getElementName() != "listitem" ) + if ( root->getElementName() != tagname ) { YUI_THROW(YUIException("Invalid item '" + root->getElementName() + "'")); } @@ -161,7 +189,7 @@ static YItemCollection -parseItemList( YWidget *parent, DOMElement *root ) +parseItemList( const string &tagname, YWidget *parent, DOMElement *root ) { YItemCollection itemCollection; itemCollection.reserve( root->childCount() ); @@ -176,7 +204,11 @@ els = root->getChilds(); for(i = els.begin(); i != els.end(); i++) { - YItem item = parseItem( parent, *i ); + // FIXME, lbyui does not support this + if ( (*i)->getElementName() == "menuseparator" ) + continue; + + YItem item = parseItem( tagname, parent, *i ); } } } @@ -215,6 +247,52 @@ } static YWidget * +parseMenulist( YWidget *parent, DOMElement *root ) +{ + // FIXME XUL has no label here + string label; + bool editable = false; + + // get the attributes + { + + DOMStringList list = root->getAttributeList(); + DOMStringList::iterator i; + for (i = list.begin(); i != list.end(); i++) + { + if ( *i == "label" ) + label = root->getAttribute(*i); + else if ( *i == "editable" ) + editable = ( root->getAttribute(*i) == "true" ); + } + } + + YComboBox * comboBox = YUI::widgetFactory()->createComboBox( parent, label, editable ); + + // sadly the menulist element has a menupopup element + // which contains the menutem elements + { + + DOMElements els; + DOMElements::iterator i; + + if (root->hasChilds()) + { + els = root->getChilds(); + for(i = els.begin(); i != els.end(); i++) + { + if ( (*i)->getElementName() == "menupopup" ) + { + comboBox->addItems( parseItemList( "menuitem", comboBox, *i ) ); + } + } + } + } + return comboBox; +} + + +static YWidget * parseListbox( YWidget *parent, DOMElement *root ) { string seltype = "single"; @@ -233,13 +311,13 @@ if ( seltype == "multiple" ) { YMultiSelectionBox * mselBox = YUI::widgetFactory()->createMultiSelectionBox( parent, label ); - mselBox->addItems( parseItemList( mselBox, root ) ); + mselBox->addItems( parseItemList( "listitem", mselBox, root ) ); return mselBox; } else { YSelectionBox *selBox = YUI::widgetFactory()->createSelectionBox( parent, label ); - selBox->addItems( parseItemList( selBox, root ) ); + selBox->addItems( parseItemList( "listitem", selBox, root ) ); return selBox; } } @@ -510,7 +588,7 @@ static YWidget * parseWindow( YWidget *parent, DOMElement *root ) { - string orient = "horizontal"; + string orient = "vertical"; YDialog *dialog = YUI::widgetFactory()->createPopupDialog(); @@ -529,10 +607,10 @@ { YLayoutBox *box; - if ( orient == "vertical" ) - box = YUI::widgetFactory()->createVBox(dialog); - else + if ( orient == "horizontal" ) box = YUI::widgetFactory()->createHBox(dialog); + else + box = YUI::widgetFactory()->createVBox(dialog); parseChildren( box, root ); } @@ -576,6 +654,10 @@ if ( name == "window" ) w = parseWindow( parent, root ); + else if ( name == "menulist" ) + w = parseMenulist( parent, root ); + else if ( name == "progressmeter" ) + w = parseProgressMeter( parent, root ); else if ( name == "label" ) w = parseLabel( parent, root ); else if ( name == "listbox" ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0