convert input window menu to .ui

Change-Id: I1b9f05d16746bf1de57115f68df5f95e2a90413a

8 files changed, 267 insertions, 331 deletions

diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 532f0ba409cb..95495a2038d0 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -150,6 +150,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
 	sw/uiconfig/swriter/ui/gotopagedialog \
 	sw/uiconfig/swriter/ui/indexentry \
 	sw/uiconfig/swriter/ui/inputfielddialog \
+	sw/uiconfig/swriter/ui/inputwinmenu \
 	sw/uiconfig/swriter/ui/indentpage \
 	sw/uiconfig/swriter/ui/infonotfounddialog \
 	sw/uiconfig/swriter/ui/inforeadonlydialog \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 2a780a4dbca4..559d40cfc83a 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -88,35 +88,6 @@
 #define HID_MN_SUB_SPELLING                                     "SW_HID_MN_SUB_SPELLING"
 #define HID_MN_SUB_MIRROR                                       "SW_HID_MN_SUB_MIRROR"
 
-#define HID_MN_CALC_PHD                                         "SW_HID_MN_CALC_PHD"
-#define HID_MN_CALC_SQRT                                        "SW_HID_MN_CALC_SQRT"
-#define HID_MN_CALC_OR                                          "SW_HID_MN_CALC_OR"
-#define HID_MN_CALC_XOR                                         "SW_HID_MN_CALC_XOR"
-#define HID_MN_CALC_AND                                         "SW_HID_MN_CALC_AND"
-#define HID_MN_CALC_NOT                                         "SW_HID_MN_CALC_NOT"
-#define HID_MN_CALC_EQ                                          "SW_HID_MN_CALC_EQ"
-#define HID_MN_CALC_NEQ                                         "SW_HID_MN_CALC_NEQ"
-#define HID_MN_CALC_LEQ                                         "SW_HID_MN_CALC_LEQ"
-#define HID_MN_CALC_GEQ                                         "SW_HID_MN_CALC_GEQ"
-#define HID_MN_CALC_LES                                         "SW_HID_MN_CALC_LES"
-#define HID_MN_CALC_GRE                                         "SW_HID_MN_CALC_GRE"
-#define HID_MN_CALC_SUM                                         "SW_HID_MN_CALC_SUM"
-#define HID_MN_CALC_MEAN                                        "SW_HID_MN_CALC_MEAN"
-#define HID_MN_CALC_MIN                                         "SW_HID_MN_CALC_MIN"
-#define HID_MN_CALC_MAX                                         "SW_HID_MN_CALC_MAX"
-#define HID_MN_CALC_SIN                                         "SW_HID_MN_CALC_SIN"
-#define HID_MN_CALC_COS                                         "SW_HID_MN_CALC_COS"
-#define HID_MN_CALC_TAN                                         "SW_HID_MN_CALC_TAN"
-#define HID_MN_CALC_ASIN                                        "SW_HID_MN_CALC_ASIN"
-#define HID_MN_CALC_ACOS                                        "SW_HID_MN_CALC_ACOS"
-#define HID_MN_CALC_ATAN                                        "SW_HID_MN_CALC_ATAN"
-#define HID_MN_CALC_POW                                         "SW_HID_MN_CALC_POW"
-#define HID_MN_CALC_LISTSEP                                     "SW_HID_MN_CALC_LISTSEP"
-#define HID_MN_POP_OPS                                          "SW_HID_MN_POP_OPS"
-#define HID_MN_POP_STATISTICS                                   "SW_HID_MN_POP_STATISTICS"
-#define HID_MN_POP_FUNC                                         "SW_HID_MN_POP_FUNC"
-#define HID_MN_CALC_ROUND                                       "SW_HID_MN_CALC_ROUND"
-
 #define HID_MN_READONLY_SAVEGRAPHIC                             "SW_HID_MN_READONLY_SAVEGRAPHIC"
 #define HID_MN_READONLY_GRAPHICTOGALLERY                        "SW_HID_MN_READONLY_GRAPHICTOGALLERY"
 #define HID_MN_READONLY_TOGALLERYLINK                           "SW_HID_MN_READONLY_TOGALLERYLINK"
