1.4.2

henrypp · Feb 18, 2017 · fa3a8fd · fa3a8fd
1 parent ce7bc0b
commit fa3a8fd
Show file tree

Hide file tree

Showing 15 changed files with 120 additions and 99 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+v1.4.2 (19 February 2017)
++ added hints to rules pages
+- fixed filter creation for nonexistent apps (critical)
+- fixed resource definition
+- fixed purge unused apps
+- cosmetic changes about rules tooltip
+
 v1.4.1 (4 February 2017)
 - fixed suspended drop event callback (critical)
 - fixed suspended apply filters thread (critical)

diff --git a/bin/History.txt b/bin/History.txt
@@ -1,3 +1,10 @@
+v1.4.2 (19 February 2017)
++ added hints to rules pages
+- fixed filter creation for nonexistent apps (critical)
+- fixed resource definition
+- fixed purge unused apps
+- cosmetic changes about rules tooltip
+
 v1.4.1 (4 February 2017)
 - fixed suspended drop event callback (critical)
 - fixed suspended apply filters thread (critical)

diff --git a/bin/i18n/!example.txt b/bin/i18n/!example.txt
diff --git a/bin/i18n/Brazilian Portuguese.ini b/bin/i18n/Brazilian Portuguese.ini
diff --git a/bin/i18n/Farsi.ini b/bin/i18n/Farsi.ini
diff --git a/bin/i18n/French.ini b/bin/i18n/French.ini
diff --git a/bin/i18n/Korean.ini b/bin/i18n/Korean.ini
diff --git a/bin/i18n/Polish.ini b/bin/i18n/Polish.ini
diff --git a/bin/i18n/Russian.ini b/bin/i18n/Russian.ini
diff --git a/bin/i18n/Simplified Chinese.ini b/bin/i18n/Simplified Chinese.ini
diff --git a/bin/i18n/Spanish.ini b/bin/i18n/Spanish.ini
diff --git a/src/main.cpp b/src/main.cpp
diff --git a/src/main.h b/src/main.h
diff --git a/src/resource.h b/src/resource.h
@@ -41,14 +41,14 @@
 #define IDC_RULES_HELP 2005
 #define IDC_IPVERSION 2006
 #define IDC_IPVERSION_EDIT 2007
-#define IDC_PROTOCOL 2010
-#define IDC_PROTOCOL_EDIT 2011
-#define IDC_DIRECTION 2012
-#define IDC_DIRECTION_EDIT 2013
-#define IDC_ACTION 2014
-#define IDC_ACTION_EDIT 2015
-#define IDC_RULES_LINKS 2016
-#define IDC_ENABLED_CHK 2017
+#define IDC_PROTOCOL 2008
+#define IDC_PROTOCOL_EDIT 2009
+#define IDC_DIRECTION 2010
+#define IDC_DIRECTION_EDIT 2011
+#define IDC_ACTION 2012
+#define IDC_ACTION_EDIT 2013
+#define IDC_RULES_LINKS 2014
+#define IDC_ENABLED_CHK 2015
 
 // Settings Dlg
 #define IDC_NAV 1000
@@ -87,19 +87,23 @@
 #define IDC_CONFIRMLOGCLEAR_CHK 118
 #define IDC_CONFIRMMODECHANGE_CHK 119
 
-#define IDC_COLORS_HELP 129
+#define IDC_COLORS_HELP 120
 
-#define IDC_ENABLELOG_CHK 120
-#define IDC_LOGPATH 121
-#define IDC_LOGPATH_BTN 122
+#define IDC_ENABLELOG_CHK 121
+#define IDC_LOGPATH 122
+#define IDC_LOGPATH_BTN 123
 
-#define IDC_ENABLENOTIFICATIONS_CHK 123
+#define IDC_ENABLENOTIFICATIONS_CHK 124
 #define IDC_NOTIFICATIONSILENT_CHK 125
 #define IDC_NOTIFICATIONTIMEOUT_HINT 126
 #define IDC_NOTIFICATIONTIMEOUT 127
 
 #define IDC_ENABLEAPPSCOLLECTOR_CHK 128
 
