Skip to content

Commit 70c0a77

Browse files
Fixed a bug related to set language after installing, and made some improvements.
1 parent b4ef073 commit 70c0a77

File tree

7 files changed

+50
-18
lines changed

7 files changed

+50
-18
lines changed

WikiSearch.iss

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#define MyAppName "WikiSearch"
2-
#define MyAppVersion "1.3.0"
2+
#define MyAppVersion "1.4.0"
33
#define MyAppPublisher "Tecwindow"
4-
#define MyAppURL "https://t.me/tecwindow"
4+
#define MyAppURL "https://tecwindow.net/"
55
#define MyAppExeName "WikiSearch.exe"
66

77
[Setup]
@@ -30,7 +30,7 @@ CloseApplications=force
3030
restartApplications=yes
3131
SolidCompression=yes
3232
WizardStyle=modern
33-
33+
DisableWelcomePage=no
3434
[Languages]
3535
Name: "english"; MessagesFile: "compiler:Default.isl"
3636
Name: "arabic"; MessagesFile: "compiler:Languages\Arabic.isl"
@@ -47,16 +47,21 @@ Source: "WikiSearch\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs cr
4747
[CustomMessages]
4848
arabic.AppLNGfile = Arabic
4949
english.AppLNGfile = English
50-
french.AppLNGfile = Français
51-
spanish.AppLNGfile = Español
50+
french.AppLNGfile = French
51+
spanish.AppLNGfile = Spanish
5252

5353
[Icons]
5454
Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
5555
Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
5656

57-
[Run]
58-
Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall
5957

6058
[INI]
6159
Filename: "{userappdata}\WikiSearch\Settingss.ini"; Section: "default"; Key: "language"; String: "{cm:AppLNGfile}"
62-
Filename: "{app}\User Data\Settingss.ini"; Section: "default"; Key: "language"; String: "{cm:AppLNGfile}"
60+
Filename: "{app}\User Data\Settingss.ini"; Section: "default"; Key: "language"; String: "{cm:AppLNGfile}"
61+
62+
[InstallDelete]
63+
Type: filesandordirs; Name: "{app}"
64+
65+
[Run]
66+
Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall
67+

WikiSearch.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#-*- coding: utf-8 -*-
22
# import project libraries.
3+
from custome_errors import *
4+
sys.excepthook = my_excepthook
35
import wx
46
import json
57
import nlpia2_wikipedia as wikipedia
@@ -9,7 +11,7 @@
911
import os
1012
import sys
1113
#change working dir to main exe dir
12-
os.chdir(os.path.dirname(sys.argv[0]))
14+
#os.chdir(os.path.dirname(sys.argv[0]))
1315
import globals as g
1416
from view_search_dialog import ViewSearch
1517
from update_dialog import UpdateDialog
@@ -19,11 +21,12 @@
1921
from packaging import version
2022
from view_search_dialog import *
2123

24+
2225
#Set language for main window
2326
_ = SetLanguage(Settings().ReadSettings())
2427

2528
# information of program
26-
CurrntVersion = "1.3.0"
29+
CurrntVersion = "1.4.0"
2730
ProgramName = "WikiSearch"
2831
ProgramDescription = _("With this program, you can search or browse any Wikipedia article. site: https://github.com/tecwindow/WikiSearch")
2932
CurrentSettings = Settings().ReadSettings()
@@ -331,8 +334,8 @@ def OnHelp(self, event):
331334
language = {
332335
"English": "en",
333336
"Arabic": "ar",
334-
"Español": "es",
335-
"Français": "fr"
337+
"Spanish": "es",
338+
"French": "fr"
336339
}
337340

338341
CurrentLanguage = language[CurrentSettings["language"]]

custome_errors.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import traceback
2+
import os
3+
import ctypes
4+
import sys
5+
def my_excepthook(exctype, value, tb):
6+
tb_list = traceback.extract_tb(tb)
7+
error_message = ""
8+
9+
for tb in tb_list:
10+
file_name = os.path.basename(tb.filename)
11+
line_number = tb.lineno
12+
code = tb.line
13+
14+
error_message += f"\nFile: {file_name}\nLine: {line_number}\nCode: {code}\n"
15+
16+
error_message += f"\n{exctype.__name__}: {value}"
17+
18+
ctypes.windll.user32.MessageBoxW(None, error_message, "Error", 0x10)

functions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ def SetLanguage(CurrentSettings):
1919
language = {
2020
"English": "en",
2121
"Arabic": "ar",
22-
"Español": "es",
23-
"Français": "fr"
22+
"Spanish": "es",
23+
"French": "fr"
2424
}
2525

2626
try:

settings.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,15 @@ def __init__(self, parent):
215215
#Save Settings function
216216
def OnSaveSettings(self, event):
217217

218+
languages = {
219+
"Arabic": "Arabic",
220+
"English": "English",
221+
"Español": "Spanish",
222+
"Français": "French"
223+
}
224+
218225
NewSettings = {
219-
"language": self.ProgramLanguage.Value,
226+
"language": languages[self.ProgramLanguage.Value],
220227
"results number": str(self.NumberResults.Value),
221228
"random articles number": str(self.random_articles_number.Value),
222229
"close message": str(self.VerificationMsg.Value),

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"packages": ["web_viewer", "view_search_dialog", "view_article_window", "update_dialog", "settings", "my_classes", "functions", "dialogs"],
1212
"includes": ["wx", "nlpia2_wikipedia", "pyperclip", "accessible_output2", "mouse", "bs4", "requests", ],
1313
"zip_include_packages": ["wx"],
14-
"excludes": ["tkinter", "test", "setuptools", "PyInstaller", "pip"],
14+
"excludes": ["tkinter", "test", "setuptools", "PyInstaller", "pip", "numpy"],
1515
"include_msvcr": False
1616
}
1717

web_viewer.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def __init__(self, parent, GetValues, handle):
8787

8888
#creating web viewer
8989
self.ArticleTitle = wx.StaticText(Panel, -1, "please wait:")
90-
self.ViewArticle = wx.html2.WebView.New(Panel, -1)
90+
self.ViewArticle = wx.html2.WebView.New(Panel, -1, name="")
9191
self.ViewArticle.SetPage(self.html, "")
9292
self.ViewArticle.EnableContextMenu(False)
9393
#loading article
@@ -420,7 +420,6 @@ def MakeAccessible(self):
420420
position = self.ViewArticle.GetPosition()
421421
position = self.ViewArticle.ClientToScreen(position)
422422
robot.MouseMove(position)
423-
robot.MouseClick(True)
424423
mouse.move(100, 100, absolute=False, duration=0.5)
425424
mouse.click('left')
426425

0 commit comments

Comments
 (0)