diff options
-rw-r--r-- | dbaccess/UIConfig_dbapp.mk | 1 | ||||
-rw-r--r-- | dbaccess/source/ui/app/app.src | 130 | ||||
-rw-r--r-- | dbaccess/uiconfig/dbapp/popupmenu/edit.xml | 34 | ||||
-rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/BaseWindowState.xcu | 5 | ||||
-rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu | 8 |
5 files changed, 48 insertions, 130 deletions
diff --git a/dbaccess/UIConfig_dbapp.mk b/dbaccess/UIConfig_dbapp.mk index f810f4b8718c..1dbab2a480a9 100644 --- a/dbaccess/UIConfig_dbapp.mk +++ b/dbaccess/UIConfig_dbapp.mk @@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/dbapp,\ )) $(eval $(call gb_UIConfig_add_popupmenufiles,modules/dbapp,\ + dbaccess/uiconfig/dbapp/popupmenu/edit \ dbaccess/uiconfig/dbapp/popupmenu/new \ )) diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src index 3b4f12496727..04dce61ae977 100644 --- a/dbaccess/source/ui/app/app.src +++ b/dbaccess/source/ui/app/app.src @@ -21,8 +21,6 @@ #include "browserids.hxx" #include "dbaccess_helpid.hrc" -#define MN_PROPS 25 - String RID_STR_NEW_FORM { Text [ en-US ] = "Create Form in Design View..." ; @@ -80,134 +78,6 @@ String RID_STR_REPORTS_CONTAINER { Text [ en-US ] = "Reports" ; }; - -Menu RID_MENU_APP_EDIT -{ - ItemList = - { - MenuItem - { - Identifier = SID_COPY ; - Command = ".uno:Copy" ; - Text [ en-US ] = "~Copy" ; - }; - MenuItem - { - Identifier = SID_PASTE ; - Command = ".uno:Paste" ; - Text [ en-US ] = "~Paste" ; - }; - MenuItem - { - Identifier = SID_DB_APP_PASTE_SPECIAL; - Text[ en-US ] = "Paste Special..."; - Command = ".uno:PasteSpecial"; - }; - MenuItem - { - Separator = TRUE ; - }; - MenuItem - { - Identifier = SID_DB_APP_DELETE; - Text[ en-US ] = "Delete"; - Command = ".uno:DBDelete"; - }; - MenuItem - { - Identifier = SID_DB_APP_RENAME; - Text[ en-US ] = "Rename"; - Command = ".uno:DBRename"; - }; - MenuItem - { - Identifier = SID_DB_APP_EDIT; - Text[ en-US ] = "Edit"; - Command = ".uno:DBEdit"; - }; - MenuItem - { - Identifier = SID_DB_APP_EDIT_SQL_VIEW; - Text [ en-US ] = "Edit in SQL View..."; - Command = ".uno:DBEditSqlView"; - }; - MenuItem - { - Identifier = SID_DB_APP_OPEN; - Text[ en-US ] = "Open"; - Command = ".uno:DBOpen"; - }; - MenuItem - { - Identifier = SID_DB_APP_CONVERTTOVIEW; - Text[ en-US ] = "Create as View"; - Command = ".uno:DBConvertToView"; - }; - MenuItem - { - Identifier = SID_FORM_CREATE_REPWIZ_PRE_SEL; - Text [ en-US ] = "Form Wizard..."; - Command = ".uno:DBNewFormAutoPilotWithPreSelection"; - }; - MenuItem - { - Identifier = SID_APP_NEW_REPORT_PRE_SEL; - Command = ".uno:DBNewReportWithPreSelection"; - Text [ en-US ] = "Report..." ; - }; - MenuItem - { - Identifier = SID_REPORT_CREATE_REPWIZ_PRE_SEL ; - Text[ en-US ] = "Report Wizard..."; - - Command = ".uno:DBNewReportAutoPilotWithPreSelection"; - }; - MenuItem - { - Separator = TRUE ; - }; - MenuItem - { - Identifier = SID_SELECTALL; - Text[ en-US ] = "Select All"; - Command = ".uno:SelectAll"; - }; - MenuItem - { - Separator = TRUE ; - }; - MenuItem - { - Identifier = MN_PROPS; - Text[ en-US ] = "~Database"; - SubMenu = Menu - { - ItemList = - { - MenuItem - { - Identifier = SID_DB_APP_DSPROPS; - Text[ en-US ] = "Properties..."; - Command = ".uno:DBDSProperties"; - }; - MenuItem - { - Identifier = SID_DB_APP_DSCONNECTION_TYPE; - Text[ en-US ] = "Connection Type..."; - Command = ".uno:DBDSConnectionType"; - }; - MenuItem - { - Identifier = SID_DB_APP_DSADVANCED_SETTINGS; - Text[ en-US ] = "Advanced Settings..."; - Command = ".uno:DBDSAdvancedSettings"; - }; - }; - }; - }; - }; -}; - String STR_QUERY_DELETE_DATASOURCE { Text [ en-US ] = "Do you want to delete the data source '%1'?" ; diff --git a/dbaccess/uiconfig/dbapp/popupmenu/edit.xml b/dbaccess/uiconfig/dbapp/popupmenu/edit.xml new file mode 100644 index 000000000000..5f67d0bf95ba --- /dev/null +++ b/dbaccess/uiconfig/dbapp/popupmenu/edit.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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/. + * +--> +<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu"> + <menu:menuitem menu:id=".uno:Copy"/> + <menu:menuitem menu:id=".uno:Paste"/> + <menu:menuitem menu:id=".uno:PasteSpecial"/> + <menu:menuseparator/> + <menu:menuitem menu:id=".uno:DBDelete"/> + <menu:menuitem menu:id=".uno:DBRename"/> + <menu:menuitem menu:id=".uno:DBEdit"/> + <menu:menuitem menu:id=".uno:DBEditSqlView"/> + <menu:menuitem menu:id=".uno:DBOpen"/> + <menu:menuitem menu:id=".uno:DBConvertToView"/> + <menu:menuitem menu:id=".uno:DBNewFormAutoPilotWithPreSelection"/> + <menu:menuitem menu:id=".uno:DBNewReportWithPreSelection"/> + <menu:menuitem menu:id=".uno:DBNewReportAutoPilotWithPreSelection"/> + <menu:menuseparator/> + <menu:menuitem menu:id=".uno:SelectAll"/> + <menu:menuseparator/> + <menu:menu menu:id=".uno:DBDatabasePropertiesMenu"> + <menu:menupopup> + <menu:menuitem menu:id=".uno:DBDSProperties"/> + <menu:menuitem menu:id=".uno:DBDSConnectionType"/> + <menu:menuitem menu:id=".uno:DBDSAdvancedSettings"/> + </menu:menupopup> + </menu:menu> +</menu:menupopup> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/BaseWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/BaseWindowState.xcu index 234cb58cf71e..72d0943351a7 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/BaseWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/BaseWindowState.xcu @@ -3,6 +3,11 @@ <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:install="http://openoffice.org/2004/installation" oor:name="BaseWindowState" oor:package="org.openoffice.Office.UI"> <node oor:name="UIElements"> <node oor:name="States"> + <node oor:name="private:resource/popupmenu/edit" oor:op="replace"> + <prop oor:name="UIName" oor:type="xs:string"> + <value xml:lang="en-US">Database Object</value> + </prop> + </node> <node oor:name="private:resource/toolbar/tableobjectbar" oor:op="replace"> <prop oor:name="DockPos" oor:type="xs:string"> <value>0,0</value> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu index 3c44bef4cf49..d6cdfc0c9fd6 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu @@ -114,6 +114,9 @@ <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Open Database Object...</value> </prop> + <prop oor:name="PopupLabel" oor:type="xs:string"> + <value xml:lang="en-US">Open...</value> + </prop> </node> <node oor:name=".uno:DBTableDelete" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> @@ -277,6 +280,11 @@ <value xml:lang="en-US">Form Wizard...</value> </prop> </node> + <node oor:name=".uno:DBNewReportWithPreSelection" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Report...</value> + </prop> + </node> <node oor:name=".uno:DBNewReportAutoPilot" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Report Wizard...</value> |