+#define IDC_RULES_BLOCKLIST_HINT 129
+#define IDC_RULES_SYSTEM_HINT 130
+#define IDC_RULES_CUSTOM_HINT 131
+
 #define IDC_COLORS 200
 #define IDC_EDITOR 201
 
@@ -112,29 +116,29 @@
 #define IDM_REFRESH 2005
 #define IDM_ALWAYSONTOP_CHK 2006
 #define IDM_STARTMINIMIZED_CHK 2007
-#define IDM_SHOWFILENAMESONLY_CHK 2030
-#define IDM_ICONSSMALL 2008
-#define IDM_ICONSLARGE 2009
-#define IDM_ICONSISHIDDEN 2010
-#define IDM_SORTBYFNAME 2011
-#define IDM_SORTBYFDIR 2012
-#define IDM_SORTISDESCEND 2013
-#define IDM_ENABLELOG_CHK 2014
-#define IDM_ENABLENOTIFICATIONS_CHK 2015
-#define IDM_ENABLEAPPSCOLLECTOR_CHK 2016
-#define IDM_LOGSHOW 2017
-#define IDM_LOGCLEAR 2018
-#define IDM_WEBSITE 2019
-#define IDM_DONATE 2020
-#define IDM_CHECKUPDATES 2021
-#define IDM_ABOUT 2022
-
-#define IDM_USEBLOCKLIST_CHK 2023
-#define IDM_INSTALLBOOTTIMEFILTERS_CHK 2034
-#define IDM_USEUPDATECHECKING_CHK 2025
-#define IDM_RULE_OUTBOUND_ICMP 2026
-#define IDM_RULE_INBOUND_ICMP 2027
-#define IDM_RULE_INBOUND 2028
+#define IDM_SHOWFILENAMESONLY_CHK 2008
+#define IDM_ICONSSMALL 2009
+#define IDM_ICONSLARGE 2010
+#define IDM_ICONSISHIDDEN 2011
+#define IDM_SORTBYFNAME 2012
+#define IDM_SORTBYFDIR 2013
+#define IDM_SORTISDESCEND 2014
+#define IDM_ENABLELOG_CHK 2015
+#define IDM_ENABLENOTIFICATIONS_CHK 2016
+#define IDM_ENABLEAPPSCOLLECTOR_CHK 2017
+#define IDM_LOGSHOW 2018
+#define IDM_LOGCLEAR 2019
+#define IDM_WEBSITE 2020
+#define IDM_DONATE 2021
+#define IDM_CHECKUPDATES 2022
+#define IDM_ABOUT 2023
+
+#define IDM_USEBLOCKLIST_CHK 2024
+#define IDM_INSTALLBOOTTIMEFILTERS_CHK 2025
+#define IDM_USEUPDATECHECKING_CHK 2026
+#define IDM_RULE_OUTBOUND_ICMP 2027
+#define IDM_RULE_INBOUND_ICMP 2028
+#define IDM_RULE_INBOUND 2029
 
 // Tray Menu
 #define IDM_TRAY_SHOW 3000
@@ -163,16 +167,16 @@
 #define IDM_ALL 4001
 #define IDM_REFRESH2 4002
 #define IDM_DISABLENOTIFICATIONS 4003
-#define IDM_EXPLORE 4005
-#define IDM_COPY 4006
-#define IDM_CHECK 4007
-#define IDM_UNCHECK 4008
+#define IDM_EXPLORE 4004
+#define IDM_COPY 4005
+#define IDM_CHECK 4006
+#define IDM_UNCHECK 4007
 
-#define IDM_ADD 4009
-#define IDM_EDIT 4010
-#define IDM_DELETE 4011
+#define IDM_ADD 4008
+#define IDM_EDIT 4009
+#define IDM_DELETE 4010
 
-#define IDM_SELECT_ALL 4012
+#define IDM_SELECT_ALL 4011
 
 #define IDM_PROCESS 5000
 #define IDM_LANGUAGE 6000
