summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2016-10-24 23:21:30 +0300
committerMaxim Monastirsky <momonasmon@gmail.com>2016-10-27 11:05:38 +0300
commit420e80dfd742bc2387741d8650d353a20c36e8c5 (patch)
treec377f6539cca34036782991decb0b2e53a2aaf9e /dbaccess
parent074449ee349ccfe67466fb1aa63f96e8792334aa (diff)
Convert RID_MENU_APP_NEW to xml
Achieved by using GenericPopupToolbarController for the associated toolbar button. Change-Id: I406ff40e0c80d6db903de5629088d35487ab6416
Diffstat (limited to 'dbaccess')
-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
4 files changed, 24 insertions, 72 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>