Merge pull request #3 from electrocoder/test

Test

Author: electrocoder

.idea/MQTTClient.iml

@@ -16,167 +16,173 @@
 from tkinter import messagebox
 from tkinter.font import Font
 
-import paho.mqtt.client as mqtt
-
+import about
 import new_connect
 import new_topic
 import subscriber
-import about
-
 from config_file import ConfigFile
 
 
 class App(tk.Tk):
     def __init__(self):
         super().__init__()
 
-        self.title('MQTT Client 0v3')
-        self.geometry('850x450')
+        self.title('MQTT Client 0v4')
+        self.geometry('750x350')
+
+        # self.rowconfigure(0, weight=1)
+        # self.columnconfigure(0, weight=1)
+
+        ipadding = {'ipadx': 1, 'ipady': 1}
+
+        frame = tk.Frame(self)
+        frame.pack(fill=tk.BOTH, expand=True)
 
-        font_size = 14
+        font_size = 12
         self.text_font = Font(size=font_size)
 
         self.msg_filter = False
-        row = 0
-        column = 0
 
-        self.label_broker = tk.Label(self, text="Broker", font=font_size)
-        self.label_broker.grid(row=row, column=column, sticky=tk.W)
-        column += 1
+        self.label_broker = tk.Label(frame, text="Broker", font=font_size)
+        self.label_broker.pack(**ipadding, side=tk.LEFT)
 
         self.entry_broker_text = tk.StringVar(self)
         self.options_list = ConfigFile().read_sections()
         self.entry_broker_text.set(self.options_list[0])