@@ -214,113 +218,116 @@
 #define IDS_TRAY_MODE 2003
 #define IDS_TRAY_RULES 2004
 #define IDS_TRAY_FILTERS 2005
-#define IDS_TRAY_BLOCKLIST_RULES 2009
-#define IDS_TRAY_SYSTEM_RULES 2006
-#define IDS_TRAY_CUSTOM_RULES 2007
-#define IDS_TRAY_LOG 2008
+#define IDS_TRAY_BLOCKLIST_RULES 2006
+#define IDS_TRAY_SYSTEM_RULES 2007
+#define IDS_TRAY_CUSTOM_RULES 2008
+#define IDS_TRAY_LOG 2009
 
 #define IDS_ADD_FILE 3000
 #define IDS_ADD_PROCESS 3001
 #define IDS_ALL 3002
 #define IDS_DISABLENOTIFICATIONS 3003
-#define IDS_EXPLORE 3005
-#define IDS_COPY 3006
-#define IDS_CHECK 3007
-#define IDS_UNCHECK 3008
+#define IDS_EXPLORE 3004
+#define IDS_COPY 3005
+#define IDS_CHECK 3006
+#define IDS_UNCHECK 3007
 
-#define IDS_ADD 3009
-#define IDS_EDIT2 3010
-#define IDS_DELETE 3011
+#define IDS_ADD 3008
+#define IDS_EDIT2 3009
+#define IDS_DELETE 3010
 
 #define IDS_MODE_WHITELIST 4000
 #define IDS_MODE_BLACKLIST 4001
 #define IDS_MODE_TRUSTNOONE 4002
 
-#define IDS_RULE_OUTBOUND_ICMP 5007
-#define IDS_RULE_INBOUND_ICMP 5008
-#define IDS_RULE_INBOUND 5009
+#define IDS_RULE_OUTBOUND_ICMP 5000
+#define IDS_RULE_INBOUND_ICMP 5001
+#define IDS_RULE_INBOUND 5002
 
 #define IDS_HIGHLIGHT_SYSTEM 6000
 #define IDS_HIGHLIGHT_NETWORK 6001
 #define IDS_HIGHLIGHT_INVALID 6002
 #define IDS_HIGHLIGHT_CUSTOM 6003
 #define IDS_HIGHLIGHT_SILENT 6004
 
-#define IDS_EDITOR 7002
+#define IDS_EDITOR 7000
 
-#define IDS_NAME 7003
-#define IDS_RULE 7004
-#define IDS_IPVERSION 7005
+#define IDS_NAME 7001
+#define IDS_RULE 7002
+#define IDS_IPVERSION 7003
 #define IDS_PROTOCOL 7006
 #define IDS_DIRECTION 7007
 #define IDS_ACTION 7008
 #define IDS_DATE 7009
 #define IDS_FILEPATH 7010
 #define IDS_ADDRESS 7011
 
-#define IDS_DIRECTION_1 7013
-#define IDS_DIRECTION_2 7014
-#define IDS_DIRECTION_3 7020
+#define IDS_DIRECTION_1 7012
+#define IDS_DIRECTION_2 7013
+#define IDS_DIRECTION_3 7014
 
 #define IDS_ACTION_1 7015
 #define IDS_ACTION_2 7016
 
 #define IDS_RULES_LINKS 7017
-
 #define IDS_RULES_HELP 7018
 
 #define IDS_ENABLED_CHK 7019
 
 #define IDS_SETTINGS_1 8000
 #define IDS_SETTINGS_3 8001
 
-#define IDS_APPLY 8008
-#define IDS_CLOSE 8009
+#define IDS_APPLY 8002
+#define IDS_CLOSE 8003
 
-#define IDS_TITLE_1 8010
-#define IDS_TITLE_2 8011
-#define IDS_TITLE_3 8012
-#define IDS_TITLE_4 8013
-#define IDS_TITLE_5 8014
-#define IDS_TITLE_6 8015
+#define IDS_TITLE_1 8004
+#define IDS_TITLE_2 8005
+#define IDS_TITLE_3 8006
+#define IDS_TITLE_4 8007
+#define IDS_TITLE_5 8008
+#define IDS_TITLE_6 8009
 
 #define IDS_ALWAYSONTOP_CHK 9000
 #define IDS_LOADONSTARTUP_CHK 9001
 #define IDS_STARTMINIMIZED_CHK 9002
