More langtool improvements

tools/editortool/langtool.py

@@ -1,14 +1,14 @@
 #!/usr/bin/env python3
-from PyQt5.QtWidgets import QMainWindow, QApplication, QAction, QMenuBar, QMessageBox, QFileDialog, QWidget, QVBoxLayout, QHBoxLayout, QLabel, QLineEdit, QTableWidget, QTableWidgetItem, QHeaderView, QPushButton
+from PyQt5.QtWidgets import QMainWindow, QApplication, QAction, QMenuBar, QMessageBox, QFileDialog, QWidget, QVBoxLayout, QHBoxLayout, QLabel, QLineEdit, QTableWidget, QTableWidgetItem, QHeaderView, QPushButton, QTabWidget, QFormLayout
 from PyQt5.QtCore import Qt
 import sys
 import os
+import polib
 
 class LangToolWindow(QMainWindow):
   def __init__(self):
     super().__init__()
     self.setWindowTitle("Dusk Language Editor")
-    self.showMaximized()
     self.setGeometry(100, 100, 800, 600)
     self.current_file = None
     self.dirty = False
@@ -19,35 +19,40 @@ class LangToolWindow(QMainWindow):
     central = QWidget()
     layout = QVBoxLayout(central)
 
-    # Header editor
-    header_layout = QHBoxLayout()
-    header_layout.addWidget(QLabel("Language:"))
+    tabs = QTabWidget()
+    # Header Tab
+    header_tab = QWidget()
+    header_layout = QFormLayout(header_tab)
     self.language_edit = QLineEdit()
-    header_layout.addWidget(self.language_edit)
-    header_layout.addWidget(QLabel("Plural-Forms:"))
+    self.language_edit.setMaximumWidth(220)
+    header_layout.addRow(QLabel("Language:"), self.language_edit)
     self.plural_edit = QLineEdit()
-    header_layout.addWidget(self.plural_edit)
-    header_layout.addWidget(QLabel("Content-Type:"))
+    self.plural_edit.setMaximumWidth(320)
+    header_layout.addRow(QLabel("Plural-Forms:"), self.plural_edit)
     self.content_type_edit = QLineEdit("text/plain; charset=UTF-8")
-    header_layout.addWidget(self.content_type_edit)
-    layout.addLayout(header_layout)
+    self.content_type_edit.setMaximumWidth(320)
+    header_layout.addRow(QLabel("Content-Type:"), self.content_type_edit)
+    tabs.addTab(header_tab, "Header")
 
-    # PO entries editor
+    # Strings Tab
+    strings_tab = QWidget()
+    strings_layout = QVBoxLayout(strings_tab)
     self.po_table = QTableWidget()
     self.po_table.setColumnCount(2)
     self.po_table.setHorizontalHeaderLabels(["msgid", "msgstr"])
     self.po_table.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch)
     self.po_table.verticalHeader().setMinimumWidth(22)
     self.po_table.verticalHeader().setDefaultAlignment(Qt.AlignRight | Qt.AlignVCenter)
-    layout.addWidget(self.po_table)
-
-    # Row add/remove buttons
+    strings_layout.addWidget(self.po_table)
     row_btn_layout = QHBoxLayout()
     add_row_btn = QPushButton("Add Row")
     remove_row_btn = QPushButton("Remove Row")
     row_btn_layout.addWidget(add_row_btn)
     row_btn_layout.addWidget(remove_row_btn)
-    layout.addLayout(row_btn_layout)
+    strings_layout.addLayout(row_btn_layout)
+    tabs.addTab(strings_tab, "Strings")
+
+    layout.addWidget(tabs)
 
     add_row_btn.clicked.connect(self.add_row)
     remove_row_btn.clicked.connect(self.remove_row)
@@ -121,51 +126,34 @@ class LangToolWindow(QMainWindow):
     self.load_po_file(file_path)
 
   def load_po_file(self, file_path):
