diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-18 11:21:36 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-18 11:21:43 +0100 |
| commit | a6426327266f1f4c3d7738051a8ce7402368553a (patch) | |
| tree | 1ffaa9d0a8056f9500071c8630c4e79f42aa4f48 /dbaccess/source/ui | |
| parent | 1660bdd08bde5efa7cbfc9e8b2aed5d90504fceb (diff) | |
convert join menu to .ui
Change-Id: I4e38e431df00a8a97772c5eb0056f824beaf8912
Diffstat (limited to 'dbaccess/source/ui')
| -rw-r--r-- | dbaccess/source/ui/inc/browserids.hxx | 1 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/dbu_resource.hrc | 1 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/JoinTableView.cxx | 18 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/query.src | 19 |
4 files changed, 8 insertions, 31 deletions
diff --git a/dbaccess/source/ui/inc/browserids.hxx b/dbaccess/source/ui/inc/browserids.hxx index ba3404fd0b76..1777d619d009 100644 --- a/dbaccess/source/ui/inc/browserids.hxx +++ b/dbaccess/source/ui/inc/browserids.hxx @@ -99,7 +99,6 @@ #define ID_QUERY_TABLENAME (SID_SBA_START + 42) // show table name #define ID_QUERY_ALIASNAME (SID_SBA_START + 43) // show alias name #define ID_QUERY_DISTINCT (SID_SBA_START + 44) // show distinct -#define ID_QUERY_EDIT_JOINCONNECTION (SID_SBA_START + 45) // show-edit Join #define ID_BROWSER_INSERT_ROW (SID_SBA_START + 46) // insert row #define ID_QUERY_ZOOM_IN SID_ZOOM_IN #define ID_QUERY_ZOOM_OUT SID_ZOOM_OUT diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index 70d00dbd234f..52d6aefd3373 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -124,7 +124,6 @@ // menus #define RID_QUERYFUNCTION_POPUPMENU RID_MENU_START + 6 -#define RID_MENU_JOINVIEW_CONNECTION RID_MENU_START + 16 #define RID_MENU_JOINVIEW_TABLE RID_MENU_START + 17 // strings diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 0c8fedfc97f9..ff97680c0e89 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -1129,16 +1129,14 @@ bool OJoinTableView::IsAddAllowed() void OJoinTableView::executePopup(const Point& _aPos, VclPtr<OTableConnection>& rSelConnection) { - ScopedVclPtrInstance<PopupMenu> aContextMenu( ModuleRes( RID_MENU_JOINVIEW_CONNECTION ) ); - switch (aContextMenu->Execute(this, _aPos)) - { - case SID_DELETE: - RemoveConnection(rSelConnection, true); - break; - case ID_QUERY_EDIT_JOINCONNECTION: - ConnDoubleClicked(rSelConnection); // is the same as double clicked - break; - } + VclBuilder aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "dbaccess/ui/joinviewmenu.ui", ""); + VclPtr<PopupMenu> aContextMenu(aBuilder.get_menu("menu")); + aContextMenu->Execute(this, _aPos); + OString sIdent = aContextMenu->GetCurItemIdent(); + if (sIdent == "delete") + RemoveConnection(rSelConnection, true); + else if (sIdent == "edit") + ConnDoubleClicked(rSelConnection); // is the same as double clicked } void OJoinTableView::Command(const CommandEvent& rEvt) diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src index f84fce531999..e18a19d5936d 100644 --- a/dbaccess/source/ui/querydesign/query.src +++ b/dbaccess/source/ui/querydesign/query.src @@ -21,25 +21,6 @@ #include "browserids.hxx" #include "dbaccess_helpid.hrc" -Menu RID_MENU_JOINVIEW_CONNECTION -{ - ItemList = - { - MenuItem - { - Identifier = SID_DELETE ; - Command = ".uno:Delete" ; - Text [ en-US ] = "~Delete" ; - }; - MenuItem - { - Identifier = ID_QUERY_EDIT_JOINCONNECTION; - HelpId = HID_QUERY_EDIT_JOINCONNECTION ; - Text [ en-US ] = "Edit..."; - }; - }; -}; - Menu RID_MENU_JOINVIEW_TABLE { ItemList = |