From ea784c990949e8c9ad707f5c3a05c9d68640988f Mon Sep 17 00:00:00 2001 From: Vadim Lopatin Date: Fri, 4 Dec 2015 14:35:15 +0300 Subject: [PATCH] signal names refactoring --- src/dlangide/ui/dsourceedit.d | 4 ++-- src/dlangide/ui/frame.d | 14 +++++++------- src/dlangide/ui/searchPanel.d | 2 +- src/dlangide/ui/wspanel.d | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/dlangide/ui/dsourceedit.d b/src/dlangide/ui/dsourceedit.d index b2291a4..78b8b76 100644 --- a/src/dlangide/ui/dsourceedit.d +++ b/src/dlangide/ui/dsourceedit.d @@ -192,13 +192,13 @@ class DSourceEdit : SourceEdit { completionPopupItems.updateActionState(this); PopupMenu popupMenu = new PopupMenu(completionPopupItems); - popupMenu.onMenuItemActionListener = this; + popupMenu.menuItemAction = this; popupMenu.maxHeight(400); popupMenu.selectItem(0); PopupWidget popup = window.showPopup(popupMenu, this, PopupAlign.Point | PopupAlign.Right, textPosToClient(_caretPos).left + left + _leftPaneWidth, textPosToClient(_caretPos).top + top + margins.top); popup.setFocus(); - popup.onPopupCloseListener = delegate(PopupWidget source) { setFocus(); }; + popup.popupClosed = delegate(PopupWidget source) { setFocus(); }; popup.flags = PopupFlags.CloseOnClickOutside; Log.d("Showing popup at ", textPosToClient(_caretPos).left, " ", textPosToClient(_caretPos).top); diff --git a/src/dlangide/ui/frame.d b/src/dlangide/ui/frame.d index 11f2dc7..d38e1a6 100644 --- a/src/dlangide/ui/frame.d +++ b/src/dlangide/ui/frame.d @@ -318,8 +318,8 @@ class IDEFrame : AppFrame { _tabs = new TabWidget("TABS"); _tabs.hiddenTabsVisibility = Visibility.Gone; _tabs.setStyles(STYLE_DOCK_HOST_BODY, STYLE_TAB_UP_DARK, STYLE_TAB_UP_BUTTON_DARK, STYLE_TAB_UP_BUTTON_DARK_TEXT); - _tabs.onTabChangedListener = &onTabChanged; - _tabs.onTabCloseListener = &onTabClose; + _tabs.tabChanged = &onTabChanged; + _tabs.tabClose = &onTabClose; _dockHost.bodyWidget = _tabs; @@ -443,7 +443,7 @@ class IDEFrame : AppFrame { tb.addButtons(ACTION_DEBUG_START); projectConfigurationCombo = new ToolBarComboBox("projectConfig", [ProjectConfiguration.DEFAULT_NAME.to!dstring]);//Updateable - projectConfigurationCombo.onItemClickListener = delegate(Widget source, int index) { + projectConfigurationCombo.itemClick = delegate(Widget source, int index) { if (currentWorkspace) { currentWorkspace.setStartupProjectConfiguration(projectConfigurationCombo.selectedItem.to!string); } @@ -453,7 +453,7 @@ class IDEFrame : AppFrame { tb.addControl(projectConfigurationCombo); ToolBarComboBox cbBuildConfiguration = new ToolBarComboBox("buildConfig", ["Debug"d, "Release"d, "Unittest"d]); - cbBuildConfiguration.onItemClickListener = delegate(Widget source, int index) { + cbBuildConfiguration.itemClick = delegate(Widget source, int index) { if (currentWorkspace && index < 3) { currentWorkspace.buildConfiguration = [BuildConfiguration.Debug, BuildConfiguration.Release, BuildConfiguration.Unittest][index]; } @@ -543,7 +543,7 @@ class IDEFrame : AppFrame { FileDialog dlg = createFileDialog(caption); dlg.addFilter(FileFilterEntry(UIString("Source files"d), "*.d;*.dd;*.ddoc;*.dh;*.json;*.xml;*.ini")); dlg.addFilter(FileFilterEntry(UIString("All files"d), "*.*")); - dlg.onDialogResult = delegate(Dialog dlg, const Action result) { + dlg.dialogResult = delegate(Dialog dlg, const Action result) { if (result.id == ACTION_OPEN.id) { string filename = result.stringParam; openSourceFile(filename); @@ -584,7 +584,7 @@ class IDEFrame : AppFrame { caption = "Open Workspace or Project"d; FileDialog dlg = createFileDialog(caption); dlg.addFilter(FileFilterEntry(UIString("Workspace and project files"d), "*.dlangidews;dub.json;package.json")); - dlg.onDialogResult = delegate(Dialog dlg, const Action result) { + dlg.dialogResult = delegate(Dialog dlg, const Action result) { if (result.id == ACTION_OPEN.id) { string filename = result.stringParam; if (filename.length) @@ -634,7 +634,7 @@ class IDEFrame : AppFrame { Setting s = _settings.copySettings(); //Log.d("settings after copy:\n", s.toJSON(true)); SettingsDialog dlg = new SettingsDialog(UIString("DlangIDE settings"d), window, s, createSettingsPages()); - dlg.onDialogResult = delegate(Dialog dlg, const Action result) { + dlg.dialogResult = delegate(Dialog dlg, const Action result) { if (result.id == ACTION_APPLY.id) { //Log.d("settings after edit:\n", s.toJSON(true)); _settings.applySettings(s); diff --git a/src/dlangide/ui/searchPanel.d b/src/dlangide/ui/searchPanel.d index c3bf391..6df0599 100644 --- a/src/dlangide/ui/searchPanel.d +++ b/src/dlangide/ui/searchPanel.d @@ -193,7 +193,7 @@ class SearchWidget : TabWidget { _findText = new EditLine(); _findText.padding(Rect(5,4,50,4)); _findText.layoutWidth(400); - _findText.editorActionListener = &onEditorAction; // to handle Enter key press in editor + _findText.editorAction = &onEditorAction; // to handle Enter key press in editor _layout.addChild(_findText); auto goButton = new ImageButton("findTextButton", "edit-find"); diff --git a/src/dlangide/ui/wspanel.d b/src/dlangide/ui/wspanel.d index 6f9311b..ff0d382 100644 --- a/src/dlangide/ui/wspanel.d +++ b/src/dlangide/ui/wspanel.d @@ -64,10 +64,10 @@ class WorkspacePanel : DockWindow { override protected Widget createBodyWidget() { _tree = new TreeWidget("wstree"); _tree.layoutHeight(FILL_PARENT).layoutHeight(FILL_PARENT); - _tree.selectionListener = &onTreeItemSelected; + _tree.selectionChange = &onTreeItemSelected; _tree.fontSize = 16; _tree.noCollapseForSingleTopLevelItem = true; - _tree.popupMenuListener = &onTreeItemPopupMenu; + _tree.popupMenu = &onTreeItemPopupMenu; _workspacePopupMenu = new MenuItem(); _workspacePopupMenu.add(ACTION_PROJECT_FOLDER_ADD_ITEM);