Merge pull request #2 from electrocoder/test

Test

Author: electrocoder

.gitignore

@@ -84,7 +84,7 @@ __pycache__/
 .Python
 build/
 develop-eggs/
-dist/
+#dist/
 downloads/
 eggs/
 .eggs/

.idea/MQTTClient.iml

@@ -18,108 +18,288 @@
 
 import paho.mqtt.client as mqtt
 
-import about as about
-import new_connect as new_connect
-import open_connect as open_connect
+import new_connect
+import new_topic
 import subscriber
+import about
+
 from config_file import ConfigFile
-from main_window_frame_ui import MainWindowFrameUI
 
 
 class App(tk.Tk):
     def __init__(self):
         super().__init__()
 
-        self.title('MQTT Client')
-        self.geometry('700x350')
+        self.title('MQTT Client 0v3')
+        self.geometry('850x450')
+
+        font_size = 14
+        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.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_text,
+                                          *self.options_list)
+
+        self.entry_broker.grid(row=row, column=column)
+
+        column += 1
+
+        self.button_connect = tk.Button(self,
+                                        text="Connect", font=font_size,
+                                        command=self.button_connect)
+        self.button_connect.grid(row=row, column=column)
+
+        column += 1
+
+        self.button_disconnect = tk.Button(self,
+                                           text="Disconnect", font=font_size,
+                                           state=tk.DISABLED,
+                                           command=self.button_disconnect)
+        self.button_disconnect.grid(row=row, column=column, sticky=tk.W)
+
+        row += 1
+        column = 0
+
+        # publich topic
+        self.label_publich_topic = tk.Label(self, text="Publish Topic",
+                                            font=font_size)
+        self.label_publich_topic.grid(row=row, column=column, sticky=tk.W)
+
+        column += 1
+        self.entry_publich_topic_text = tk.StringVar(self)
+        self.entry_publich_topic = tk.Entry(self,
+                                            textvariable=self.entry_publich_topic_text,
+                                            font=font_size)
+        self.entry_publich_topic.grid(row=row, column=column)
+
+        column += 1
+        self.label_publich_msg_topic = tk.Label(self, text="Publish Message",
+                                                font=font_size)
+        self.label_publich_msg_topic.grid(row=row, column=column)
+
+        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,
+                                                font=font_size)
+        self.entry_publich_msg_topic.grid(row=row, column=column)
+
+        column += 1
+        self.button_publich_topic = tk.Button(self,
+                                              text="Publish", font=font_size,
+                                              command=self.button_publish_topic)
+        self.button_publich_topic.grid(row=row, column=column)
+
+        row += 1
+        column = 0
+
+        # subscribe topic
+        self.label_subscribe_topic = tk.Label(self, text="Subscribe Topic",
+                                              font=font_size)
+        self.label_subscribe_topic.grid(row=row, column=column, sticky=tk.W)
 
