Improvements and fixes

r57zone · May 19, 2022 · c56535a · c56535a
1 parent ced7450
commit c56535a
Show file tree

Hide file tree

Showing 6 changed files with 141 additions and 111 deletions.
diff --git a/README.RU.md b/README.RU.md
@@ -1,5 +1,6 @@
 [![EN](https://user-images.githubusercontent.com/9499881/33184537-7be87e86-d096-11e7-89bb-f3286f752bc6.png)](https://github.com/r57zone/Firewall-Easy/blob/master/README.md) 
 [![RU](https://user-images.githubusercontent.com/9499881/27683795-5b0fbac6-5cd8-11e7-929c-057833e01fb1.png)](https://github.com/r57zone/Firewall-Easy/blob/master/README.RU.md)
+
 # Firewall Easy
 Приложение позволяет заблокировать доступ в интернет другим приложения, с помощью Брандмауэр Windows.
 

diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 [![EN](https://user-images.githubusercontent.com/9499881/33184537-7be87e86-d096-11e7-89bb-f3286f752bc6.png)](https://github.com/r57zone/Firewall-Easy/blob/master/README.md) 
 [![RU](https://user-images.githubusercontent.com/9499881/27683795-5b0fbac6-5cd8-11e7-929c-057833e01fb1.png)](https://github.com/r57zone/Firewall-Easy/blob/master/README.RU.md) 
+&#8211; Other languages
+
 # Firewall Easy
 Application allows you to block Internet access to other applications using the Windows Firewall.
 

diff --git a/Source/Languages/English.ini b/Source/Languages/English.ini
@@ -1,4 +1,9 @@
 [Main]
+ID_RULES=Rules
+ID_IMPORT=Import
+ID_EXPORT=Export
+ID_HELP=Help
+ID_ABOUT_TITLE=About...
 ID_APP_NAME=Name
 ID_APP_PATH=Path
 ID_SEARCH=Search...
@@ -16,10 +21,5 @@ ID_RULES_SUCCESSFULLY_CREATED=Rules successfully created:
 ID_FAILED_CREATE_RULES=Failed to create rules
 ID_REMOVED_RULES_FOR_NONEXISTENT_APPS=Removed rules for nonexistent applications:
 ID_RULES_FOR_NONEXISTENT_APPS_NOT_FOUND=Rules for nonexistent applications not found
-
-;About
-ID_ABOUT_TITLE=About...
 ID_LAST_UPDATE=Last update:
-
-;Explorer popup menu
 ID_BLOCK_ACCESS=Block access to the Internet
diff --git a/Source/Languages/Russian.ini b/Source/Languages/Russian.ini
@@ -1,4 +1,9 @@
 [Main]
+ID_RULES=Правила
+ID_IMPORT=Импорт
+ID_EXPORT=Экспорт
+ID_HELP=Справка
+ID_ABOUT_TITLE=О программе...
 ID_APP_NAME=Название
 ID_APP_PATH=Расположение
 ID_SEARCH=Поиск...
@@ -16,10 +21,5 @@ ID_RULES_SUCCESSFULLY_CREATED=
 ID_FAILED_CREATE_RULES=Не удалось создать правила
 ID_REMOVED_RULES_FOR_NONEXISTENT_APPS=Удалено правил для несуществующих приложений:
 ID_RULES_FOR_NONEXISTENT_APPS_NOT_FOUND=Правил для несуществующих приложений не найдено
-
-;About
-ID_ABOUT_TITLE=О программе...
 ID_LAST_UPDATE=Последнее обновление:
-
-;Explorer popup menu
 ID_BLOCK_ACCESS=Заблокировать доступ в интернет
diff --git a/Source/Unit1.dfm b/Source/Unit1.dfm
@@ -4,14 +4,15 @@ object Main: TMain
   BorderIcons = [biSystemMenu, biMinimize]
   BorderStyle = bsSingle
   Caption = 'App'
-  ClientHeight = 320
+  ClientHeight = 323
   ClientWidth = 409
   Color = clBtnFace
   Font.Charset = RUSSIAN_CHARSET
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'MS Sans Serif'
   Font.Style = []
+  Menu = MainMenu1
   OldCreateOrder = False
   Position = poScreenCenter
   OnClose = FormClose
@@ -86,7 +87,6 @@ object Main: TMain
     ItemHeight = 13
     ParentFont = False
     ParentShowHint = False
-    PopupMenu = PopupMenu
     ShowHint = True
     TabOrder = 0
     TabWidth = 100
@@ -133,29 +133,16 @@ object Main: TMain
   end
   object StatusBar: TStatusBar
     Left = 0
-    Top = 301
+    Top = 304
     Width = 409
     Height = 19
     Panels = <>
     SimplePanel = True
-    OnClick = StatusBarClick
   end
   object OpenDialog: TOpenDialog
     Filter = '|*.exe'
-    Left = 16
-    Top = 32
-  end
-  object PopupMenu: TPopupMenu
     Left = 48
     Top = 32
-    object ImportBtn: TMenuItem
-      Caption = #1048#1084#1087#1086#1088#1090
-      OnClick = ImportBtnClick
-    end
-    object ExportBtn: TMenuItem
-      Caption = #1069#1082#1089#1087#1086#1088#1090
-      OnClick = ExportBtnClick
-    end
   end
   object ImportDialog: TOpenDialog
     Filter = 'Firewall Easy|*.fer'
@@ -168,4 +155,26 @@ object Main: TMain
     Left = 112
     Top = 32
   end
+  object MainMenu1: TMainMenu
+    Left = 16
+    Top = 32
+    object RulesItem: TMenuItem
+      Caption = #1055#1088#1072#1074#1080#1083#1072
+      object ImportBtn: TMenuItem
+        Caption = #1048#1084#1087#1086#1088#1090
+        OnClick = ImportBtnClick
+      end
+      object ExportBtn: TMenuItem
+        Caption = #1069#1082#1089#1087#1086#1088#1090
+        OnClick = ExportBtnClick
+      end
+    end
+    object HelpItem: TMenuItem
+      Caption = #1057#1087#1088#1072#1074#1082#1072
+      object AboutBtn: TMenuItem
+        Caption = #1054' '#1087#1088#1086#1075#1088#1072#1084#1084#1077'...'
+        OnClick = AboutBtnClick
+      end
+    end
+  end
 end