starred/simplewall
1
0 Fork 0
mirror of https://github.com/henrypp/simplewall.git synced 2026-10-21 18:43:09 -05:00
Code Issues Packages Projects Releases 10 Wiki Activity

remove IDM_EXPLORE (replaced by IDM_PROPERTIES)

Browse Source
This commit is contained in:
henrypp committed 2020-04-30 20:09:05 +06:00
1 parent 98fbc838dd
commit 6bd53e2ebf
3 files changed
+31 -37
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main.cpp
+20 -24
View File
@@ -2727,11 +2727,7 @@ find_wrap:
INT command_id = 0;
const INT ctrl_id = static_cast<INT>(lpnmlv->hdr.idFrom);
if (ctrl_id >= IDC_APPS_PROFILE && ctrl_id <= IDC_APPS_UWP)
{
command_id = IDM_EXPLORE;
}
else if (ctrl_id >= IDC_RULES_BLOCKLIST && ctrl_id <= IDC_LOG)
if (ctrl_id >= IDC_APPS_PROFILE && ctrl_id <= IDC_LOG)
{
command_id = IDM_PROPERTIES;
}
@@ -2794,7 +2790,7 @@ find_wrap:
_app_generate_timermenu (hsubmenu2, hash_item);
AppendMenu (hmenu, MF_STRING, IDM_EXPLORE, app.LocaleString (IDS_EXPLORE, L"\tEnter"));
AppendMenu (hmenu, MF_STRING, IDM_PROPERTIES, app.LocaleString (IDS_EXPLORE, L"\tEnter"));
AppendMenu (hmenu, MF_STRING, IDM_DELETE, app.LocaleString (IDS_DELETE, L"\tDel"));
AppendMenu (hmenu, MF_SEPARATOR, 0, nullptr);
AppendMenu (hmenu, MF_POPUP, (UINT_PTR)hsubmenu1, app.LocaleString (IDS_TRAY_RULES, nullptr));
@@ -2808,7 +2804,7 @@ find_wrap:
AppendMenu (hmenu, MF_STRING, IDM_COPY, app.LocaleString (IDS_COPY, L"\tCtrl+C"));
AppendMenu (hmenu, MF_STRING, IDM_COPY2, app.LocaleString (IDS_COPY, _r_fmt (L" \"%s\"", _r_listview_getcolumntext (hwnd, listview_id, lv_column_current).GetString ())));
SetMenuDefaultItem (hmenu, IDM_EXPLORE, MF_BYCOMMAND);
SetMenuDefaultItem (hmenu, IDM_PROPERTIES, MF_BYCOMMAND);
_r_menu_checkitem (hmenu, IDM_DISABLENOTIFICATIONS, 0, MF_BYCOMMAND, _app_getappinfo (hash_item, InfoIsSilent) != FALSE);
@@ -3975,7 +3971,6 @@ find_wrap:
case IDM_DISABLENOTIFICATIONS:
case IDM_DISABLETIMER:
case IDM_EXPLORE:
{
const INT listview_id = (INT)_r_tab_getlparam (hwnd, IDC_TAB, INVALID_INT);
@@ -3998,12 +3993,7 @@ find_wrap:
if (ptr_app)
{
if (ctrl_id == IDM_EXPLORE)
{
if (ptr_app->type != DataAppPico && ptr_app->type != DataAppDevice)
_r_path_explore (ptr_app->real_path);
}
else if (ctrl_id == IDM_DISABLENOTIFICATIONS)
if (ctrl_id == IDM_DISABLENOTIFICATIONS)
{
if (new_val == INVALID_INT)
new_val = !ptr_app->is_silent;
@@ -4018,18 +4008,15 @@ find_wrap:
{
_app_timer_reset (hwnd, ptr_app);
}
_r_obj_dereference (ptr_app_object);
}
_r_obj_dereference (ptr_app_object);
}
if (ctrl_id == IDM_DISABLETIMER || ctrl_id == IDM_DISABLENOTIFICATIONS)
{
_app_listviewsort (hwnd, listview_id);
_app_refreshstatus (hwnd, listview_id);
_app_listviewsort (hwnd, listview_id);
_app_refreshstatus (hwnd, listview_id);
_app_profile_save ();
}
_app_profile_save ();
break;
}
@@ -4336,14 +4323,23 @@ find_wrap:
case IDM_PROPERTIES:
{
const INT listview_id = (INT)_r_tab_getlparam (hwnd, IDC_TAB, INVALID_INT);
const INT item = (INT)SendDlgItemMessage (hwnd, listview_id, LVM_GETNEXTITEM, (WPARAM)INVALID_INT, LVNI_SELECTED);
INT item = (INT)SendDlgItemMessage (hwnd, listview_id, LVM_GETNEXTITEM, (WPARAM)INVALID_INT, LVNI_SELECTED);
if (item == INVALID_INT)
break;
if (listview_id >= IDC_APPS_PROFILE && listview_id <= IDC_APPS_UWP)
{
PostMessage (hwnd, WM_COMMAND, MAKEWPARAM (IDM_EXPLORE, 0), 0);
do
{
const size_t app_hash = _r_listview_getitemlparam (hwnd, listview_id, item);
LPCWSTR path = (LPCWSTR)_app_getappinfo (app_hash, InfoPath);
if (path)
_r_path_explore (path);
}
while ((item = (INT)SendDlgItemMessage (hwnd, listview_id, LVM_GETNEXTITEM, (WPARAM)item, LVNI_SELECTED)) != INVALID_INT);
}
else if (listview_id >= IDC_RULES_BLOCKLIST && listview_id <= IDC_RULES_CUSTOM)
{
src/resource.hpp
+11 -12
View File
@@ -256,20 +256,19 @@
#define IDM_DISABLENOTIFICATIONS 297
#define IDM_EDITRULES 298
#define IDM_OPENRULESEDITOR 299
#define IDM_EXPLORE 300
#define IDM_COPY 301
#define IDM_COPY2 302
#define IDM_CHECK 303
#define IDM_UNCHECK 304
#define IDM_DELETE 305
#define IDM_DISABLETIMER 306
#define IDM_PROPERTIES 307
#define IDM_NETWORK_CLOSE 308
#define IDM_COPY 300
#define IDM_COPY2 301
#define IDM_CHECK 302
#define IDM_UNCHECK 303
#define IDM_DELETE 304
#define IDM_DISABLETIMER 305
#define IDM_PROPERTIES 306
#define IDM_NETWORK_CLOSE 307
#define IDM_NOTIMER 309
#define IDM_NOTIMER 308
#define IDM_SELECT_ALL 310
#define IDM_ZOOM 311
#define IDM_SELECT_ALL 309
#define IDM_ZOOM 310
#define IDX_LANGUAGE 1000
#define IDX_TIMER 1200
src/resource.rc
-1
View File
@@ -15,7 +15,6 @@ IDA_MAIN ACCELERATORS
BEGIN
"A", IDM_SELECT_ALL, CONTROL, VIRTKEY
"C", IDM_COPY, CONTROL, VIRTKEY
"E", IDM_EXPLORE, CONTROL, VIRTKEY
"F", IDM_FIND, CONTROL, VIRTKEY
"S", IDM_EXPORT, CONTROL, VIRTKEY
"O", IDM_IMPORT, CONTROL, VIRTKEY