-    language = ""
-    plural = ""
-    entries = []
-    with open(file_path, "r", encoding="utf-8") as f:
-      lines = f.readlines()
-    i = 0
-    while i < len(lines):
-      line = lines[i].strip()
-      if line.startswith('"Language:'):
-        language = line.split(':',1)[1].strip('"\n ')
-      elif line.startswith('"Plural-Forms:'):
-        plural = line.split(':',1)[1].strip('"\n ')
-      elif line.startswith('msgid'):
-        msgid = line[6:].strip('"')
-        i += 1
-        msgstr = lines[i].strip()[7:].strip('"') if i < len(lines) and lines[i].strip().startswith('msgstr') else ""
-        entries.append((msgid, msgstr))
-      i += 1
+    po = polib.pofile(file_path)
+    language = po.metadata.get('Language', '')
+    plural = po.metadata.get('Plural-Forms', '')
+    content_type = po.metadata.get('Content-Type', 'text/plain; charset=UTF-8')
     self.language_edit.setText(language)
     self.plural_edit.setText(plural)
-    self.po_table.setRowCount(len(entries))
-    for row, (msgid, msgstr) in enumerate(entries):
-      self.po_table.setItem(row, 0, QTableWidgetItem(msgid))
-      self.po_table.setItem(row, 1, QTableWidgetItem(msgstr))
+    self.content_type_edit.setText(content_type)
+    self.po_table.setRowCount(len(po))
+    for row, entry in enumerate(po):
+      self.po_table.setItem(row, 0, QTableWidgetItem(entry.msgid))
+      self.po_table.setItem(row, 1, QTableWidgetItem(entry.msgstr))
 
   def save_file(self, file_path):
-    language = self.language_edit.text()
-    plural = self.plural_edit.text()
-    content_type = self.content_type_edit.text()
-    entries = []
+    po = polib.POFile()
+    po.metadata = {
+      'Language': self.language_edit.text(),
+      'Content-Type': self.content_type_edit.text(),
+      'Plural-Forms': self.plural_edit.text(),
+    }
     for row in range(self.po_table.rowCount()):
-      msgid = self.po_table.item(row, 0)
-      msgstr = self.po_table.item(row, 1)
-      msgid_text = msgid.text() if msgid else ""
-      msgstr_text = msgstr.text() if msgstr else ""
-      if msgid_text or msgstr_text:
-        entries.append((msgid_text, msgstr_text))
-    with open(file_path, "w", encoding="utf-8") as f:
-      f.write('msgid ""\nmsgstr ""\n')
-      f.write(f'"Language: {language}"\n')
-      f.write(f'"Content-Type: {content_type}"\n')
-      f.write(f'"Plural-Forms: {plural}"\n')
-      f.write('\n')
-      for msgid, msgstr in entries:
-        f.write(f'msgid "{msgid}"\nmsgstr "{msgstr}"\n\n')
+      msgid_item = self.po_table.item(row, 0)
+      msgstr_item = self.po_table.item(row, 1)
+      msgid = msgid_item.text() if msgid_item else ''
+      msgstr = msgstr_item.text() if msgstr_item else ''
+      if msgid or msgstr:
+        entry = polib.POEntry(msgid=msgid, msgstr=msgstr)
+        po.append(entry)
+    po.save(file_path)
     self.dirty = False
     self.update_save_action()
 
@@ -197,6 +185,16 @@ class LangToolWindow(QMainWindow):
       self.po_table.removeRow(row)
       self.set_dirty()
 
+  def closeEvent(self, event):
+    if self.dirty:
+      reply = QMessageBox.question(self, "Save Changes?", "Do you want to save changes before exiting?", QMessageBox.Yes | QMessageBox.No | QMessageBox.Cancel)
+      if reply == QMessageBox.Cancel:
+        event.ignore()
+        return
+      elif reply == QMessageBox.Yes:
+        self.handle_save()
+    event.accept()
+
 if __name__ == "__main__":
   app = QApplication(sys.argv)
   window = LangToolWindow()