Skip to content

Commit 66a055e

Browse files
committed
WIP
1 parent 09bdcb5 commit 66a055e

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

Src/Merge.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2351,8 +2351,8 @@ CAPTION "Plugins"
23512351
FONT 8, FONTNAME, 0, 0, 0x1
23522352
BEGIN
23532353
CONTROL "&Enable plugins",IDC_PLUGINS_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,266,10
2354-
LTEXT "Plugin &type:",IDC_STATIC,7,19,70,10
2355-
COMBOBOX IDC_PLUGIN_TYPE,80,19,205,14,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
2354+
LTEXT "Plugin &type:",IDC_STATIC,7,21,70,10
2355+
COMBOBOX IDC_PLUGIN_TYPE,80,19,205,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
23562356
CONTROL "",IDC_PLUGINSLIST_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,38,456,139
23572357
LTEXT "File filters:",IDC_STATIC,7,183,70,10
23582358
COMBOBOX IDC_PLUGIN_FILEFILTERS,80,183,305,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP

Src/PluginsListDlg.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ BOOL PluginsListDlg::OnInitDialog()
7979

8080

8181
InitList();
82+
SetDlgItemComboBoxList(IDC_PLUGIN_TYPE, { _("Unpacker"), _("Prediffer"), _("Editor script") });
83+
m_comboType.SetCurSel(0);
8284
SetPlugins(0);
8385
m_list.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
8486

@@ -210,7 +212,10 @@ void PluginsListDlg::AddPlugin(unsigned id)
210212
return;
211213
String errmsg;
212214
if (internal_plugin::AddPlugin(*info, errmsg))
215+
{
216+
m_comboType.SetCurSel(id == ID_PLUGIN_ADD_UNPACKER ? 0 : 1);
213217
break;
218+
}
214219
AfxMessageBox(errmsg.c_str(), MB_OK | MB_ICONEXCLAMATION);
215220
}
216221
RefreshList();
@@ -422,6 +427,7 @@ void PluginsListDlg::OnLVNItemChanged(NMHDR *pNMHDR, LRESULT *pResult)
422427
*/
423428
void PluginsListDlg::OnSelchangePluginType()
424429
{
430+
SetPlugins(m_comboType.GetCurSel());
425431
}
426432

427433
/**

Translations/WinMerge/Japanese.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2070,7 +2070,7 @@ msgid "&Enable plugins"
20702070
msgstr "プラグインを有効にする(&E)"
20712071

20722072
msgid "Plugin &type:"
2073-
msgstr "プラグインの種類(&T)"
2073+
msgstr "プラグインの種類(&T):"
20742074

20752075
msgid "File filters:"
20762076
msgstr "ファイル フィルター:"

0 commit comments

Comments
 (0)