← Back to branch summary

~zeller-benjamin/qtcreator-plugin-ubuntu/bughunt-27082015

« back to all changes in this revision

Viewing changes to share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/wizard.xml

  • Committer: CI Train Bot
  • Author(s): Benjamin Zeller
  • Date: 2015-07-20 12:53:08 UTC
  • mfrom: (394.3.6 qtcreator-plugin-ubuntu)
  • Revision ID: ci-train-bot@canonical.com-20150720125308-itp4rdxmzf01kmql
- Remove QtScript dependency from the manifest.json parser
- Fix Bug lp:1461026 "Kits creation for a project should match targeted framework"
- Fix Bug lp:1461014 "Match application name to click package name"
- Fix Bug lp:1461019 "Default in project creation dialog should be a qmake project"
- Fix Bug lp:1340061: "Some dialogs have unreadable (too small) text" Fixes: #1340061, #1461014, #1461019, #1461026
Approved by: Zoltan Balogh, PS Jenkins bot

Show diffs side-by-side

added added

removed removed

Lines of Context:
share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/wizard.xml
26
26
        <file source="po/CMakeLists.txt"                       target="po/CMakeLists.txt"     openeditor="false"/>
27
27
   </files>
28
28
 
29
 
      <!-- Create a 2nd wizard page with click package parameters -->
30
 
        <fieldpagetitle>Click package parameters</fieldpagetitle>
31
 
        <fields>
32
 
            <field mandatory="true" name="ClickDomain">
33
 
              <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
34
 
                            defaulttext="" placeholdertext="Nickname"/>
35
 
              <fielddescription>Nickname:</fielddescription>
36
 
            </field>
37
 
            <field mandatory="true" name="ClickMaintainer">
38
 
              <fieldcontrol class="QLineEdit" validator='^[^"]+$'
39
 
                            defaulttext="" placeholdertext="Maintainer"/>
40
 
              <fielddescription>Maintainer:</fielddescription>
41
 
            </field>
42
 
            <field mandatory="true" name="ClickHookName">
43
 
              <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
44
 
                            defaulttext="myapp" placeholdertext="app hook name"/>
45
 
              <fielddescription>App name:</fielddescription>
46
 
            </field>
47
 
          <field name="ClickFrameworkVersion">
48
 
              <fieldcontrol class="QComboBox" defaultindex="0">
49
 
                  <comboentries>
50
 
                                <!-- Do not add any other frameworks here, they are populated at runtime, this is just a dummy framework to make sure we can find the combobox -->
51
 
                                <comboentry value="ubuntu-sdk-dummy-framework">
52
 
                        <comboentrytext>Dummy Framework</comboentrytext>
53
 
                    </comboentry>
54
 
                  </comboentries>
55
 
              </fieldcontrol>
56
 
              <fielddescription>Framework:</fielddescription>
57
 
          </field>
58
 
        </fields>
 
29
          <!-- Create a 2nd wizard page with click package parameters -->
 
30
                <fieldpagetitle>Click package parameters</fieldpagetitle>
 
31
                <fields>
 
32
                        <field mandatory="true" name="ClickDomain">
 
33
                          <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
 
34
                                        defaulttext="" placeholdertext="Nickname"/>
 
35
                          <fielddescription>Nickname:</fielddescription>
 
36
                        </field>
 
37
                        <field mandatory="true" name="ClickMaintainer">
 
38
                          <fieldcontrol class="QLineEdit" validator='^[^"]+$'
 
39
                                        defaulttext="" placeholdertext="Maintainer"/>
 
40
                          <fielddescription>Maintainer:</fielddescription>
 
41
                        </field>
 
42
                        <field mandatory="true" name="ClickHookName">
 
43
                          <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
 
44
                                        defaulttext="%ProjectName%" placeholdertext="app hook name"/>
 
45
                          <fielddescription>App name:</fielddescription>
 
46
                        </field>
 
47
                  <field name="ClickFrameworkVersion">
 
48
                      <fieldcontrol class="QComboBox" defaultindex="0">
 
49
                          <comboentries>
 
50
                                                                <!-- Do not add any other frameworks here, they are populated at runtime, this is just a dummy framework to make sure we can find the combobox -->
 
51
                                                                <comboentry value="ubuntu-sdk-dummy-framework">
 
52
                                <comboentrytext>Dummy Framework</comboentrytext>
 
53
                            </comboentry>
 
54
                          </comboentries>
 
55
                      </fieldcontrol>
 
56
                      <fielddescription>Framework:</fielddescription>
 
57
                  </field>
 
58
                </fields>
59
59
    <validationrules>
60
60
        <validationrule condition='/^(.*)\s+&lt;(.*@.*)&gt;$/.test("%ClickMaintainer%")'>
61
61
            <message>Invalid format for maintainer (should be like "Joe Bloggs &lt;joe.bloggs@isp.com&gt;")</message>