-        self.entry_broker = tk.OptionMenu(self,
+        self.entry_broker = tk.OptionMenu(frame,
                                           self.entry_broker_text,
                                           *self.options_list)
 
-        self.entry_broker.grid(row=row, column=column)
+        self.entry_broker.config(font=font_size)
+        menu = self.nametowidget(
+            self.entry_broker.menuname)
+        menu.config(font=font_size)
 
-        column += 1
+        self.entry_broker.pack(**ipadding, expand=True, side=tk.LEFT)
 
-        self.button_connect = tk.Button(self,
+        self.button_connect = tk.Button(frame,
                                         text="Connect", font=font_size,
                                         command=self.button_connect)
-        self.button_connect.grid(row=row, column=column)
-
-        column += 1
+        self.button_connect.pack(**ipadding, expand=True, side=tk.LEFT)
 
-        self.button_disconnect = tk.Button(self,
+        self.button_disconnect = tk.Button(frame,
                                            text="Disconnect", font=font_size,
                                            state=tk.DISABLED,
                                            command=self.button_disconnect)
-        self.button_disconnect.grid(row=row, column=column, sticky=tk.W)
+        self.button_disconnect.pack(**ipadding, expand=True, side=tk.LEFT)
 
-        row += 1
-        column = 0
+        frame1 = tk.Frame(self)
+        frame1.pack(fill=tk.BOTH, expand=True)
 
-        # publich topic
-        self.label_publich_topic = tk.Label(self, text="Publish Topic",
+        # publish topic
+        self.label_publish_topic = tk.Label(frame1, text="Publish Topic",
                                             font=font_size)
-        self.label_publich_topic.grid(row=row, column=column, sticky=tk.W)
+        self.label_publish_topic.pack(**ipadding,
+                                      side=tk.LEFT)
 
-        column += 1
-        self.entry_publich_topic_text = tk.StringVar(self)
-        self.entry_publich_topic = tk.Entry(self,
-                                            textvariable=self.entry_publich_topic_text,
+        self.entry_publish_topic_text = tk.StringVar(self)
+        self.entry_publish_topic = tk.Entry(frame1,
+                                            textvariable=self.entry_publish_topic_text,
                                             font=font_size)
-        self.entry_publich_topic.grid(row=row, column=column)
+        self.entry_publish_topic.pack(**ipadding, expand=True,
+                                      side=tk.LEFT)
 
-        column += 1
-        self.label_publich_msg_topic = tk.Label(self, text="Publish Message",
+        self.label_publish_msg_topic = tk.Label(frame1, text="Publish Message",
                                                 font=font_size)
-        self.label_publich_msg_topic.grid(row=row, column=column)
+        self.label_publish_msg_topic.pack(**ipadding, expand=True,
+                                          side=tk.LEFT)
 
-        column += 1
-        self.entry_publich_topic_msg_text = tk.StringVar(self)
-        self.entry_publich_msg_topic = tk.Entry(self,
-                                                textvariable=self.entry_publich_topic_msg_text,
+        self.entry_publish_topic_msg_text = tk.StringVar(self)
+        self.entry_publish_msg_topic = tk.Entry(frame1,
+                                                textvariable=self.entry_publish_topic_msg_text,
                                                 font=font_size)
-        self.entry_publich_msg_topic.grid(row=row, column=column)
+        self.entry_publish_msg_topic.pack(**ipadding, expand=True,
+                                          side=tk.LEFT)
 
-        column += 1
-        self.button_publich_topic = tk.Button(self,
+        self.button_publish_topic = tk.Button(frame1,
                                               text="Publish", font=font_size,
                                               command=self.button_publish_topic)
-        self.button_publich_topic.grid(row=row, column=column)
+        self.button_publish_topic.pack(**ipadding, expand=True,
+                                       side=tk.LEFT)
 
-        row += 1
-        column = 0
+        frame2 = tk.Frame(self)
+        frame2.pack(fill=tk.BOTH, expand=True)
 
         # subscribe topic
-        self.label_subscribe_topic = tk.Label(self, text="Subscribe Topic",
+        self.label_subscribe_topic = tk.Label(frame2, text="Subscribe Topic",
                                               font=font_size)
-        self.label_subscribe_topic.grid(row=row, column=column, sticky=tk.W)
+        self.label_subscribe_topic.pack(**ipadding,
+                                        side=tk.LEFT)
 
-        column += 1
         self.entry_subscribe_topic_text = tk.StringVar(self)
         self.options_list = ["-", ]
-        self.entry_subscribe_topic = tk.OptionMenu(self,
+        self.entry_subscribe_topic = tk.OptionMenu(frame2,
                                                    self.entry_subscribe_topic_text,
-                                                   *self.options_list, command=self.add_subscribe_topic)
+                                                   *self.options_list,
+                                                   command=self.add_subscribe_topic)
         self.entry_subscribe_topic.config(font=font_size)
         menu = self.nametowidget(
             self.entry_subscribe_topic.menuname)
         menu.config(font=font_size)
 
-        self.entry_subscribe_topic.grid(row=row, column=column)
+        self.entry_subscribe_topic.pack(**ipadding, expand=True,
+                                        side=tk.LEFT)
 
-        column += 1
-        self.button_subscribe_topic = tk.Button(self,
+        self.button_subscribe_topic = tk.Button(frame2,
                                                 text="Subscribe",
                                                 font=font_size,
                                                 state=tk.DISABLED,
                                                 command=self.button_subscribe)
-        self.button_subscribe_topic.grid(row=row, column=column)
+        self.button_subscribe_topic.pack(**ipadding, expand=True,
+                                         side=tk.LEFT)
 
-        column += 1
-        self.button_add_subscribe_topic = tk.Button(self,
+        self.button_add_subscribe_topic = tk.Button(frame2,
                                                     text="Add Subscribe Topic",
                                                     font=font_size,
                                                     state=tk.DISABLED,
                                                     command=self.add_subscribe_topic)
-        self.button_add_subscribe_topic.grid(row=row, column=column)
+        self.button_add_subscribe_topic.pack(**ipadding, expand=True,
+                                             side=tk.LEFT)
+
+        frame3 = tk.Frame(self)
+        frame3.pack(fill=tk.BOTH, expand=True)
 
         # filter msg
-        row += 1
-        column = 0
 
-        self.label_msg_filter = tk.Label(self, text="Filter Message",
+        self.label_msg_filter = tk.Label(frame3, text="Filter Message",
                                          font=font_size)
-        self.label_msg_filter.grid(row=row, column=column, sticky=tk.W)
-        self.label_msg_filter.grid(row=row, column=column, sticky=tk.W)
-
-        column += 1
+        self.label_msg_filter.pack(**ipadding,
+                                   side=tk.LEFT)
 
         self.entry_msg_filter_text = tk.StringVar(self)
-        self.entry_msg_filter = tk.Entry(self,
+        self.entry_msg_filter = tk.Entry(frame3,
                                          textvariable=self.entry_msg_filter_text,
                                          font=font_size)
-        self.entry_msg_filter.grid(row=row, column=column)
-        column += 1
+        self.entry_msg_filter.pack(**ipadding, expand=True,
+                                   side=tk.LEFT)
 
-        self.button_filter_add = tk.Button(self,
+        self.button_filter_add = tk.Button(frame3,
                                            text="Add Filter", font=font_size,
                                            state=tk.DISABLED,
                                            command=self.add_filter)
-        self.button_filter_add.grid(row=row, column=column)
-        column += 1
+        self.button_filter_add.pack(**ipadding, expand=True,
+                                    side=tk.LEFT)
 
-        self.button_filter_remove = tk.Button(self,
+        self.button_filter_remove = tk.Button(frame3,
                                               text="Remove Filter",
                                               font=font_size,
                                               state=tk.DISABLED,
                                               command=self.remove_filter)
-        self.button_filter_remove.grid(row=row, column=column)
+        self.button_filter_remove.pack(**ipadding, expand=True,
+                                       side=tk.LEFT)
 
-        row += 1
-        column = 0
+        frame4 = tk.Frame(self)
+        frame4.pack(fill=tk.BOTH, expand=True)
 
         # subscribe list
-        self.listbox_message = tk.Text(self, font=font_size, height=12)
-        self.listbox_message.grid(row=row, column=column, columnspan=6,
-                                  ipadx=11, ipady=11, padx=22, pady=22)
+        self.listbox_message = tk.Text(frame4, font=font_size, height=10)
+        self.listbox_message.pack(**ipadding, expand=True, fill=tk.BOTH,
+                                  side=tk.LEFT)
 
         # menu
         menubar = tk.Menu(self)
@@ -197,45 +203,45 @@ def __init__(self):
                               command=self.about_window)
         menubar.add_cascade(label="Help", menu=menu_help)
 
+        frame5 = tk.Frame(self)
+        frame5.pack(fill=tk.BOTH, expand=True)
+
         # status bar
         self.connect_status_text = tk.StringVar()
         self.connect_status_text.set("...")
-        self.connect_status = tk.Label(self,
+        self.connect_status = tk.Label(frame5,
                                        textvariable=self.connect_status_text,
-                                       relief=tk.SUNKEN, anchor="w")
-        row += 1
-        column = 0
+                                       bd=1,
+                                       relief=tk.SUNKEN, anchor=tk.W)
 
-        self.connect_status.grid(row=row, column=column)
+        self.connect_status.pack(**ipadding, fill=tk.BOTH, expand=True)
 
-        self.subscriber = subscriber.Subscriber(self,
-                                                mqtt.Client())
+        self.subscriber = subscriber.Subscriber(self)
 
     def button_connect(self):
-        print("button_connect")
         if self.entry_broker_text.get():
-            broker, port, username, password = ConfigFile().read_broker(
+            name, broker, port, username, password = ConfigFile().read_broker(
                 self.entry_broker_text.get())
-            print(broker, port, username, password)
-            if self.subscriber.connect_start(broker, port, username, password):
+            if self.subscriber.connect_start(name, broker, port, username,
+                                             password):
                 self.connect_status_text.set("Connected")
                 self.button_connect["state"] = tk.DISABLED
                 self.button_connect["text"] = "Connected"
                 self.button_disconnect[
                     "state"] = tk.NORMAL
                 self.button_subscribe_topic[
                     "state"] = tk.NORMAL
-                self.button_publich_topic[
+                self.button_publish_topic[
                     "state"] = tk.NORMAL
-                self.subscribe_list(broker)
+                self.subscribe_list(name)
                 self.button_add_subscribe_topic["state"] = tk.NORMAL
         else:
             messagebox.showerror("showerror", "Please select broker.")
 
-    def subscribe_list(self, broker):
+    def subscribe_list(self, name):
         self.entry_subscribe_topic['menu'].delete(0, 'end')
 
-        new_choices = ConfigFile().read_topics(broker).split(',')
+        new_choices = ConfigFile().read_topics(name).split(',')
         for choice in new_choices:
             if choice:
                 self.entry_subscribe_topic['menu'].add_command(
@@ -253,7 +259,7 @@ def button_disconnect(self):
             self.button_disconnect["state"] = tk.DISABLED
             self.button_subscribe_topic[
                 "state"] = tk.DISABLED
-            self.button_publich_topic[
+            self.button_publish_topic[
                 "state"] = tk.DISABLED
             self.button_add_subscribe_topic["state"] = tk.DISABLED
 
@@ -268,8 +274,8 @@ def button_subscribe(self):
 
     def button_publish_topic(self):
         print("button_publish_topic")
-        topic = self.entry_publich_topic_text.get()
-        msg = self.entry_publich_topic_msg_text.get()
+        topic = self.entry_publish_topic_text.get()
+        msg = self.entry_publish_topic_msg_text.get()
         self.listbox_message.insert(tk.END,
                                     "> {}".format(msg))
         self.listbox_message.see("end")

.idea/misc.xml

@@ -1,4 +1,4 @@
-# MQTT Client
+    # MQTT Client
 
 <a href="https://iothook.com/"><img src="https://raw.githubusercontent.com/electrocoder/MQTTClient/main/icon.png"></a>
 
@@ -9,11 +9,17 @@ messages while developing a project with the MQTT protocol.
 
 ## Version History
 
-0v3 26.11.2022: Alfa MQTT Client
+* 0v4 05.12.2022
+  - Alfa MQTT Client
 
-0v2 15.10.2022: Alfa MQTT Client
+* 0v3 26.11.2022
+  - Alfa MQTT Client
 
-0v1 10.10.2022 : Start project
+* 0v2 15.10.2022
+  - Alfa MQTT Client
+
+* 0v1 10.10.2022
+  - Start project
 
 ## Contributing