Skip to content

Commit 9397d28

Browse files
electrocoderelectrocoder
committed
update
1 parent a3e8e2b commit 9397d28

File tree

3 files changed

+48
-42
lines changed

3 files changed

+48
-42
lines changed

‎MQTTClient.py‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@ def __init__(self):
3333
# self.rowconfigure(0, weight=1)
3434
# self.columnconfigure(0, weight=1)
3535

36-
ipadding = {'ipadx': 10, 'ipady': 10}
36+
ipadding = {'ipadx': 1, 'ipady': 1}
3737

3838
frame = tk.Frame(self)
39-
frame.pack(fill = tk.BOTH, expand = True)
39+
frame.pack(fill=tk.BOTH, expand=True)
4040

41-
font_size = 14
41+
font_size = 12
4242
self.text_font = Font(size=font_size)
4343

4444
self.msg_filter = False
4545

4646
self.label_broker = tk.Label(frame, text="Broker", font=font_size)
47-
self.label_broker.pack(ipadx=20, ipady=20, fill=tk.BOTH, expand=True, side=tk.LEFT)
47+
self.label_broker.pack(**ipadding, side=tk.LEFT)
4848

4949
self.entry_broker_text = tk.StringVar(self)
5050
self.options_list = ConfigFile().read_sections()
@@ -58,60 +58,60 @@ def __init__(self):
5858
self.entry_broker.menuname)
5959
menu.config(font=font_size)
6060

61-
self.entry_broker.pack(ipadx=20, ipady=20, fill=tk.BOTH, expand=True, side=tk.LEFT)
61+
self.entry_broker.pack(**ipadding, expand=True, side=tk.LEFT)
6262

6363
self.button_connect = tk.Button(frame,
6464
text="Connect", font=font_size,
6565
command=self.button_connect)
66-
self.button_connect.pack(ipadx=20, ipady=20, fill=tk.BOTH, expand=True, side=tk.LEFT)
66+
self.button_connect.pack(**ipadding, expand=True, side=tk.LEFT)
6767

6868
self.button_disconnect = tk.Button(frame,
6969
text="Disconnect", font=font_size,
7070
state=tk.DISABLED,
7171
command=self.button_disconnect)
72-
self.button_disconnect.pack(ipadx=20, ipady=20, fill=tk.BOTH, expand=True, side=tk.LEFT)
72+
self.button_disconnect.pack(**ipadding, expand=True, side=tk.LEFT)
7373

7474
frame1 = tk.Frame(self)
75-
frame1.pack(fill = tk.BOTH, expand = True)
75+
frame1.pack(fill=tk.BOTH, expand=True)
7676

7777
# publish topic
7878
self.label_publish_topic = tk.Label(frame1, text="Publish Topic",
7979
font=font_size)
80-
self.label_publish_topic.pack(**ipadding, expand=True, fill=tk.BOTH,
80+
self.label_publish_topic.pack(**ipadding,
8181
side=tk.LEFT)
8282

8383
self.entry_publish_topic_text = tk.StringVar(self)
8484
self.entry_publish_topic = tk.Entry(frame1,
8585
textvariable=self.entry_publish_topic_text,
8686
font=font_size)
87-
self.entry_publish_topic.pack(**ipadding, expand=True, fill=tk.BOTH,
87+
self.entry_publish_topic.pack(**ipadding, expand=True,
8888
side=tk.LEFT)
8989

9090
self.label_publish_msg_topic = tk.Label(frame1, text="Publish Message",
9191
font=font_size)
9292
self.label_publish_msg_topic.pack(**ipadding, expand=True,
93-
fill=tk.BOTH, side=tk.LEFT)
93+
side=tk.LEFT)
9494

9595
self.entry_publish_topic_msg_text = tk.StringVar(self)
9696
self.entry_publish_msg_topic = tk.Entry(frame1,
9797
textvariable=self.entry_publish_topic_msg_text,
9898
font=font_size)
9999
self.entry_publish_msg_topic.pack(**ipadding, expand=True,
100-
fill=tk.BOTH, side=tk.LEFT)
100+
side=tk.LEFT)
101101

