From 0abde25440c5d98cdc489d476750ef19d8b37475 Mon Sep 17 00:00:00 2001 From: Don HO Date: Mon, 12 Nov 2018 02:21:21 +0100 Subject: [PATCH] Clean up GUI in Plugins Admin --- .../src/WinControls/PluginsAdmin/pluginsAdmin.cpp | 10 +++++----- .../src/WinControls/PluginsAdmin/pluginsAdmin.rc | 9 ++++++--- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.cpp b/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.cpp index 02c5cc97d..3a1cf51b2 100644 --- a/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.cpp +++ b/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.cpp @@ -350,11 +350,11 @@ void PluginsAdminDlg::create(int dialogID, bool isRTL, bool msgDestParent) NativeLangSpeaker *pNativeSpeaker = nppParam->getNativeLangSpeaker(); generic_string pluginStr = pNativeSpeaker->getAttrNameStr(TEXT("Plugin"), "PluginAdmin", "Plugin"); generic_string vesionStr = pNativeSpeaker->getAttrNameStr(TEXT("Version"), "PluginAdmin", "Version"); - generic_string stabilityStr = pNativeSpeaker->getAttrNameStr(TEXT("Stability"), "PluginAdmin", "Stability"); + //generic_string stabilityStr = pNativeSpeaker->getAttrNameStr(TEXT("Stability"), "PluginAdmin", "Stability"); _availableList.addColumn(columnInfo(pluginStr, nppParam->_dpiManager.scaleX(200))); _availableList.addColumn(columnInfo(vesionStr, nppParam->_dpiManager.scaleX(100))); - _availableList.addColumn(columnInfo(stabilityStr, nppParam->_dpiManager.scaleX(70))); + //_availableList.addColumn(columnInfo(stabilityStr, nppParam->_dpiManager.scaleX(70))); _availableList.setViewStyleOption(LVS_EX_CHECKBOXES); _availableList.initView(_hInst, _hSelf); @@ -362,7 +362,7 @@ void PluginsAdminDlg::create(int dialogID, bool isRTL, bool msgDestParent) _updateList.addColumn(columnInfo(pluginStr, nppParam->_dpiManager.scaleX(200))); _updateList.addColumn(columnInfo(vesionStr, nppParam->_dpiManager.scaleX(100))); - _updateList.addColumn(columnInfo(stabilityStr, nppParam->_dpiManager.scaleX(70))); + //_updateList.addColumn(columnInfo(stabilityStr, nppParam->_dpiManager.scaleX(70))); _updateList.setViewStyleOption(LVS_EX_CHECKBOXES); _updateList.initView(_hInst, _hSelf); @@ -370,7 +370,7 @@ void PluginsAdminDlg::create(int dialogID, bool isRTL, bool msgDestParent) _installedList.addColumn(columnInfo(pluginStr, nppParam->_dpiManager.scaleX(200))); _installedList.addColumn(columnInfo(vesionStr, nppParam->_dpiManager.scaleX(100))); - _installedList.addColumn(columnInfo(stabilityStr, nppParam->_dpiManager.scaleX(70))); + //_installedList.addColumn(columnInfo(stabilityStr, nppParam->_dpiManager.scaleX(70))); _installedList.setViewStyleOption(LVS_EX_CHECKBOXES); _installedList.initView(_hInst, _hSelf); @@ -607,7 +607,7 @@ void PluginViewList::pushBack(PluginUpdateInfo* pi) values2Add.push_back(pi->_displayName); Version v = pi->_version; values2Add.push_back(v.toString()); - values2Add.push_back(TEXT("Yes")); + //values2Add.push_back(TEXT("Yes")); _ui.addLine(values2Add, reinterpret_cast(pi)); } diff --git a/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.rc b/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.rc index cca10032e..c83c746b6 100644 --- a/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.rc +++ b/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.rc @@ -36,7 +36,7 @@ IDD_PLUGINSADMIN_DLG DIALOGEX 36, 44, 500, 300 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_TOOLWINDOW -CAPTION "Plugins Manager" +CAPTION "Plugins Admin" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN RTEXT "Research: ",IDC_PLUGINADM_RESEARCH_STATIC,50,38,50,8 @@ -47,7 +47,10 @@ BEGIN PUSHBUTTON "Remove", IDC_PLUGINADM_REMOVE,432,35,57,14 //LISTBOX IDC_PLUGINADM_LISTVIEW,30,20,78,120,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_PLUGINADM_EDIT,30,160,220,80,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_BORDER | WS_VSCROLL - PUSHBUTTON "Close", IDCANCEL,332,270,57,14 - PUSHBUTTON "Settings",IDC_PLUGINADM_SETTINGS_BUTTON,255,270,69,14 + + PUSHBUTTON "Close", IDCANCEL, 225, 270, 57, 14 + + //PUSHBUTTON "Close", IDCANCEL,332,270,57,14 + //PUSHBUTTON "Settings",IDC_PLUGINADM_SETTINGS_BUTTON,255,270,69,14 END