diff --git a/sw/source/uibase/inc/inputwin.hxx b/sw/source/uibase/inc/inputwin.hxx
index 18f3408c4da4..c83301f2ba1f 100644
--- a/sw/source/uibase/inc/inputwin.hxx
+++ b/sw/source/uibase/inc/inputwin.hxx
@@ -49,7 +49,6 @@ friend class InputEdit;
 
     VclPtr<Edit>        aPos;
     VclPtr<InputEdit>   aEdit;
-    ScopedVclPtrInstance<PopupMenu> aPopMenu;
     SwFieldMgr*     pMgr;
     SwWrtShell*     pWrtShell;
     SwView*         pView;
diff --git a/sw/source/uibase/inc/ribbar.hrc b/sw/source/uibase/inc/ribbar.hrc
index 366a775c1d50..4c16379e78b8 100644
--- a/sw/source/uibase/inc/ribbar.hrc
+++ b/sw/source/uibase/inc/ribbar.hrc
@@ -27,9 +27,6 @@
 #define RID_CNTRLR_WIN              (RC_RIBBAR_BEGIN + 10)
 #define RID_ALIGNMENT_WIN           (RC_RIBBAR_BEGIN + 11)
 
-//Resourcen fuer Inputwin (Rechenleiste)
-#define MN_CALC_POPUP               (RC_RIBBAR_BEGIN + 12)
-
 #define ST_TBL                      (RC_RIBBAR_BEGIN + 14)
 #define ST_FRM                      (RC_RIBBAR_BEGIN + 15)
 #define ST_PGE                      (RC_RIBBAR_BEGIN + 16)
diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx
index e02f33e1d207..392569890be8 100644
--- a/sw/source/uibase/ribbar/inputwin.cxx
+++ b/sw/source/uibase/ribbar/inputwin.cxx
@@ -49,7 +49,6 @@
 
 #include "swundo.hxx"
 #include "ribbar.hrc"
-#include "inputwin.hrc"
 #include "dbui.hrc"
 
 #include <IDocumentContentOperations.hxx>
@@ -63,7 +62,6 @@ SwInputWindow::SwInputWindow(vcl::Window* pParent, SfxDispatcher* pDispatcher)
     : ToolBox(pParent, WB_3DLOOK|WB_BORDER)
     , aPos(VclPtr<Edit>::Create(this, WB_3DLOOK|WB_CENTER|WB_BORDER|WB_READONLY))
     , aEdit(VclPtr<InputEdit>::Create(this, WB_3DLOOK|WB_TABSTOP|WB_BORDER|WB_NOHIDESELECTION))
-    , aPopMenu(SW_RES(MN_CALC_POPUP))
     , pMgr(nullptr)
     , pWrtShell(nullptr)
     , pView(nullptr)
@@ -129,8 +127,6 @@ SwInputWindow::SwInputWindow(vcl::Window* pParent, SfxDispatcher* pDispatcher)
     aEditPos.Y()   = (aSize.Height() - nMaxHeight)/2 + 1;
     aPos->SetPosSizePixel( aPosPos, aPosSize );
     aEdit->SetPosSizePixel( aEditPos, aEditSize );
-
-    aPopMenu->SetSelectHdl(LINK( this, SwInputWindow, MenuHdl ));
 }
 
 SwInputWindow::~SwInputWindow()
@@ -293,40 +289,11 @@ void SwInputWindow::ShowWin()
 
 IMPL_LINK( SwInputWindow, MenuHdl, Menu *, pMenu, bool )
 {
-static const char * const aStrArr[] = {
-    sCalc_Phd,
-    sCalc_Sqrt,
-    sCalc_Or,
-    sCalc_Xor,
-    sCalc_And,
-    sCalc_Not,
-    sCalc_Eq,
-    sCalc_Neq,
-    sCalc_Leq,
-    sCalc_Geq,
-    sCalc_L,
-    sCalc_G,
-    sCalc_Sum,
-    sCalc_Mean,
-    sCalc_Min,
-    sCalc_Max,
-    sCalc_Sin,
-    sCalc_Cos,
-    sCalc_Tan,
-    sCalc_Asin,
-    sCalc_Acos,
-    sCalc_Atan,
-    sCalc_Pow,
-    "|",
-    sCalc_Round
-};
-
-    sal_uInt16 nId = pMenu->GetCurItemId();
-    if ( nId <= MN_CALC_ROUND )
+    OString aCommand = pMenu->GetCurItemIdent();
+    if (!aCommand.isEmpty())
     {
-        OUString aTmp( OUString::createFromAscii(aStrArr[nId - 1]) );
-        aTmp += " ";
-        aEdit->ReplaceSelected( aTmp );
+        aCommand += " ";
+        aEdit->ReplaceSelected(OStringToOUString(aCommand, RTL_TEXTENCODING_ASCII_US));
     }
     return false;
 }