102102
self.button_publish_topic = tk.Button(frame1,
103103
text="Publish", font=font_size,
104104
command=self.button_publish_topic)
105-
self.button_publish_topic.pack(**ipadding, expand=True, fill=tk.BOTH,
105+
self.button_publish_topic.pack(**ipadding, expand=True,
106106
side=tk.LEFT)
107107

108108
frame2 = tk.Frame(self)
109-
frame2.pack(fill = tk.BOTH, expand = True)
109+
frame2.pack(fill=tk.BOTH, expand=True)
110110

111111
# subscribe topic
112112
self.label_subscribe_topic = tk.Label(frame2, text="Subscribe Topic",
113113
font=font_size)
114-
self.label_subscribe_topic.pack(**ipadding, expand=True, fill=tk.BOTH,
114+
self.label_subscribe_topic.pack(**ipadding,
115115
side=tk.LEFT)
116116

117117
self.entry_subscribe_topic_text = tk.StringVar(self)
@@ -125,15 +125,15 @@ def __init__(self):
125125
self.entry_subscribe_topic.menuname)
126126
menu.config(font=font_size)
127127

128-
self.entry_subscribe_topic.pack(**ipadding, expand=True, fill=tk.BOTH,
128+
self.entry_subscribe_topic.pack(**ipadding, expand=True,
129129
side=tk.LEFT)
130130

131131
self.button_subscribe_topic = tk.Button(frame2,
132132
text="Subscribe",
133133
font=font_size,
134134
state=tk.DISABLED,
135135
command=self.button_subscribe)
136-
self.button_subscribe_topic.pack(**ipadding, expand=True, fill=tk.BOTH,
136+
self.button_subscribe_topic.pack(**ipadding, expand=True,
137137
side=tk.LEFT)
138138

139139
self.button_add_subscribe_topic = tk.Button(frame2,
@@ -142,42 +142,42 @@ def __init__(self):
142142
state=tk.DISABLED,
143143
command=self.add_subscribe_topic)
144144
self.button_add_subscribe_topic.pack(**ipadding, expand=True,
145-
fill=tk.BOTH, side=tk.LEFT)
145+
side=tk.LEFT)
146146

147147
frame3 = tk.Frame(self)
148-
frame3.pack(fill = tk.BOTH, expand = True)
148+
frame3.pack(fill=tk.BOTH, expand=True)
149149

150150
# filter msg
151151

152152
self.label_msg_filter = tk.Label(frame3, text="Filter Message",
153153
font=font_size)
154-
self.label_msg_filter.pack(**ipadding, expand=True, fill=tk.BOTH,
154+
self.label_msg_filter.pack(**ipadding,
155155
side=tk.LEFT)
156156

157157
self.entry_msg_filter_text = tk.StringVar(self)
158158
self.entry_msg_filter = tk.Entry(frame3,
159159
textvariable=self.entry_msg_filter_text,
160160
font=font_size)
161-
self.entry_msg_filter.pack(**ipadding, expand=True, fill=tk.BOTH,
161+
self.entry_msg_filter.pack(**ipadding, expand=True,
162162
side=tk.LEFT)
163163

164164
self.button_filter_add = tk.Button(frame3,
165165
text="Add Filter", font=font_size,
166166
state=tk.DISABLED,
167167
command=self.add_filter)
168-
self.button_filter_add.pack(**ipadding, expand=True, fill=tk.BOTH,
168+
self.button_filter_add.pack(**ipadding, expand=True,
169169
side=tk.LEFT)
170170

171171
self.button_filter_remove = tk.Button(frame3,
172172
text="Remove Filter",
173173
font=font_size,
174174
state=tk.DISABLED,
175175
command=self.remove_filter)
176-
self.button_filter_remove.pack(**ipadding, expand=True, fill=tk.BOTH,
176+
self.button_filter_remove.pack(**ipadding, expand=True,
177177
side=tk.LEFT)
178178

179179
frame4 = tk.Frame(self)
180-
frame4.pack(fill = tk.BOTH, expand = True)
180+
frame4.pack(fill=tk.BOTH, expand=True)
181181

182182
# subscribe list
183183
self.listbox_message = tk.Text(frame4, font=font_size, height=10)
@@ -204,7 +204,7 @@ def __init__(self):
204204
menubar.add_cascade(label="Help", menu=menu_help)
205205

206206
frame5 = tk.Frame(self)
207-
frame5.pack(fill = tk.BOTH, expand = True)
207+
frame5.pack(fill=tk.BOTH, expand=True)
208208

209209
# status bar
210210
self.connect_status_text = tk.StringVar()
@@ -214,7 +214,7 @@ def __init__(self):
214214
bd=1,
215215
relief=tk.SUNKEN, anchor=tk.W)
216216

217-
self.connect_status.pack(**ipadding)
217+
self.connect_status.pack(**ipadding, fill=tk.BOTH, expand=True)
218218

219219
self.subscriber = subscriber.Subscriber(self)
220220

‎about.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,17 @@ class AboutWindow(tk.Toplevel):
1818
def __init__(self, main_window, font_size):
1919
super().__init__(main_window)
2020

21-
self.main_window = main_window
2221
self.title("MQTT Client About")
22+
self.geometry('400x350')
2323

24-
text1 = tk.Text(self, font=font_size)
25-
text1.grid(row=0, column=0, padx=50, pady=50)
24+
ipadding = {'ipadx': 1, 'ipady': 1}
25+
26+
text1 = tk.Text(self, font=font_size, height=10)
27+
text1.pack(**ipadding, side=tk.TOP, expand=True, fill=tk.BOTH)
2628

2729
button1 = tk.Button(self, text='OK', font=font_size,
2830
command=self.close)
29-
button1.grid(row=1, column=0, padx=50, pady=50)
31+
button1.pack(**ipadding, side=tk.TOP, expand=True, fill=tk.BOTH)
3032

3133
basedir = os.path.dirname(__file__)
3234
self.file_name = os.path.join(basedir, "README.md")

‎subscriber.py‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,22 @@ def on_disconnect(self, client, userdata, rc):
3939

4040
def on_message(self, client, userdata, msg):
4141
self.topic = msg.topic
42-
self.message = msg.payload.decode('utf8')
43-
if self.main_window.msg_filter:
44-
if self.main_window.entry_msg_filter_text.get() in self.message or self.main_window.entry_msg_filter_text.get() in self.topic:
42+
try:
43+
self.message = msg.payload.decode('utf8')
44+
except:
45+
self.message = None
46+
if self.message:
47+
if self.main_window.msg_filter:
48+
if self.main_window.entry_msg_filter_text.get() in self.message or self.main_window.entry_msg_filter_text.get() in self.topic:
49+
self.main_window.listbox_message.insert(tk.END,
50+
">{} {}: {} {}\n".format(
51+
self.on_message_count,
52+
datetime.now().strftime("%d/%m/%Y %H:%M:%S"),
53+
self.topic,
54+
self.message))
55+
self.main_window.listbox_message.see("end")
56+
self.on_message_count += 1
57+
else:
4558
self.main_window.listbox_message.insert(tk.END,
4659
">{} {}: {} {}\n".format(
4760
self.on_message_count,
@@ -50,15 +63,6 @@ def on_message(self, client, userdata, msg):
5063
self.message))
5164
self.main_window.listbox_message.see("end")
5265
self.on_message_count += 1
53-
else:
54-
self.main_window.listbox_message.insert(tk.END,
55-
">{} {}: {} {}\n".format(
56-
self.on_message_count,
57-
datetime.now().strftime("%d/%m/%Y %H:%M:%S"),
58-
self.topic,
59-
self.message))
60-
self.main_window.listbox_message.see("end")
61-
self.on_message_count += 1
6266

6367
self.main_window.connect_status_text.set(
6468
"Connected | Message: %s | Publish: %s" % (

0 commit comments

Comments
 (0)