Skip to content

Commit

Permalink
upd project sdk
Browse files Browse the repository at this point in the history
  • Loading branch information
@henrypp
henrypp committed Sep 16, 2024
1 parent 394801d commit 72af699
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 26 deletions.
22 changes: 11 additions & 11 deletions src/editor.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1001,16 +1001,16 @@ INT_PTR CALLBACK EditorPagesProc (

if (context->ptr_rule->is_readonly)
{
_r_menu_enableitem (hsubmenu, id_add, MF_BYCOMMAND, FALSE);
_r_menu_enableitem (hsubmenu, id_edit, MF_BYCOMMAND, FALSE);
_r_menu_enableitem (hsubmenu, id_delete, MF_BYCOMMAND, FALSE);
_r_menu_enableitem (hsubmenu, id_add, FALSE, FALSE);
_r_menu_enableitem (hsubmenu, id_edit, FALSE, FALSE);
_r_menu_enableitem (hsubmenu, id_delete, FALSE, FALSE);
}

if (!is_selected)
{
_r_menu_enableitem (hsubmenu, id_edit, MF_BYCOMMAND, FALSE);
_r_menu_enableitem (hsubmenu, id_delete, MF_BYCOMMAND, FALSE);
_r_menu_enableitem (hsubmenu, IDM_COPY, MF_BYCOMMAND, FALSE);
_r_menu_enableitem (hsubmenu, id_edit, FALSE, FALSE);
_r_menu_enableitem (hsubmenu, id_delete, FALSE, FALSE);
_r_menu_enableitem (hsubmenu, IDM_COPY, FALSE, FALSE);
}

_r_obj_dereference (localized_string);
Expand All @@ -1024,15 +1024,15 @@ INT_PTR CALLBACK EditorPagesProc (

if (context->is_settorules && context->ptr_rule->type != DATA_RULE_USER)
{
_r_menu_enableitem (hsubmenu, IDM_CHECK, MF_BYCOMMAND, FALSE);
_r_menu_enableitem (hsubmenu, IDM_UNCHECK, MF_BYCOMMAND, FALSE);
_r_menu_enableitem (hsubmenu, IDM_CHECK, FALSE, FALSE);
_r_menu_enableitem (hsubmenu, IDM_UNCHECK, FALSE, FALSE);
}

if (!is_selected)
{
_r_menu_enableitem (hsubmenu, IDM_CHECK, MF_BYCOMMAND, FALSE);
_r_menu_enableitem (hsubmenu, IDM_UNCHECK, MF_BYCOMMAND, FALSE);
_r_menu_enableitem (hsubmenu, IDM_COPY, MF_BYCOMMAND, FALSE);
_r_menu_enableitem (hsubmenu, IDM_CHECK, FALSE, FALSE);
_r_menu_enableitem (hsubmenu, IDM_UNCHECK, FALSE, FALSE);
_r_menu_enableitem (hsubmenu, IDM_COPY, FALSE, FALSE);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ VOID _app_config_apply (

_r_menu_checkitem (hmenu, IDM_USEHASHES_CHK, 0, MF_BYCOMMAND, new_val);

_r_menu_enableitem (hmenu, IDM_USEAPPMONITOR_CHK, MF_BYCOMMAND, new_val);
_r_menu_enableitem (hmenu, IDM_USEAPPMONITOR_CHK, FALSE, new_val);

if (new_val)
{
Expand Down
29 changes: 15 additions & 14 deletions src/messages.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ VOID _app_message_initialize (
if (hmenu)
{
if (_r_config_getboolean (L"IsInternalRulesDisabled", FALSE))
_r_menu_enableitem (hmenu, 4, MF_BYPOSITION, FALSE);
_r_menu_enableitem (hmenu, 4, FALSE, FALSE);

_r_menu_checkitem (hmenu, IDM_ALWAYSONTOP_CHK, 0, MF_BYCOMMAND, _r_config_getboolean (L"AlwaysOnTop", FALSE));
_r_menu_checkitem (hmenu, IDM_AUTOSIZECOLUMNS_CHK, 0, MF_BYCOMMAND, _r_config_getboolean (L"AutoSizeColumns", TRUE));
Expand Down Expand Up @@ -78,7 +78,7 @@ VOID _app_message_initialize (
_r_menu_checkitem (hmenu, IDM_RULE_ALLOWWINDOWSUPDATE, 0, MF_BYCOMMAND, _app_wufixenabled ());

if (!_r_sys_isosversiongreaterorequal (WINDOWS_10))
_r_menu_enableitem (hmenu, IDM_RULE_ALLOWWINDOWSUPDATE, MF_BYCOMMAND, FALSE);
_r_menu_enableitem (hmenu, IDM_RULE_ALLOWWINDOWSUPDATE, FALSE, FALSE);

_r_menu_checkitem (hmenu, IDM_PROFILETYPE_PLAIN, IDM_PROFILETYPE_ENCRYPTED, MF_BYCOMMAND, IDM_PROFILETYPE_PLAIN + _r_calc_clamp (_r_config_getlong (L"ProfileType", 0), 0, 2));

Expand All @@ -90,7 +90,7 @@ VOID _app_message_initialize (
_r_menu_checkitem (hmenu, IDM_USENETWORKRESOLUTION_CHK, 0, MF_BYCOMMAND, _r_config_getboolean (L"IsNetworkResolutionsEnabled", FALSE));
_r_menu_checkitem (hmenu, IDM_USEAPPMONITOR_CHK, 0, MF_BYCOMMAND, _r_config_getboolean (L"IsEnableAppMonitor", FALSE));

_r_menu_enableitem (hmenu, IDM_USEAPPMONITOR_CHK, MF_BYCOMMAND, is_enabled);
_r_menu_enableitem (hmenu, IDM_USEAPPMONITOR_CHK, FALSE, is_enabled);

_r_menu_checkitem (
hmenu,
Expand Down Expand Up @@ -558,7 +558,7 @@ VOID _app_generate_appmenu (
_r_menu_additem (hsubmenu_rules, IDM_DISABLEREMOVAL, _r_locale_getstring (IDS_DISABLEREMOVAL));

if (_app_isdisabledremoval (app_hash))
_r_menu_enableitem (hsubmenu_rules, IDM_DISABLEREMOVAL, MF_BYCOMMAND, FALSE);
_r_menu_enableitem (hsubmenu_rules, IDM_DISABLEREMOVAL, FALSE, FALSE);

_r_menu_additem (hsubmenu_rules, 0, NULL);

Expand Down Expand Up @@ -671,13 +671,14 @@ VOID _app_message_contextmenu (
if (_app_getappinfo (ptr_app, INFO_IS_UNDELETABLE, &is_checked, sizeof (is_checked)))
{
if (is_checked)
{
_r_menu_checkitem (hmenu, IDM_DISABLEREMOVAL, 0, MF_BYCOMMAND, is_checked);

_r_menu_enableitem (hmenu, IDM_DELETE, FALSE, FALSE);
}
}
}

if (listview_id != IDC_APPS_PROFILE)
_r_menu_enableitem (hmenu, IDM_DELETE, MF_BYCOMMAND, FALSE);

break;
}

Expand All @@ -702,7 +703,7 @@ VOID _app_message_contextmenu (
if (_app_getruleinfobyid (hash_code, INFO_IS_READONLY, &is_readonly, sizeof (is_readonly)))
{
if (is_readonly)
_r_menu_enableitem (hmenu, IDM_DELETE, MF_BYCOMMAND, FALSE);
_r_menu_enableitem (hmenu, IDM_DELETE, FALSE, FALSE);
}
}

Expand Down Expand Up @@ -774,7 +775,7 @@ VOID _app_message_contextmenu (
if (ptr_network)
{
if (ptr_network->af != AF_INET || ptr_network->state != MIB_TCP_STATE_ESTAB)
_r_menu_enableitem (hmenu, IDM_DELETE, MF_BYCOMMAND, FALSE);
_r_menu_enableitem (hmenu, IDM_DELETE, FALSE, FALSE);

_r_obj_dereference (ptr_network);
}
Expand Down Expand Up @@ -973,17 +974,17 @@ VOID _app_message_traycontextmenu (

if (!_r_config_getboolean (L"IsNotificationsEnabled", TRUE))
{
_r_menu_enableitem (hsubmenu, IDM_TRAY_ENABLENOTIFICATIONSSOUND_CHK, MF_BYCOMMAND, FALSE);
_r_menu_enableitem (hsubmenu, IDM_TRAY_NOTIFICATIONFULLSCREENSILENTMODE_CHK, MF_BYCOMMAND, FALSE);
_r_menu_enableitem (hsubmenu, IDM_TRAY_NOTIFICATIONONTRAY_CHK, MF_BYCOMMAND, FALSE);
_r_menu_enableitem (hsubmenu, IDM_TRAY_ENABLENOTIFICATIONSSOUND_CHK, FALSE, FALSE);
_r_menu_enableitem (hsubmenu, IDM_TRAY_NOTIFICATIONFULLSCREENSILENTMODE_CHK, FALSE, FALSE);
_r_menu_enableitem (hsubmenu, IDM_TRAY_NOTIFICATIONONTRAY_CHK, FALSE, FALSE);
}
else if (!_r_config_getboolean (L"IsNotificationsSound", TRUE))
{
_r_menu_enableitem (hsubmenu, IDM_TRAY_NOTIFICATIONFULLSCREENSILENTMODE_CHK, MF_BYCOMMAND, FALSE);
_r_menu_enableitem (hsubmenu, IDM_TRAY_NOTIFICATIONFULLSCREENSILENTMODE_CHK, FALSE, FALSE);
}

if (_wfp_isfiltersapplying ())
_r_menu_enableitem (hsubmenu, IDM_TRAY_START, MF_BYCOMMAND, FALSE);
_r_menu_enableitem (hsubmenu, IDM_TRAY_START, FALSE, FALSE);

SetForegroundWindow (hwnd); // don't touch

Expand Down

0 comments on commit 72af699

Please sign in to comment.