-#define IDS_SHOWFILENAMESONLY_CHK 9030
-#define IDS_SKIPUACWARNING_CHK 9003
-#define IDS_CHECKUPDATES_CHK 9004
+#define IDS_SHOWFILENAMESONLY_CHK 9003
+#define IDS_SKIPUACWARNING_CHK 9004
+#define IDS_CHECKUPDATES_CHK 9005
+
+#define IDS_LANGUAGE_HINT 9006
 
-#define IDS_LANGUAGE_HINT 9005
+#define IDS_USEBLOCKLIST_CHK 9007
+#define IDS_USEBLOCKLIST_HINT 9008
+#define IDS_INSTALLBOOTTIMEFILTERS_CHK 9009
+#define IDS_INSTALLBOOTTIMEFILTERS_HINT 9010
+#define IDS_USEUPDATECHECKING_CHK 9011
+#define IDS_USEUPDATECHECKING_HINT 9012
 
-#define IDS_USEBLOCKLIST_CHK 9006
-#define IDS_USEBLOCKLIST_HINT 9007
-#define IDS_INSTALLBOOTTIMEFILTERS_CHK 9008
-#define IDS_INSTALLBOOTTIMEFILTERS_HINT 9009
-#define IDS_USEUPDATECHECKING_CHK 9010
-#define IDS_USEUPDATECHECKING_HINT 9011
+#define IDS_DISABLEWINDOWSFIREWALL_CHK 9013
+#define IDS_ENABLEWINDOWSFIREWALL_CHK 9014
 
-#define IDS_DISABLEWINDOWSFIREWALL_CHK 9012
-#define IDS_ENABLEWINDOWSFIREWALL_CHK 9013
+#define IDS_CONFIRMEXIT_CHK 9015
+#define IDS_CONFIRMDELETE_CHK 9016
+#define IDS_CONFIRMLOGCLEAR_CHK 9017
+#define IDS_CONFIRMMODECHANGE_CHK 9018
 
-#define IDS_CONFIRMEXIT_CHK 9014
-#define IDS_CONFIRMDELETE_CHK 9015
-#define IDS_CONFIRMLOGCLEAR_CHK 9016
-#define IDS_CONFIRMMODECHANGE_CHK 9017
+#define IDS_COLORS_HELP 9019
 
-#define IDS_COLORS_HELP 9028
+#define IDS_ENABLELOG_CHK 9020
+#define IDS_LOGSHOW 9021
+#define IDS_LOGCLEAR 9022
 
-#define IDS_ENABLELOG_CHK 9018
-#define IDS_LOGSHOW 9019
-#define IDS_LOGCLEAR 9020
+#define IDS_ENABLENOTIFICATIONS_CHK 9023
+#define IDS_NOTIFICATIONSILENT_CHK 9024
+#define IDS_NOTIFICATIONTIMEOUT_HINT 9025
 
-#define IDS_ENABLENOTIFICATIONS_CHK 9021
-#define IDS_NOTIFICATIONSILENT_CHK 9023
-#define IDS_NOTIFICATIONTIMEOUT_HINT 9024
+#define IDS_ENABLEAPPSCOLLECTOR_CHK 9026
 
-#define IDS_ENABLEAPPSCOLLECTOR_CHK 9025
+#define IDS_RULES_BLOCKLIST_HINT 9027
+#define IDS_RULES_SYSTEM_HINT 9028
+#define IDS_RULES_CUSTOM_HINT 9029
 
-#define IDS_ALWAYSPERFORMTHISCHECK_CHK 9026
+#define IDS_ALWAYSPERFORMTHISCHECK_CHK 9030
 
 #define IDS_QUESTION 10000
 #define IDS_QUESTION_START 10001

diff --git a/src/resource.rc b/src/resource.rc