Major bug fixes, optimization + major advance
This commit is contained in:
@@ -3,23 +3,26 @@ import tkinter.font as tfont
|
||||
from tkinter import ttk
|
||||
from tkinter import scrolledtext as tst
|
||||
from controller.HomeController import HomeController
|
||||
from view.MainWindow import MainWindow
|
||||
|
||||
|
||||
class HomeView(ttk.Frame):
|
||||
"""
|
||||
View - MainWindow
|
||||
View - HomeWindow
|
||||
|
||||
dec...
|
||||
This view allows you to start the scraping/downloading process,
|
||||
as well as to display the progress of the process.
|
||||
|
||||
@author Jérémi Nihart / EndMove
|
||||
@link https://git.endmove.eu/EndMove/WebPicDownloader
|
||||
@version 1.0.0
|
||||
@since 2022-08-30
|
||||
@version 1.0.1
|
||||
@since 2022-09-05
|
||||
"""
|
||||
# Variables
|
||||
__controller: HomeController = None
|
||||
|
||||
# Constructor
|
||||
def __init__(self, parent, controller: HomeController):
|
||||
def __init__(self, parent: MainWindow, controller: HomeController):
|
||||
"""
|
||||
Constructor
|
||||
|
||||
@@ -27,15 +30,15 @@ class HomeView(ttk.Frame):
|
||||
* :controller: -> The view controller
|
||||
"""
|
||||
super().__init__(parent)
|
||||
|
||||
# Save and setup main controller
|
||||
self.__controller = controller
|
||||
controller.set_view(self)
|
||||
|
||||
# Init view
|
||||
self.__init_content()
|
||||
|
||||
# Save and setup controller
|
||||
self.__controller = controller
|
||||
controller.set_view(self)
|
||||
|
||||
# START Internal function
|
||||
# START Internal functions
|
||||
def __init_content(self) -> None:
|
||||
"""
|
||||
[internal function]
|
||||
@@ -61,6 +64,7 @@ class HomeView(ttk.Frame):
|
||||
self.log_textarea = tst.ScrolledText(self, font=log_textarea_font, wrap=tk.WORD, state=tk.DISABLED, width=40, height=8)#, font=("Times New Roman", 15))
|
||||
self.log_textarea.grid(row=3, column=0, columnspan=2, sticky=tk.EW, pady=10, padx=10)
|
||||
|
||||
# Message state
|
||||
self.message_label = ttk.Label(self, text='message label')
|
||||
|
||||
# Download button
|
||||
@@ -73,13 +77,15 @@ class HomeView(ttk.Frame):
|
||||
=> Function called when a download is requested.
|
||||
"""
|
||||
self.__controller.on_download_requested(self.web_entry.get(), self.name_entry.get())
|
||||
# END Internal function
|
||||
# END Internal functions
|
||||
|
||||
# START Controller methods
|
||||
def add_log(self, line: str) -> None:
|
||||
"""
|
||||
[function for controller]
|
||||
TODO desc
|
||||
=> Add a log in the textarea where the logs are displayed.
|
||||
|
||||
* :line: -> Log message to add.
|
||||
"""
|
||||
self.log_textarea.configure(state=tk.NORMAL)
|
||||
self.log_textarea.insert(tk.END, f"~ {line}\n")
|
||||
@@ -89,7 +95,7 @@ class HomeView(ttk.Frame):
|
||||
def clear_logs(self) -> None:
|
||||
"""
|
||||
[function for controller]
|
||||
TODO desc
|
||||
=> Clean the textarea where the logs are displayed.
|
||||
"""
|
||||
self.log_textarea.configure(state=tk.NORMAL)
|
||||
self.log_textarea.delete('1.0', tk.END)
|
||||
@@ -98,25 +104,42 @@ class HomeView(ttk.Frame):
|
||||
def show_error_message(self, message) -> None:
|
||||
"""
|
||||
[function for controller]
|
||||
TODO desc
|
||||
=> Display an error message on the interface.
|
||||
|
||||
* :message: -> Message to display.
|
||||
"""
|
||||
self.message_label.configure(text=message, foreground='red')
|
||||
self.message_label.grid(row=4, column=0, columnspan=2, sticky=tk.NS, padx=2, pady=2)
|
||||
self.message_label.after(30000, self.hide_message)
|
||||
self.message_label.after(25000, self.hide_message)
|
||||
|
||||
def show_success_message(self, message) -> None:
|
||||
"""
|
||||
[function for controller]
|
||||
TODO desc
|
||||
=> Display a success message on the interface.
|
||||
|
||||
* :message: -> Message to display.
|
||||
"""
|
||||
self.message_label.configure(text=message, foreground='green')
|
||||
self.message_label.grid(row=4, column=0, columnspan=2, sticky=tk.NS, padx=2, pady=2)
|
||||
self.message_label.after(30000, self.hide_message)
|
||||
self.message_label.after(25000, self.hide_message)
|
||||
|
||||
def hide_message(self) -> None:
|
||||
"""
|
||||
[function for controller]
|
||||
TODO desc
|
||||
[function for controller and this view]
|
||||
=> Hide the message on the interface.
|
||||
"""
|
||||
self.message_label.grid_forget()
|
||||
|
||||
def set_interface_state(self, disable: bool) -> None:
|
||||
"""
|
||||
[function for controller]
|
||||
=> Allows to change the status of the interface with which the user
|
||||
interacts by activating/deactivating it.
|
||||
|
||||
* :disabled: -> True: interface disabled, False: interface enabled.
|
||||
"""
|
||||
state = tk.DISABLED if disable else tk.NORMAL
|
||||
self.web_entry['state'] = state
|
||||
self.name_entry['state'] = state
|
||||
self.download_button['state'] = state
|
||||
# END Controller methods
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
import tkinter as tk
|
||||
from tkinter import font
|
||||
from tkinter import ttk
|
||||
from controller.Frames import Frames
|
||||
from controller.InfoController import InfoController
|
||||
from view.MainWindow import MainWindow
|
||||
|
||||
|
||||
class InfoView(ttk.Frame):
|
||||
"""
|
||||
@@ -18,7 +21,7 @@ class InfoView(ttk.Frame):
|
||||
__controller: InfoController = None
|
||||
|
||||
# Constructor
|
||||
def __init__(self, parent, controller: InfoController):
|
||||
def __init__(self, parent: MainWindow, controller: InfoController):
|
||||
"""
|
||||
Constructor
|
||||
|
||||
@@ -27,33 +30,72 @@ class InfoView(ttk.Frame):
|
||||
"""
|
||||
super().__init__(parent)
|
||||
|
||||
# create widgets
|
||||
# label
|
||||
self.label = ttk.Label(self, text='Email:')
|
||||
self.label.grid(row=1, column=0)
|
||||
# Init view
|
||||
self.__init_content()
|
||||
|
||||
# email entry
|
||||
# self.email_var = tk.StringVar()
|
||||
# self.email_entry = ttk.Entry(self, textvariable=self.email_var, width=30)
|
||||
# self.email_entry.grid(row=1, column=1, sticky=tk.NSEW)
|
||||
|
||||
# save button
|
||||
self.save_button = ttk.Button(self, text='just a button', command=self.event_btn)
|
||||
self.save_button.grid(row=1, column=3, padx=10)
|
||||
|
||||
# message
|
||||
self.message_label = ttk.Label(self, text='Je suis super man comment allez vous heheheh je suis toutou', foreground='red')
|
||||
self.message_label.grid(row=2, column=0, sticky=tk.EW)
|
||||
|
||||
# place this frame
|
||||
# self.grid(row=0, column=0, padx=5, pady=5, sticky=tk.NSEW)
|
||||
# self.pack(fill='both', expand=True)
|
||||
|
||||
# Save and setup main controller
|
||||
# Save and setup controller
|
||||
self.__controller = controller
|
||||
controller.set_view(self)
|
||||
|
||||
def event_btn(self) -> None:
|
||||
print("you clicked on the button that is on the info view!")
|
||||
print("got redirected to the home view :D")
|
||||
self.__controller.on_change_view(Frames.Home)
|
||||
# START Internal functions
|
||||
def __init_content(self) -> None:
|
||||
"""
|
||||
[internal function]
|
||||
=> Initialize the view content.
|
||||
"""
|
||||
self.columnconfigure(0, weight=4)
|
||||
|
||||
# Back button
|
||||
self.back_button = ttk.Button(self, text="Back", command=self.__event_button_back)
|
||||
self.back_button.grid(row=0, column=0, sticky=tk.E, padx=5, pady=5, ipadx=1, ipady=1)
|
||||
|
||||
# About title
|
||||
self.title_label_font = font.Font(self, size=16, weight=font.BOLD)
|
||||
self.title_label = ttk.Label(self, text="A title", font=self.title_label_font)
|
||||
self.title_label.grid(row=1, column=0, sticky=tk.NS, padx=2, pady=2)
|
||||
|
||||
# About content
|
||||
self.content_label_font = font.Font(self, size=10)
|
||||
self.content_label = ttk.Label(self, wraplength=400, justify='center', text='A long text', font=self.content_label_font, foreground='blue')
|
||||
self.content_label.grid(row=2, column=0, sticky=tk.NS)
|
||||
|
||||
# About version
|
||||
self.version_label = ttk.Label(self, text='version : 1.0.0 - 02-02-2022')
|
||||
self.version_label.grid(row=3, column=0, sticky=tk.NS, pady=15)
|
||||
|
||||
def __event_button_back(self) -> None:
|
||||
"""
|
||||
[internal function]
|
||||
=> Function called when back button pressed.
|
||||
"""
|
||||
self.__controller.on_change_view(Frames.HOME)
|
||||
# END Internal functions
|
||||
|
||||
# START Controller methods
|
||||
def set_title(self, title: str) -> None:
|
||||
"""
|
||||
[function for controller]
|
||||
=> Define view/page info : title
|
||||
|
||||
* :title: -> Title for the view.
|
||||
"""
|
||||
self.title_label.configure(text=title)
|
||||
|
||||
def set_content(self, content: str) -> None:
|
||||
"""
|
||||
[function for controller]
|
||||
=> Define view/page info : content
|
||||
|
||||
* :content: -> Content for the view.
|
||||
"""
|
||||
self.content_label.configure(text=content)
|
||||
|
||||
def set_version(self, version: str) -> None:
|
||||
"""
|
||||
[function for controller]
|
||||
=> Define view/page info : version
|
||||
|
||||
* :version: -> Version for the view.
|
||||
"""
|
||||
self.version_label.configure(text=version)
|
||||
# END Controller methods
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
import os
|
||||
import sys
|
||||
import tkinter as tk
|
||||
from tkinter import messagebox
|
||||
from controller.Frames import Frames
|
||||
from controller.MainController import MainController
|
||||
|
||||
|
||||
@@ -7,7 +10,8 @@ class MainWindow(tk.Tk):
|
||||
"""
|
||||
View - MainWindow
|
||||
|
||||
TODO dec...
|
||||
This view is the main view of the application, it manages the different frames/views
|
||||
of the application, captures the events to send them to the main controller.
|
||||
|
||||
@author Jérémi Nihart / EndMove
|
||||
@link https://git.endmove.eu/EndMove/WebPicDownloader
|
||||
@@ -47,8 +51,9 @@ class MainWindow(tk.Tk):
|
||||
=> Initialize window parameters
|
||||
"""
|
||||
# self.title('My tkinter app')
|
||||
# self.geometry('450x250')
|
||||
self.geometry('430x310')
|
||||
self.resizable(False, False)
|
||||
self.iconbitmap(f"{self.__controller.get_config('sys_directory')}\\assets\logo.ico")
|
||||
# self.config(bg='#f7ef38')
|
||||
|
||||
def __init_top_menu(self) -> None:
|
||||
@@ -99,7 +104,7 @@ class MainWindow(tk.Tk):
|
||||
"""
|
||||
self.title(title)
|
||||
|
||||
def show_frame(self, frame) -> None:
|
||||
def show_frame(self, frame: Frames) -> None:
|
||||
"""
|
||||
[function for app & controller]
|
||||
=> Allows to display the selected frame provided that it
|
||||
@@ -125,20 +130,23 @@ class MainWindow(tk.Tk):
|
||||
def show_question_dialog(self, title: str, message: str, icon: str='question') -> bool:
|
||||
"""
|
||||
[function for controller]
|
||||
=> TODO DESC
|
||||
=> Display a question dialog to the user, which he can answer with yes or no.
|
||||
|
||||
* :message: ->
|
||||
* RETURN ->
|
||||
* :title: -> Title of the dialogue.
|
||||
* :message: -> Message of the dialogue displayed to the user.
|
||||
* :icon: -> Icon of the dialogue displayed to the user.
|
||||
* RETURN -> True id the user selected yes, False else.
|
||||
"""
|
||||
return messagebox.askquestion(title, message, icon=icon)
|
||||
return True if (messagebox.askquestion(title, message, icon=icon) == "yes") else False
|
||||
|
||||
def show_information_dialog(self, title: str, message: str, icon: str='information') -> None:
|
||||
"""
|
||||
[function for controller]
|
||||
=> TODO DESC
|
||||
=> Display an information dialog to the user.
|
||||
|
||||
* :message: ->
|
||||
* RETURN ->
|
||||
* :title: -> Title of the dialogue.
|
||||
* :message: -> Message of the dialogue displayed to the user.
|
||||
* :icon: -> Icon of the dialogue displayed to the user.
|
||||
"""
|
||||
messagebox.showinfo(self, title, message, icon=icon)
|
||||
# END Controller methods
|
||||
|
||||
Reference in New Issue
Block a user