[Libreoffice-commits] core.git: starmath/uiconfig

[Takeshi Abe]

 starmath/uiconfig/smath/ui/commandmenu.ui |  115 +++++++++++++-----------------
 1 file changed, 51 insertions(+), 64 deletions(-)

New commits:
commit ba03fceba889f1560762ccd9650a7317e5a4ae4d
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Mon Apr 24 18:35:37 2017 +0900

    starmath: Show all Functions' menu items in Command Menu
    
    I am not sure why nested submenu does not work, but found
    GNOME HIG <https://developer.gnome.org/hig/stable/menus.html>
    says that
    > Submenus (...) should never contain other submenus.
    
    Change-Id: Id2f06efb596b66af74d4877b1e42c0c00e310b19
    Reviewed-on: https://gerrit.libreoffice.org/36881
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Takeshi Abe <tabe at fixedpoint.jp>

diff --git a/starmath/uiconfig/smath/ui/commandmenu.ui b/starmath/uiconfig/smath/ui/commandmenu.ui
index 3a703eb6694f..194b06f24226 100644
--- a/starmath/uiconfig/smath/ui/commandmenu.ui
+++ b/starmath/uiconfig/smath/ui/commandmenu.ui
@@ -721,72 +721,59 @@
               </object>
             </child>
             <child>
-              <object class="GtkMenuItem" id="More">
+              <object class="GtkMenuItem" id="arcsin(<?>) ">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_underline">True</property>
-                <child type="submenu">
-                  <object class="GtkMenu">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkMenuItem" id="arcsin(<?>) ">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label">arcsin(x)</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkMenuItem" id="arccos(<?>) ">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label">arccos(x)</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkMenuItem" id="arctan(<?>) ">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label">arctan(x)</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkMenuItem" id="arccot(<?>) ">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label">arccot(x)</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkMenuItem" id="arsinh(<?>) ">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label">arsinh(x)</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkMenuItem" id="arcosh(<?>) ">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label">arcosh(x)</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkMenuItem" id="artanh(<?>) ">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label">artanh(x)</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkMenuItem" id="arcoth(<?>) ">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label">arcoth(x)</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
+                <property name="label">arcsin(x)</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="arccos(<?>) ">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label">arccos(x)</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="arctan(<?>) ">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label">arctan(x)</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="arccot(<?>) ">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label">arccot(x)</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="arsinh(<?>) ">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label">arsinh(x)</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="arcosh(<?>) ">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label">arcosh(x)</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="artanh(<?>) ">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label">artanh(x)</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="arcoth(<?>) ">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label">arcoth(x)</property>
               </object>
             </child>
           </object>