-        self.text_font = Font(size=12)
+        column += 1
+        self.entry_subscribe_topic_text = tk.StringVar(self)
+        self.options_list = ["-", ]
+        self.entry_subscribe_topic = tk.OptionMenu(self,
+                                                   self.entry_subscribe_topic_text,
+                                                   *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.main_window_frame = tk.Frame()
-        self.main_window_frame.pack()
+        self.entry_subscribe_topic.grid(row=row, column=column)
 
-        self.main_window_frame_ui = MainWindowFrameUI(self.main_window_frame,
-                                                      self,
-                                                      font_size=self.text_font)
-        self.main_window_frame_ui.pack()
+        column += 1
+        self.button_subscribe_topic = tk.Button(self,
+                                                text="Subscribe",
+                                                font=font_size,
+                                                state=tk.DISABLED,
+                                                command=self.button_subscribe)
+        self.button_subscribe_topic.grid(row=row, column=column)
 
-        self.subscriber = subscriber.Subscriber(self.main_window_frame_ui,
+        column += 1
+        self.button_add_subscribe_topic = tk.Button(self,
+                                                    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)
+
+        # filter msg
+        row += 1
+        column = 0
+
+        self.label_msg_filter = tk.Label(self, 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.entry_msg_filter_text = tk.StringVar(self)
+        self.entry_msg_filter = tk.Entry(self,
+                                         textvariable=self.entry_msg_filter_text,
+                                         font=font_size)
+        self.entry_msg_filter.grid(row=row, column=column)
+        column += 1
+
+        self.button_filter_add = tk.Button(self,
+                                           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_remove = tk.Button(self,
+                                              text="Remove Filter",
+                                              font=font_size,
+                                              state=tk.DISABLED,
+                                              command=self.remove_filter)
+        self.button_filter_remove.grid(row=row, column=column)
+
+        row += 1
+        column = 0
+
+        # 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)
+
+        # menu
+        menubar = tk.Menu(self)
+        self.config(menu=menubar)
+
+        menu_connect = tk.Menu(menubar, tearoff=0)
+        menu_connect.add_command(label='New Connect',
+                                 command=self.new_connect_window)
+        # menu_connect.add_command(label='Open Connect',
+        #                          command=self.open_connect_window)
+        menu_connect.add_separator()
+        menu_connect.add_command(label='Exit', command=self.quit)
+        menubar.add_cascade(label="Connect", menu=menu_connect)
+
+        menu_help = tk.Menu(menubar, tearoff=0)
+        menu_help.add_command(label='Help', command=self.help)
+        menu_help.add_command(label='About',
+                              command=self.about_window)
+        menubar.add_cascade(label="Help", menu=menu_help)
+
+        # status bar
+        self.connect_status_text = tk.StringVar()
+        self.connect_status_text.set("...")
+        self.connect_status = tk.Label(self,
+                                       textvariable=self.connect_status_text,
+                                       relief=tk.SUNKEN, anchor="w")
+        row += 1
+        column = 0
+
+        self.connect_status.grid(row=row, column=column)
+
+        self.subscriber = subscriber.Subscriber(self,
                                                 mqtt.Client())
 
     def button_connect(self):
         print("button_connect")
-        if self.main_window_frame_ui.entry_broker_text.get():
+        if self.entry_broker_text.get():
             broker, port, username, password = ConfigFile().read_broker(
-                self.main_window_frame_ui.entry_broker_text.get())
+                self.entry_broker_text.get())
             print(broker, port, username, password)
             if self.subscriber.connect_start(broker, port, username, password):
-                self.main_window_frame_ui.connect_status_text.set("Connected")
-                self.main_window_frame_ui.button_connect["state"] = tk.DISABLED
-                self.main_window_frame_ui.button_connect["text"] = "Connected"
-                self.main_window_frame_ui.button_disconnect[
+                self.connect_status_text.set("Connected")
+                self.button_connect["state"] = tk.DISABLED
+                self.button_connect["text"] = "Connected"
+                self.button_disconnect[
                     "state"] = tk.NORMAL
-                self.main_window_frame_ui.button_subscribe_topic[
+                self.button_subscribe_topic[
                     "state"] = tk.NORMAL
-                self.main_window_frame_ui.button_publich_topic[
+                self.button_publich_topic[
                     "state"] = tk.NORMAL
-
+                self.subscribe_list(broker)
+                self.button_add_subscribe_topic["state"] = tk.NORMAL
         else:
             messagebox.showerror("showerror", "Please select broker.")
 
+    def subscribe_list(self, broker):
+        self.entry_subscribe_topic['menu'].delete(0, 'end')
+
+        new_choices = ConfigFile().read_topics(broker).split(',')
+        for choice in new_choices:
+            if choice:
+                self.entry_subscribe_topic['menu'].add_command(
+                    label=choice,
+                    command=tk._setit(self.entry_subscribe_topic_text,
+                                      choice))
+                self.entry_subscribe_topic_text.set(choice)
+
     def button_disconnect(self):
         print("button_disconnect")
         if self.subscriber.connect_stop():
-            self.main_window_frame_ui.connect_status_text.set("Disconnect")
-            self.main_window_frame_ui.button_connect["state"] = tk.NORMAL
-            self.main_window_frame_ui.button_connect["text"] = "Connect"
-            self.main_window_frame_ui.button_disconnect["state"] = tk.DISABLED
-            self.main_window_frame_ui.button_subscribe_topic[
+            self.connect_status_text.set("Disconnect")
+            self.button_connect["state"] = tk.NORMAL
+            self.button_connect["text"] = "Connect"
+            self.button_disconnect["state"] = tk.DISABLED
+            self.button_subscribe_topic[
                 "state"] = tk.DISABLED
-            self.main_window_frame_ui.button_publich_topic[
+            self.button_publich_topic[
                 "state"] = tk.DISABLED
+            self.button_add_subscribe_topic["state"] = tk.DISABLED
 
-    def button_subscribe_topic(self):
-        print("button_subscribe_topic")
+    def button_subscribe(self):
+        print("button_subscribe")
         self.subscriber.subscribe_start(
-            self.main_window_frame_ui.entry_subscribe_topic_text.get())
-        self.main_window_frame_ui.button_filter_add[
+            self.entry_subscribe_topic_text.get())
+        self.button_filter_add[
             "state"] = tk.NORMAL
-        self.main_window_frame_ui.button_filter_remove[
+        self.button_filter_remove[
             "state"] = tk.DISABLED
 
     def button_publish_topic(self):
         print("button_publish_topic")
-        topic = self.main_window_frame_ui.entry_publich_topic_text.get()
-        msg = self.main_window_frame_ui.entry_publich_topic_msg_text.get()
-        self.main_window_frame_ui.listbox_message.insert(tk.END,
-                                                         "> {}".format(msg))
-        self.main_window_frame_ui.listbox_message.see("end")
+        topic = self.entry_publich_topic_text.get()
+        msg = self.entry_publich_topic_msg_text.get()
+        self.listbox_message.insert(tk.END,
+                                    "> {}".format(msg))
+        self.listbox_message.see("end")
         self.subscriber.publish_start(topic, msg)
 
     def about_window(self):
-        about.AboutWindow(self.master, self.text_font)
+        about.AboutWindow(self, self.text_font)
 
     def help(self):
         webbrowser.open_new_tab("https://github.com/electrocoder/MQTTClient")
 
     def new_connect_window(self):
-        new_connect.NewConnect(self.master, self.text_font)
+        new_connect.NewConnect(self, self.text_font)
 
-    def open_connect_window(self):
-        open_connect.OpenConnect(self.main_window_frame_ui, self.text_font)
+    def add_subscribe_topic(self, *args):
+        print("add_subscribe_topic")
+        new_topic.NewTopic(self, self.text_font)
 
     def add_filter(self):
-        self.main_window_frame_ui.msg_filter = True
-        self.main_window_frame_ui.button_filter_add[
+        self.msg_filter = True
+        self.button_filter_add[
             "state"] = tk.DISABLED
-        self.main_window_frame_ui.button_filter_remove[
+        self.button_filter_remove[
             "state"] = tk.NORMAL
 
     def remove_filter(self):
-        self.main_window_frame_ui.msg_filter = False
-        self.main_window_frame_ui.button_filter_add[
+        self.msg_filter = False
+        self.button_filter_add[
             "state"] = tk.NORMAL
-        self.main_window_frame_ui.button_filter_remove[
+        self.button_filter_remove[
             "state"] = tk.DISABLED