@@ -335,15 +302,12 @@ IMPL_LINK_NOARG(SwInputWindow, DropdownClickHdl, ToolBox *, void)
 {
     sal_uInt16 nCurID = GetCurItemId();
     EndSelection(); // reset back CurItemId !
-    switch ( nCurID )
+    if (nCurID == FN_FORMULA_CALC)
     {
-        case FN_FORMULA_CALC :
-        {
-            aPopMenu->Execute( this, GetItemRect( FN_FORMULA_CALC ), PopupMenuFlags::NoMouseUpClose );
-            break;
-        default:
-            break;
-        }
+        VclBuilder aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "modules/swriter/ui/inputwinmenu.ui", "");
+        VclPtr<PopupMenu> aPopMenu(aBuilder.get_menu("menu"));
+        aPopMenu->SetSelectHdl(LINK(this, SwInputWindow, MenuHdl));
+        aPopMenu->Execute(this, GetItemRect(FN_FORMULA_CALC), PopupMenuFlags::NoMouseUpClose);
     }
 }
 
diff --git a/sw/source/uibase/ribbar/inputwin.hrc b/sw/source/uibase/ribbar/inputwin.hrc
deleted file mode 100644
index 6f119d25e27b..000000000000
--- a/sw/source/uibase/ribbar/inputwin.hrc
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SW_SOURCE_UIBASE_RIBBAR_INPUTWIN_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_RIBBAR_INPUTWIN_HRC
-
-//PopupMenu Id's
-#define MN_CALC_PHD         1
-#define MN_CALC_SQRT        2
-#define MN_CALC_OR          3
-#define MN_CALC_XOR         4
-#define MN_CALC_AND         5
-#define MN_CALC_NOT         6
-#define MN_CALC_EQ          7
-#define MN_CALC_NEQ         8
-#define MN_CALC_LEQ         9
-#define MN_CALC_GEQ         10
-#define MN_CALC_LES         11
-#define MN_CALC_GRE         12
-#define MN_CALC_SUM         13
-#define MN_CALC_MEAN        14
-#define MN_CALC_MIN         15
-#define MN_CALC_MAX         16
-#define MN_CALC_SIN         17
-#define MN_CALC_COS         18
-#define MN_CALC_TAN         19
-#define MN_CALC_ASIN        20
-#define MN_CALC_ACOS        21
-#define MN_CALC_ATAN        22
-#define MN_CALC_POW         23
-#define MN_CALC_LISTSEP     24
-#define MN_CALC_ROUND       25
-
-#define MN_POP_OPS          29
-#define MN_POP_STATISTICS   30
-#define MN_POP_FUNC         31
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/ribbar/inputwin.src b/sw/source/uibase/ribbar/inputwin.src
index e0de1cd724a1..a1aa728941ef 100644
--- a/sw/source/uibase/ribbar/inputwin.src
+++ b/sw/source/uibase/ribbar/inputwin.src
@@ -23,206 +23,8 @@
 #include "helpid.h"
 #include "globals.hrc"
 #include "ribbar.hrc"
-#include "inputwin.hrc"
 #include "access.hrc"
 
