fix: GUI увеличили

.gitignore

@@ -48,7 +48,6 @@ coverage.xml
 # Translations
 *.mo
 *.pot
-*.po
 
 # Django stuff:
 *.log
@@ -68,8 +67,3 @@ target/
 tmp*
 .env*
 venv*
-
-# Doit
-*.bak
-*.dat
-*.dir

.pre-commit-config.yaml

@@ -15,4 +15,4 @@ repos:
     rev: 3.9.0
     hooks:
     - id: flake8
-      args: ["--ignore=E203,W503,FI10,FI11,FI12,FI13,FI14,FI15,FI16,FI17,FI58,E501", "--builtins=_"]
+      args: ["--ignore=E203,W503,FI10,FI11,FI12,FI13,FI14,FI15,FI16,FI17,FI58,E501"]

README.md

@@ -32,16 +32,10 @@
 
 ## Как запустить проект
 ### Frontend
-Интерфейс на русском языке
 ```bash
 python3 todo_tk.py
 ```
 
-Интерфейс на английском языке
-```bash
-LANG=eng python3 todo_tk.py
-```
-
 ### backend
 ```bash
 docker-compose up

dodo.py

@@ -1,36 +0,0 @@
-#!usr/bin/env python3
-'''
-'''
-
-import glob
-
-def task_pot():
-    """Create bynary wheel distribution"""
-    return {
-        'actions': ["""pybabel extract -o todo.pot frontend"""],
-        'file_dep': glob.glob('frontend/*.py'),
-        'targets': ['todo.pot']
-    }
-
-def task_po():
-    """Create bynary wheel distribution"""
-    return {
-        'actions': ["""pybabel update -D todo -d frontend/po -i todo.pot"""],
-        'file_dep': ['todo.pot'],
-        'targets': ['frontend/po/eng/LC_MESSAGES/todo.po']
-    }
-
-def task_mo():
-    """Create bynary wheel distribution"""
-    return {
-        'actions': ["""pybabel compile -D todo -i frontend/po/eng/LC_MESSAGES/todo.po -o frontend/po/eng/LC_MESSAGES/todo.mo"""],
-        'file_dep': ['frontend/po/eng/LC_MESSAGES/todo.po'],
-        'targets': ['frontend/po/eng/LC_MESSAGES/todo.mo']
-    }
-
-def task_wheel():
-    """Create bynary wheel distribution"""
-    return {
-        'actions': ['python3 -m build -w'],
-        'task_dep': ['mo']
-    }

frontend/__main__.py

@@ -1,8 +0,0 @@
-#!/usr/bin/env python3
-"""django-todo application launcher"""
-
-from .todo_tk import Application
-
-if __name__ == "__main__":
-    app = Application()
-    app.main(app.login())

frontend/api_demo.py

@@ -1,5 +1,5 @@
 import random
-from .user import User
+from user import User
 
 
 def print_lists(lists):

frontend/login.py

@@ -1,10 +1,6 @@
-import gettext
-import os
 import tkinter as tk
-from .user import User
-from . import message
-
-gettext.install("todo", os.path.join(os.path.dirname(__file__), "po"))
+from user import User
+import message
 
 
 class LoginFrame(tk.Frame):
@@ -61,22 +57,21 @@ class LoginFrame(tk.Frame):
             tk.Grid.columnconfigure(self, columns, weight=1)
 
         # Подпись и поле ввода для логина
-        t = _("Введите логин")
-        login_label = tk.Label(self, text=t)
+        login_label = tk.Label(self, text="Введите логин")
         login_label.grid(row=9, column=12, columnspan=3, rowspan=1, sticky="nsew")
 
         self.login = tk.Entry(self)
         self.login.grid(row=10, column=12, columnspan=3, rowspan=1, sticky="nsew")
 
         # Подпись и поле ввода для пароля
-        password_label = tk.Label(self, text=_("Введите пароль"))
+        password_label = tk.Label(self, text="Введите пароль")
         password_label.grid(row=11, column=12, columnspan=3, rowspan=1, sticky="nsew")
 
         self.password = tk.Entry(self, show="*")
         self.password.grid(row=12, column=12, columnspan=3, rowspan=1, sticky="nsew")
 
         # Кнопка авториазции
-        btn = tk.Button(self, text=_("Войти"), command=self.login_clicked)
+        btn = tk.Button(self, text="Войти", command=self.login_clicked)
         btn.grid(row=14, column=12, columnspan=3, rowspan=1, sticky="nsew")
 
         # Если захочется реализовать в логине

frontend/message.py

@@ -1,12 +1,8 @@
-import gettext
-import os
 from tkinter import messagebox as mb
 
-gettext.install("todo", os.path.join(os.path.dirname(__file__), "po"))
-
-TITLE_INFO_BOX = _("Сообщение!")
-MESSAGE_INVALID_LOGIN = _("Неправильный логин или пароль")
-MESSAGE_EMPTY = _("Сдесь могло быть ваше сообщение")
+TITLE_INFO_BOX = "Сообщение!"
+MESSAGE_INVALID_LOGIN = "Неправильный логин или пароль"
+MESSAGE_EMPTY = "Сдесь могло быть ваше сообщение"
 
 
 def infobox(msg: str = None) -> None:

frontend/todo_tk.py

@@ -1,24 +1,20 @@
 #!/usr/bin/env python3
 
-import gettext
-import os
 import sys
 import tkinter as tk
-from .login import LoginFrame
-from .workspace import WorkSpaceFrame
-from .user import User
-
-gettext.install("todo", os.path.join(os.path.dirname(__file__), "po"))
+from login import LoginFrame
+from workspace import WorkSpaceFrame
+from user import User
 
 if "win" in sys.platform.lower():
     DEFAULT_URL = "http://localhost:8000"
 else:
     DEFAULT_URL = "http://0.0.0.0:8000"
 
-BASE_W = 900
-BASE_H = 400
+BASE_W = 1600
+BASE_H = 600
 
-TITLE_APP = _("Приложение для планирования")
+TITLE_APP = "ToDo Application"
 
 
 class Application(tk.Tk):
@@ -54,6 +50,7 @@ class Application(tk.Tk):
     def center_window(self, width: str = BASE_W, heigh: str = BASE_H) -> None:
         """
         Центрирует приложение по центру экрана
+
         :param width: ширина окна
         :param heigh: высота окна
         """

frontend/user.py

@@ -7,7 +7,7 @@ from pathlib import Path
 
 import json
 
-from .api import UserApi
+from api import UserApi
 
 LIST_UPDATEBLE = ["title"]
 TODO_ITEM_UPDATEBLE = ["text", "finished"]

frontend/workspace.py

@@ -1,65 +1,60 @@
-import gettext
-import os
 import tkinter as tk
 
-gettext.install("todo", os.path.join(os.path.dirname(__file__), "po"))
-
 
 def str_time(time):
     return time.strftime("%Y-%m-%d %H:%M:%S")
 
 
-TODO_ITEM_TABLE_TEXT_WIDTH = 25
-TODO_ITEM_TABLE_FINISHED_WIDTH = 20
-
-TODO_ITEM_TABLE_CREATED_AT_WIDTH = 25
+TODO_ITEM_TABLE_TEXT_WIDTH = 24
+TODO_ITEM_TABLE_FINISHED_WIDTH = 12
+TODO_ITEM_TABLE_CREATED_AT_WIDTH = 24
 
 
 def placeholder():
-    print(_("Не реализовано"))
+    print("Не реализовано")
 
 
 class ToDoItemWidget(tk.Frame):
-    def __init__(self, *args, row_number, item, table, **argv):
+    @staticmethod
+    def header(parent):
+        body = tk.Frame(parent)
+
+        text = tk.Label(body, text="Текст", width=TODO_ITEM_TABLE_TEXT_WIDTH)
+        text.pack(side="left")
+
+        text = tk.Label(body, text="Выполнено", width=TODO_ITEM_TABLE_FINISHED_WIDTH)
+        text.pack(side="left")
+
+        text = tk.Label(body, text="Создано", width=TODO_ITEM_TABLE_CREATED_AT_WIDTH)
+        text.pack(side="left")
+
+        return body
+
+    def __init__(self, *args, item, **argv):
         super().__init__(*args, **argv)
 
         self.parent = self.master
         self.item = item
 
-        self.noteLabel = tk.Label(
-            table,
-            text=item.text,
-            width=TODO_ITEM_TABLE_TEXT_WIDTH,
-            justify="center",
-            font=("Arial", 8),
-        )
-        self.noteLabel.grid(row=row_number, column=0)
+        self.noteLabel = tk.Label(self, text=item.text, width=TODO_ITEM_TABLE_TEXT_WIDTH)
+        self.noteLabel.pack(side="left")
 
         self.finished = tk.IntVar(value=int(item.finished))
         self.finishedButton = tk.Checkbutton(
-            table,
+            self,
             variable=self.finished,
             command=self.finishedButton_command,
             width=TODO_ITEM_TABLE_FINISHED_WIDTH,
-            justify="center",
         )
-        self.finishedButton.grid(row=row_number, column=1)
+        self.finishedButton.pack(side="left")
 
         self.createdAt = tk.Label(
-            table,
-            text=str_time(item.created_at),
-            width=TODO_ITEM_TABLE_CREATED_AT_WIDTH,
-            justify="center",
+            self, text=str_time(item.created_at), width=TODO_ITEM_TABLE_CREATED_AT_WIDTH
         )
-        self.createdAt.grid(row=row_number, column=2)
+        self.createdAt.pack(side="left")
 
-        self.remove = tk.Button(
-            table,
-            text=_("Удалить"),
-            command=lambda: self.parent.remove(self.item),
-            justify="center",
-        )
-        self.remove.grid(row=row_number, column=3)
+        self.remove = tk.Button(self, text="Удалить", command=lambda: self.parent.remove(self.item))
+        self.remove.pack(side="left")
 
     def finishedButton_command(self):
         self.item.modify(finished=self.finished.get() > 0)
@@ -70,69 +65,26 @@ class ToDoListWidget(tk.Frame):
         super().__init__(*args, **argv)
         self.delete_list = delete_list
 
-    def create_table_header(self, body):
+    def fill(self, itemList):
 
-        header_font = ("Arial", "10", "bold")
-        text = tk.Label(
-            body,
-            text=_("Текст"),
-            width=TODO_ITEM_TABLE_TEXT_WIDTH,
-            justify="center",
-            font=header_font,
-        )
-        text.grid(row=0, column=0)
-
-        done = tk.Label(
-            body,
-            text=_("Выполнено"),
-            width=TODO_ITEM_TABLE_FINISHED_WIDTH,
-            justify="center",
-            font=header_font,
-        )
-        done.grid(row=0, column=1)
-
-        created = tk.Label(
-            body,
-            text=_("Создано"),
-            width=TODO_ITEM_TABLE_CREATED_AT_WIDTH,
-            justify="center",
-            font=header_font,
-        )
-        created.grid(row=0, column=2)
-
-    def create_table(self, itemList):
-        table = tk.LabelFrame(self, relief=tk.GROOVE)
-        table.grid()
-        self.create_table_header(table)
+        header = ToDoItemWidget.header(self)
+        header.pack(side="left")
+        header.pack(side="top", fill="y")
 
         self.itemList = itemList
-        row_number = 1
+
         for item in itemList:
-            item = ToDoItemWidget(self, row_number=row_number, item=item, table=table)
-            row_number += 1
-        return table
+            item = ToDoItemWidget(self, item=item)
+            item.pack(side="top", fill="y")
 
-    def create_new_item(self):
-        table = tk.LabelFrame(self, relief=tk.GROOVE)
-        table.grid()
-        self.itemToAdd = tk.Text(table, width=15, height=1)
-        self.itemToAdd.grid(row=0, column=0)
+        self.itemToAdd = tk.Text(self, width=15, height=1)
+        self.itemToAdd.pack(side="top")
 
-        add = tk.Button(table, text=_("Добавить заметку"), command=self.add_command)
-        add.grid(row=0, column=1)
-        return table
+        add = tk.Button(self, text="Добавить заметку", command=self.add_command)
+        add.pack(side="top")
 
-    def fill(self, itemList):
-        self.frame = tk.LabelFrame(self, relief=tk.GROOVE)
-        self.frame.grid(sticky="NEWS")
-        table = self.create_table(itemList)
-        table.grid(row=0, column=0)
-
-        new = self.create_new_item()
-        new.grid(row=2, column=0)
-
-        delete = tk.Button(self, text=_("Удалить лист"), command=self.delete_list)
-        delete.grid(row=4, column=0)
+        delete = tk.Button(self, text="Удалить лист", command=self.delete_list)
+        delete.pack(side="top")
 
     def update(self, itemList=None):
         self.clear()
@@ -189,20 +141,20 @@ class WorkSpaceFrame(tk.Frame):
 
         # Запомнить пользователя
         self.rbtn_var = tk.IntVar(value=1)
-        rbtn = tk.Checkbutton(self, text=_("Запомнить меня"), variable=self.rbtn_var, command=None)
+        rbtn = tk.Checkbutton(self, text="Запомнить меня", variable=self.rbtn_var, command=None)
         rbtn.pack(anchor="n")
 
         # data
         self.lists = user.fetchUserLists()
 
-        self.add_list_text = tk.Text(self, width=15, height=1)
+        self.add_list_text = tk.Text(self, width=25, height=1)
         self.add_list_text.pack(anchor="sw")
 
-        add = tk.Button(self, text=_("Добавить лист"), command=self.add_list)
+        add = tk.Button(self, text="Добавить лист", command=self.add_list)
         add.pack(anchor="sw")
 
         # select list box
-        self.listBox = tk.Listbox(self, width=30, selectmode=tk.SINGLE)
+        self.listBox = tk.Listbox(self, width=40, selectmode=tk.SINGLE)
         self.listBox.pack(side="left", fill="y")
         self.listBox.bind("<<ListboxSelect>>", self.listBox_selected)
 

pyproject.toml

@@ -21,15 +21,3 @@ exclude = '''
   | profiling
 )/
 '''
-
-[build-system]
-requires = [
-  "setuptools",
-  "wheel",
-  "requests",
-  "build",
-  "coverage",
-  "doit"
-]
-build-backend = "setuptools.build_meta"
-

setup.cfg

@@ -1,11 +0,0 @@
-[metadata]
-name = django-todo
-version = 0.0.1
-
-[options]
-packages = frontend
-install_requires =
-    requests; python_version >= "3.6"
-
-[options.package_data]
-frontend = */*/*/todo.mo