Mailinglist Archive: yast-commit (815 mails)

[jsuchome@xxxxxxxxxxxxxxxx]

Author: jsuchome
Date: Mon Aug  6 14:12:21 2007
New Revision: 39991

URL: http://svn.opensuse.org/viewcvs/yast?rev=39991&view=rev
Log:
- enable entering product name and version before content file
  dialog, so most of its mandatory keys can be filled
- 2.15.17 


Modified:
    trunk/add-on-creator/VERSION
    trunk/add-on-creator/package/yast2-add-on-creator.changes
    trunk/add-on-creator/src/AddOnCreator.ycp
    trunk/add-on-creator/src/complex.ycp
    trunk/add-on-creator/src/helps.ycp

Modified: trunk/add-on-creator/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=39991&r1=39990&r2=39991&view=diff
==============================================================================
--- trunk/add-on-creator/VERSION (original)
+++ trunk/add-on-creator/VERSION Mon Aug  6 14:12:21 2007
@@ -1 +1 @@
-2.15.16
+2.15.17

Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/package/yast2-add-on-creator.changes?rev=39991&r1=39990&r2=39991&view=diff
==============================================================================
--- trunk/add-on-creator/package/yast2-add-on-creator.changes (original)
+++ trunk/add-on-creator/package/yast2-add-on-creator.changes Mon Aug  6 14:12:21 2007
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Mon Aug  6 14:07:47 CEST 2007 - jsuchome@xxxxxxx
+
+- enable entering product name and version before content file
+  dialog, so most of its mandatory keys can be filled
+- 2.15.17 
+
+-------------------------------------------------------------------
 Mon Aug  6 10:05:35 CEST 2007 - jsuchome@xxxxxxx
 
 - command line option for packages resigning (#287447) 

Modified: trunk/add-on-creator/src/AddOnCreator.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/AddOnCreator.ycp?rev=39991&r1=39990&r2=39991&view=diff
==============================================================================
--- trunk/add-on-creator/src/AddOnCreator.ycp (original)
+++ trunk/add-on-creator/src/AddOnCreator.ycp Mon Aug  6 14:12:21 2007
@@ -35,6 +35,7 @@
 module "AddOnCreator";
 textdomain "add-on-creator";
 
+import "Arch";
 import "Directory";
 import "FileUtils";
 import "Mode";
@@ -743,6 +744,8 @@
            else
                content_descr[key,"allowed_values"] = [];
        }
+       if (key == "DEFAULTBASE")
+           content_descr[key,"value"]        = Arch::architecture ();
        i       = i + 1;
     });
 

Modified: trunk/add-on-creator/src/complex.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/complex.ycp?rev=39991&r1=39990&r2=39991&view=diff
==============================================================================
--- trunk/add-on-creator/src/complex.ycp (original)
+++ trunk/add-on-creator/src/complex.ycp Mon Aug  6 14:12:21 2007
@@ -203,10 +203,23 @@
        AddOnCreator::rpm_path  = "";
     string old_requires        = requires;
 
+    string product     = AddOnCreator::content_map["PRODUCT"]:"";
+    string old_product = product == "" ? nil : product;
+
+    string version     = AddOnCreator::content_map["VERSION"]:"";
+    string old_version = version;
+
     // dialog caption
     string caption = _("Add-On Product Creator");
 
     term contents = `HBox (`HSpacing (), `VBox (
+       `HBox (
+           // textentry label
+           `TextEntry (`id (`product), _("&Add-On Product Name"), product),
+           // textentry label
+           `TextEntry (`id (`version), _("&Version"), version)
+       ),
+       `VSpacing (0.7),
        `Frame (_("Required Product"), `HBox (`HSpacing (0.5), `VBox (
            `VSpacing (0.4),
            `RadioButtonGroup (`id(`rd),
@@ -268,7 +281,7 @@
 
     Wizard::SetContentsButtons(caption, contents, HELPS["sources"]:"",
            Label::BackButton(), Label::NextButton());
-    UI::SetFocus (`id(`rpm_path));
+    UI::SetFocus (`id(`product));
 
     if (UI::QueryWidget (`id(`rd), `Value) == nil)
     {
@@ -286,6 +299,8 @@
        string dir      = (string) UI::QueryWidget (`id(`rpm_path), `Value);
        string req_dir  = (string)
            UI::QueryWidget (`id(`required_rpm_path), `Value);
+       product         = (string) UI::QueryWidget (`id(`product), `Value);
+       version         = (string) UI::QueryWidget (`id(`version), `Value);
 
        if (ret == `browse_rpm) {
            dir = UI::AskForExistingDirectory (dir, "");
@@ -358,8 +373,17 @@
            if (requires == "")
                requires = (string) UI::QueryWidget (`id(`other_val), `Value);
            AddOnCreator::content_map["REQUIRES"]     = requires;
+           AddOnCreator::content_map["PRODUCT"]      = product;
+           AddOnCreator::content_map["VERSION"]      = version;
+           if (product != "" &&
+               AddOnCreator::content_map["DISTPRODUCT"]:"" == "")
+               AddOnCreator::content_map["DISTPRODUCT"]      = product;
+           if (version != "" &&
+               AddOnCreator::content_map["DISTVERSION"]:"" == "")
+               AddOnCreator::content_map["DISTVERSION"]      = version;
 
-           if (requires == old_requires && dir == old_dir)
+           if (requires == old_requires && dir == old_dir &&
+               product == old_product && version == old_version)
                ret     = `skip_gen;
            break;
        }

Modified: trunk/add-on-creator/src/helps.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/helps.ycp?rev=39991&r1=39990&r2=39991&view=diff
==============================================================================
--- trunk/add-on-creator/src/helps.ycp (original)
+++ trunk/add-on-creator/src/helps.ycp Mon Aug  6 14:12:21 2007
@@ -58,7 +58,13 @@
        _("<p>When basing the new product on an existing product, check <b>Generate Package Descriptions</b> to generate new descriptions of packages in the existing product.</p>"),
 
     // help text for initial data (paragraph title)
-    "sources"        : _("<p><b>Required Product</b></p>") +
+    "sources"        : _("<p><b>Name and Version</b></p>") +
+
+       // help text for initial data, cont.
+       _("<p>Enter the name and version of add-on product.</p>") +
+
+       // help text for initial data, cont.
+       _("<p><b>Required Product</b></p>") +
 
        // help text for initial data, cont.
        _("<p>Select the product to which the new add-on product can be applied. This selection forms the <b>REQUIRES</b> value of the <tt>content</tt> file.</p>") +

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx