[Uml-devel] branches/work/soc-umbrello

Gopala Krishna A krishna.ggk at gmail.com
Sun Jun 28 13:32:52 UTC 2009


SVN commit 988631 by gopala:

Yay!! All trunk changes merged finally!

Merged revisions 975813,976726,977275,987040 via svnmerge from 
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/umbrello

........
  r975813 | fischer | 2009-05-31 15:42:27 +0530 (Sun, 31 May 2009) | 1 line
  
  Krazy issue about KConfigXT file fixed.
........
  r976726 | scripty | 2009-06-02 19:13:42 +0530 (Tue, 02 Jun 2009) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r977275 | fischer | 2009-06-04 00:17:29 +0530 (Thu, 04 Jun 2009) | 1 line
  
  Some Krazy issues about [foreach] fixed.
........
  r987040 | habacker | 2009-06-25 17:22:53 +0530 (Thu, 25 Jun 2009) | 1 line
  
  fixed win32 application icon
........


 _M            . (directory)  
 M  +1 -1      umbrello/umbrello.desktop  
 M  +11 -11    umbrello/umbrello.kcfg  


** branches/work/soc-umbrello #property svnmerge-integrated
   - /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129,871091,872169-887978,889968-889981,890075-890805,896752-896872,901256-910119,911086,911706-911805,912902,913652,914852-917492,918579-919414,920540-921357,922431,922854-927155,928929-928936,931178-937536,937636,937969-941130,941971,942048-942637,943412,945536-946356,948572-948599,949430,951335-951484,952053-952131,952436-953088,956010-956619,957386,958937,961888,962900,963206-963898,964692,971486,972572-972879,973159,973906-974374,975453
   + /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129,871091,872169-887978,889968-889981,890075-890805,896752-896872,901256-910119,911086,911706-911805,912902,913652,914852-917492,918579-919414,920540-921357,922431,922854-927155,928929-928936,931178-937536,937636,937969-941130,941971,942048-942637,943412,945536-946356,948572-948599,949430,951335-951484,952053-952131,952436-953088,956010-956619,957386,958937,961888,962900,963206-963898,964692,971486,972572-972879,973159,973906-974374,975453,975813-987040
--- branches/work/soc-umbrello/umbrello/umbrello.desktop #988630:988631
@@ -45,7 +45,7 @@
 GenericName[ro]=Modelator UML
 GenericName[ru]=Средство UML моделирования
 GenericName[sk]=Modelár UML
-GenericName[sl]=Mofdelirnik UML
+GenericName[sl]=Modelirnik UML
 GenericName[sr]=УМЛ моделар
 GenericName[sr at latin]=UML modelar
 GenericName[sv]=UML-modellering
--- branches/work/soc-umbrello/umbrello/umbrello.kcfg #988630:988631
@@ -76,13 +76,13 @@
        <entry name="diagram" type="Enum">
          <label>Diagram To Load at Startup</label>
          <whatsthis>The Diagram to load at startup</whatsthis>
-         <choices name="Uml::Diagram_Type" />
+         <choices name="Uml::Diagram_Type"></choices>
          <default>Uml::dt_Class</default>
        </entry>
        <entry name="defaultLanguage" type="Enum">
          <label>Default Language at Startup</label>
          <whatsthis>The Language that Umbrello should start with by default</whatsthis>
-         <choices name="Uml::Programming_Language" />
+         <choices name="Uml::Programming_Language"></choices>
          <default>Uml::pl_Cpp</default>
        </entry>
        <entry name="lastFile" type="String">
@@ -172,13 +172,13 @@
        <entry name="defaultAttributeScope" type="Enum">
          <label>Default Attribute Scope</label>
          <whatsthis>Default Attribute Scope</whatsthis>
-         <choices name="Uml::Visibility::Value" />
+         <choices name="Uml::Visibility::Value"></choices>
          <default>Uml::Visibility::Public</default>
        </entry>
        <entry name="defaultOperationScope" type="Enum">
          <label>Default Operation Scope</label>
          <whatsthis>Default Operation Scope</whatsthis>
-         <choices name="Uml::Visibility::Value" />
+         <choices name="Uml::Visibility::Value"></choices>
          <default>Uml::Visibility::Public</default>
        </entry>
    </group>
@@ -255,19 +255,19 @@
        <entry name="commentStyle" type="Enum">
          <label>Comment Style</label>
          <whatsthis>Sets the Style of Comments to be used</whatsthis>
-         <choices name="CodeGenerationPolicy::CommentStyle" />
+         <choices name="CodeGenerationPolicy::CommentStyle"></choices>
          <default>CodeGenerationPolicy::SingleLine</default>
        </entry>
        <entry name="defaultAssocFieldScope" type="Enum">
          <label>Default Association Field Scope</label>
          <whatsthis>Sets the default Association field scope</whatsthis>
-         <choices name="Uml::Visibility::Value" />
+         <choices name="Uml::Visibility::Value"></choices>
          <default>Uml::Visibility::FromParent</default>
        </entry>
        <entry name="defaultAttributeAccessorScope" type="Enum">
          <label>Default Attribute Accessor Scope</label>
          <whatsthis>Sets the default attribute accessor scope</whatsthis>
-         <choices name="Uml::Visibility::Value" />
+         <choices name="Uml::Visibility::Value"></choices>
          <default>Uml::Visibility::FromParent</default>
        </entry>
        <entry name="forceDoc" type="Bool">
@@ -299,19 +299,19 @@
        <entry name="indentationType" type="Enum">
          <label>Indentation Type</label>
          <whatsthis>The Type of Indentation</whatsthis>
-         <choices name="CodeGenerationPolicy::IndentationType" />
+         <choices name="CodeGenerationPolicy::IndentationType"></choices>
          <default>CodeGenerationPolicy::SPACE</default>
        </entry>
        <entry name="lineEndingType" type="Enum">
          <label>Line Ending Type</label>
          <whatsthis>The type of line ending ( or new line type )</whatsthis>
-         <choices name="CodeGenerationPolicy::NewLineType" /> 
+         <choices name="CodeGenerationPolicy::NewLineType"></choices> 
          <default>CodeGenerationPolicy::UNIX</default>
        </entry>
        <entry name="modnamePolicy" type="Enum">
          <label>Modifier Name Policy</label>
          <whatsthis>Modifier Name Policy</whatsthis>
-         <choices name="CodeGenerationPolicy::ModifyNamePolicy" />
+         <choices name="CodeGenerationPolicy::ModifyNamePolicy"></choices>
          <default>CodeGenerationPolicy::Capitalise</default>
        </entry>
        <entry name="outputDirectory" type="Path">
@@ -322,7 +322,7 @@
        <entry name="overwritePolicy" type="Enum">
          <label>Overwrite Policy</label>
          <whatsthis>The policy to be followed when there are name conflicts</whatsthis>
-         <choices name="CodeGenerationPolicy::OverwritePolicy" />
+         <choices name="CodeGenerationPolicy::OverwritePolicy"></choices>
          <default>CodeGenerationPolicy::Ask</default>
        </entry>
     </group>




More information about the umbrello-devel mailing list