-Menu MN_CALC_POPUP
-{
-    ItemList =
-    {
-        MenuItem
-        {
-            Identifier = MN_CALC_SUM ;
-            HelpID = HID_MN_CALC_SUM ;
-            Text [ en-US ] = "Sum" ;
-        };
-        MenuItem
-        {
-            Identifier = MN_CALC_ROUND ;
-            HelpID = HID_MN_CALC_ROUND ;
-            Text [ en-US ] = "Round" ;
-        };
-        MenuItem
-        {
-            Identifier = MN_CALC_PHD ;
-            HelpID = HID_MN_CALC_PHD ;
-            Text [ en-US ] = "Percent" ;
-        };
-        MenuItem
-        {
-            Identifier = MN_CALC_SQRT ;
-            HelpID = HID_MN_CALC_SQRT ;
-            Text [ en-US ] = "Square Root" ;
-        };
-        MenuItem
-        {
-            Identifier = MN_CALC_POW ;
-            HelpID = HID_MN_CALC_POW ;
-            Text [ en-US ] = "Power" ;
-        };
-        MenuItem
-        {
-            Identifier = MN_POP_OPS ;
-            HelpID = HID_MN_POP_OPS ;
-            Text [ en-US ] = "Operators" ;
-            SubMenu = Menu
-            {
-                ItemList =
-                {
-                    MenuItem
-                    {
-                        Identifier = MN_CALC_LISTSEP ;
-                        HelpID = HID_MN_CALC_LISTSEP ;
-                        Text [ en-US ] = "List Separator" ;
-                    };
-                    MenuItem
-                    {
-                        Identifier = MN_CALC_EQ ;
-                        HelpID = HID_MN_CALC_EQ ;
-                        Text [ en-US ] = "Equal" ;
-                    };
-                    MenuItem
-                    {
-                        Identifier = MN_CALC_NEQ ;
-                        HelpID = HID_MN_CALC_NEQ ;
-                        Text [ en-US ] = "Not Equal" ;
-                    };
-                    MenuItem
-                    {
-                        Identifier = MN_CALC_LEQ ;
-                        HelpID = HID_MN_CALC_LEQ ;
-                        Text [ en-US ] = "Less Than or Equal" ;
-                    };
-                    MenuItem
-                    {
-                        Identifier = MN_CALC_GEQ ;
-                        HelpID = HID_MN_CALC_GEQ ;
-                        Text [ en-US ] = "Greater Than or Equal" ;
-                    };
-                    MenuItem
-                    {
-                        Identifier = MN_CALC_LES ;
-                        HelpID = HID_MN_CALC_LES ;
-                        Text [ en-US ] = "Less" ;
-                    };
-                    MenuItem
-                    {
-                        Identifier = MN_CALC_GRE ;
-                        HelpID = HID_MN_CALC_GRE ;
-                        Text [ en-US ] = "Greater" ;
-                    };
-                    MenuItem
-                    {
-                        Separator = TRUE ;
-                    };
-                    MenuItem
-                    {
-                        Identifier = MN_CALC_OR ;
-                        HelpID = HID_MN_CALC_OR ;
-                        Text [ en-US ] = "Boolean Or" ;
-                    };
-                    MenuItem
-                    {
-                        Identifier = MN_CALC_XOR ;
-                        HelpID = HID_MN_CALC_XOR ;
-                        Text [ en-US ] = "Boolean Xor" ;
-                    };
-                    MenuItem
-                    {
-                        Identifier = MN_CALC_AND ;
-                        HelpID = HID_MN_CALC_AND ;
-                        Text [ en-US ] = "Boolean And" ;
-                    };
-                    MenuItem
-                    {
-                        Identifier = MN_CALC_NOT ;
-                        HelpID = HID_MN_CALC_NOT ;
-                        Text [ en-US ] = "Boolean Not" ;
-                    };
-                };
-            };
-        };
-        MenuItem
-        {
-            Identifier = MN_POP_STATISTICS ;
-            HelpID = HID_MN_POP_STATISTICS ;
-            Text [ en-US ] = "Statistical Functions" ;
-            SubMenu = Menu
-            {
-                ItemList =
-                {
-                    MenuItem
-                    {
-                        Identifier = MN_CALC_MEAN ;
-                        HelpID = HID_MN_CALC_MEAN ;
-                        Text [ en-US ] = "Mean" ;
-                    };
-                    MenuItem
-                    {
-                        Identifier = MN_CALC_MIN ;
-                        HelpID = HID_MN_CALC_MIN ;
-                        Text [ en-US ] = "Minimum" ;
-                    };
-                    MenuItem
-                    {
-                        Identifier = MN_CALC_MAX ;
-                        HelpID = HID_MN_CALC_MAX ;
-                        Text [ en-US ] = "Maximum" ;
-                    };
-                };
-            };
-        };
-        MenuItem
-        {
-            Identifier = MN_POP_FUNC ;
-            HelpID = HID_MN_POP_FUNC ;
-            Text [ en-US ] = "Functions" ;
-            SubMenu = Menu
-            {
-                ItemList =
-                {
-                    MenuItem
-                    {
-                        Identifier = MN_CALC_SIN ;
-                        HelpID = HID_MN_CALC_SIN ;
-                        Text [ en-US ] = "Sine" ;
-                    };
-                    MenuItem
-                    {
-                        Identifier = MN_CALC_COS ;
-                        HelpID = HID_MN_CALC_COS ;
-                        Text [ en-US ] = "Cosine" ;
-                    };
-                    MenuItem
-                    {
-                        Identifier = MN_CALC_TAN ;
-                        HelpID = HID_MN_CALC_TAN ;
-                        Text [ en-US ] = "Tangent" ;
-                    };
-                    MenuItem
-                    {
-                        Identifier = MN_CALC_ASIN ;
-                        HelpID = HID_MN_CALC_ASIN ;
-                        Text [ en-US ] = "Arcsine" ;
-                    };
-                    MenuItem
-                    {
-                        Identifier = MN_CALC_ACOS ;
-                        HelpID = HID_MN_CALC_ACOS ;
-                        Text [ en-US ] = "Arccosine" ;
-                    };
-                    MenuItem
-                    {
-                        Identifier = MN_CALC_ATAN ;
-                        HelpID = HID_MN_CALC_ATAN ;
-                        Text [ en-US ] = "Arctangent" ;
-                    };
-                };
-            };
-        };
-    };
-};
-
 String STR_FORMULA_CALC
 {
     Text [ en-US ] = "Functions" ;
diff --git a/sw/uiconfig/swriter/ui/inputwinmenu.ui b/sw/uiconfig/swriter/ui/inputwinmenu.ui
new file mode 100644
index 000000000000..5a1b3080e62a
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/inputwinmenu.ui
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface>
+  <requires lib="gtk+" version="3.10"/>
+  <object class="GtkMenu" id="menu">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkMenuItem" id="sum">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Sum</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="round">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Round</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="phd">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Percent</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="sqrt">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Square Root</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="pow">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Power</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="operators">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Operators</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="|">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">List Separator</property>
+                <property name="use_underline">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="eq">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Equal</property>
+                <property name="use_underline">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="neq">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Not Equal</property>
+                <property name="use_underline">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="leq">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Less Than or Equal</property>
+                <property name="use_underline">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="geq">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Greater Than or Equal</property>
+                <property name="use_underline">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="l">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Less</property>
+                <property name="use_underline">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="g">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Greater</property>
+                <property name="use_underline">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkSeparatorMenuItem" id="seperator1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="or">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Boolean Or</property>
+                <property name="use_underline">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="xor">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Boolean Xor</property>
+                <property name="use_underline">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="and">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Boolean And</property>
+                <property name="use_underline">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="not">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Boolean Not</property>
+                <property name="use_underline">True</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="statistics">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Statistical Functions</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="mean">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Mean</property>
+                <property name="use_underline">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="min">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Minimum</property>
+                <property name="use_underline">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="max">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Maximum</property>
+                <property name="use_underline">True</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="functions">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Functions</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="sin">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Sine</property>
+                <property name="use_underline">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="cos">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Cosine</property>
+                <property name="use_underline">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="tag">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Tangent</property>
+                <property name="use_underline">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="asin">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Arcsine</property>
+                <property name="use_underline">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="acos">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Arccosine</property>
+                <property name="use_underline">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="atan">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Arctangent</property>
+                <property name="use_underline">True</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>