summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dbaccess/UIConfig_dbapp.mk4
-rw-r--r--dbaccess/inc/dbaccess_helpid.hrc7
-rw-r--r--dbaccess/source/ui/app/app.src65
-rw-r--r--dbaccess/uiconfig/dbapp/popupmenu/new.xml20
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu19
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu12
6 files changed, 54 insertions, 73 deletions
diff --git a/dbaccess/UIConfig_dbapp.mk b/dbaccess/UIConfig_dbapp.mk
index 1611108fa0be..f810f4b8718c 100644
--- a/dbaccess/UIConfig_dbapp.mk
+++ b/dbaccess/UIConfig_dbapp.mk
@@ -13,6 +13,10 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/dbapp,\
dbaccess/uiconfig/dbapp/menubar/menubar \
))
+$(eval $(call gb_UIConfig_add_popupmenufiles,modules/dbapp,\
+ dbaccess/uiconfig/dbapp/popupmenu/new \
+))
+
$(eval $(call gb_UIConfig_add_statusbarfiles,modules/dbapp,\
dbaccess/uiconfig/dbapp/statusbar/statusbar \
))
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index 3280fe412a47..086bf7f4d40a 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -37,8 +37,6 @@
#define HID_CTL_QRYSQLEDIT "DBACCESS_HID_CTL_QRYSQLEDIT"
-#define HID_BROWSER_QUERY_CREATE_TEXT "DBACCESS_HID_BROWSER_QUERY_CREATE_TEXT"
-
#define HID_CTL_QRYDGNTAB "DBACCESS_HID_CTL_QRYDGNTAB"
#define HID_CTL_QRYDGNCRIT "DBACCESS_HID_CTL_QRYDGNCRIT"
#define HID_QRYDGN_ROW_VISIBLE "DBACCESS_HID_QRYDGN_ROW_VISIBLE"
@@ -54,8 +52,6 @@
#define HID_QUERY_ALIASNAME "DBACCESS_HID_QUERY_ALIASNAME"
#define HID_QUERY_DISTINCT "DBACCESS_HID_QUERY_DISTINCT"
-#define HID_BROWSER_QUERY_CREATE_DESIGN "DBACCESS_HID_BROWSER_QUERY_CREATE_DESIGN"
-
#define HID_TAB_DESIGN_FIELDCONTROL "DBACCESS_HID_TAB_DESIGN_FIELDCONTROL"
#define HID_TABLE_DESIGN_HELP_WINDOW "DBACCESS_HID_TABLE_DESIGN_HELP_WINDOW"
#define HID_TAB_DESIGN_DESCWIN "DBACCESS_HID_TAB_DESIGN_DESCWIN"
@@ -80,12 +76,10 @@
#define HID_TAB_ENT_NUMTYP "DBACCESS_HID_TAB_ENT_NUMTYP"
#define HID_TAB_ENT_LEN "DBACCESS_HID_TAB_ENT_LEN"
#define HID_TAB_ENT_SCALE "DBACCESS_HID_TAB_ENT_SCALE"
-#define HID_BROWSER_TABLE_CREATE_DESIGN "DBACCESS_HID_BROWSER_TABLE_CREATE_DESIGN"
#define HID_CTL_RELATIONTAB "DBACCESS_HID_CTL_RELATIONTAB"
#define HID_RELATIONDIALOG_LEFTFIELDCELL "DBACCESS_HID_RELATIONDIALOG_LEFTFIELDCELL"
#define HID_RELATIONDIALOG_RIGHTFIELDCELL "DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL"
#define HID_BROWSER_COLUMNINFO "DBACCESS_HID_BROWSER_COLUMNINFO"
-#define HID_BROWSER_VIEW_CREATE_DESIGN "DBACCESS_HID_BROWSER_VIEW_CREATE_DESIGN"
#define HID_CONFIRM_DROP_BUTTON_ALL "DBACCESS_HID_CONFIRM_DROP_BUTTON_ALL"
#define HID_DSADMIN_LDAP_HOSTNAME "DBACCESS_HID_DSADMIN_LDAP_HOSTNAME"
#define HID_DSBROWSER_DISCONNECTING "DBACCESS_HID_DSBROWSER_DISCONNECTING"
@@ -97,7 +91,6 @@
#define HID_QUERY_EDIT_JOINCONNECTION "DBACCESS_HID_QUERY_EDIT_JOINCONNECTION"
-#define HID_DOCUMENT_CREATE_REPWIZ "DBACCESS_HID_DOCUMENT_CREATE_REPWIZ"
#define HID_TAB_AUTOINCREMENTVALUE "DBACCESS_HID_TAB_AUTOINCREMENTVALUE"
#define HID_DSADMIN_DBASE_PATH "DBACCESS_HID_DSADMIN_DBASE_PATH"
diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src
index 662d7020ef31..3b4f12496727 100644
--- a/dbaccess/source/ui/app/app.src
+++ b/dbaccess/source/ui/app/app.src
@@ -81,71 +81,6 @@ String RID_STR_REPORTS_CONTAINER
Text [ en-US ] = "Reports" ;
};
-Menu RID_MENU_APP_NEW
-{
- ItemList =
- {
- MenuItem
- {
- Identifier = SID_APP_NEW_FORM;
- Command = ".uno:DBNewForm";
- Text [ en-US ] = "Form..." ;
- };
- MenuItem
- {
- Identifier = SID_APP_NEW_REPORT;
- Command = ".uno:DBNewReport";
- Text [ en-US ] = "Report..." ;
- };
- MenuItem
- {
- Identifier = ID_DOCUMENT_CREATE_REPWIZ ;
- HelpID = HID_DOCUMENT_CREATE_REPWIZ ;
- Text [ en-US ] = "Report Wizard...";
- Command = ".uno:DBNewReportAutoPilot";
- };
- MenuItem
- {
- Identifier = ID_NEW_QUERY_DESIGN;
- HelpId = HID_BROWSER_QUERY_CREATE_DESIGN ;
- Text [ en-US ] = "New ~Query (Design View)" ;
- Command = ".uno:DBNewQuery";
- };
- MenuItem
- {
- Identifier = ID_NEW_QUERY_SQL;
- HelpId = HID_BROWSER_QUERY_CREATE_TEXT ;
- Text [ en-US ] = "New Query (~SQL View)" ;
- Command = ".uno:DBNewQuerySql";
- };
- MenuItem
- {
- Separator = TRUE;
- };
- MenuItem
- {
- Identifier = ID_NEW_TABLE_DESIGN;
- HelpId = HID_BROWSER_TABLE_CREATE_DESIGN ;
- Text [ en-US ] = "New ~Table Design" ;
- Command = ".uno:DBNewTable";
- };
- MenuItem
- {
- Identifier = ID_NEW_VIEW_DESIGN;
- HelpId = HID_BROWSER_VIEW_CREATE_DESIGN ;
- Text [ en-US ] = "New ~View Design" ;
- Command = ".uno:DBNewView";
- };
- MenuItem
- {
- Identifier = SID_DB_NEW_VIEW_SQL;
- Command = ".uno:DBNewViewSQL";
- Text [ en-US ] = "View (Simple)..." ;
- };
-
- };
-};
-
Menu RID_MENU_APP_EDIT
{
ItemList =
diff --git a/dbaccess/uiconfig/dbapp/popupmenu/new.xml b/dbaccess/uiconfig/dbapp/popupmenu/new.xml
new file mode 100644
index 000000000000..a4068ae6b848
--- /dev/null
+++ b/dbaccess/uiconfig/dbapp/popupmenu/new.xml
@@ -0,0 +1,20 @@
+<?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:DBNewForm"/>
+ <menu:menuitem menu:id=".uno:DBNewReport"/>
+ <menu:menuitem menu:id=".uno:DBNewReportAutoPilot"/>
+ <menu:menuitem menu:id=".uno:DBNewQuery"/>
+ <menu:menuitem menu:id=".uno:DBNewQuerySql"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:DBNewTable"/>
+ <menu:menuitem menu:id=".uno:DBNewView"/>
+ <menu:menuitem menu:id=".uno:DBNewViewSQL"/>
+</menu:menupopup>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index c91e8e1d0e6b..4ef4e4bc1572 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -397,6 +397,20 @@
<value>com.sun.star.comp.framework.ToolbarModeMenuController</value>
</prop>
</node>
+ <node oor:name="c33" oor:op="replace">
+ <prop oor:name="Command">
+ <value>.uno:DBNewMenu</value>
+ </prop>
+ <prop oor:name="Module">
+ <value>com.sun.star.sdb.OfficeDatabaseDocument</value>
+ </prop>
+ <prop oor:name="Controller">
+ <value>com.sun.star.comp.framework.ResourceMenuController</value>
+ </prop>
+ <prop oor:name="Value">
+ <value>new</value>
+ </prop>
+ </node>
</node>
<node oor:name="ToolBar">
<node oor:name="ZoomToolBox" oor:op="replace">
@@ -673,7 +687,10 @@
<value>com.sun.star.sdb.OfficeDatabaseDocument</value>
</prop>
<prop oor:name="Controller">
- <value>com.sun.star.sdb.ApplicationToolboxController</value>
+ <value>com.sun.star.comp.framework.GenericPopupToolbarController</value>
+ </prop>
+ <prop oor:name="Value">
+ <value>.uno:DBNewMenu;1</value>
</prop>
</node>
<node oor:name="org.libreoffice.comp.dbu.LimitBoxController" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu
index 6b9ef33086d3..81deeef828ee 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu
@@ -367,6 +367,9 @@
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Query (Design View)...</value>
</prop>
+ <prop oor:name="PopupLabel" oor:type="xs:string">
+ <value xml:lang="en-US">New ~Query (Design View)</value>
+ </prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
@@ -375,6 +378,9 @@
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Query (SQL View)...</value>
</prop>
+ <prop oor:name="PopupLabel" oor:type="xs:string">
+ <value xml:lang="en-US">New Query (~SQL View)</value>
+ </prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
@@ -383,6 +389,9 @@
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Table Design...</value>
</prop>
+ <prop oor:name="PopupLabel" oor:type="xs:string">
+ <value xml:lang="en-US">New ~Table Design</value>
+ </prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
@@ -391,6 +400,9 @@
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">View Design...</value>
</prop>
+ <prop oor:name="PopupLabel" oor:type="xs:string">
+ <value xml:lang="en-US">New ~View Design</value>
+ </prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
generated by cgit (git 2.34.1) at 2024-12-27 16:56:35 +0000