From ad4f383c297c4597e942521a0ee49a85c884ea4e Mon Sep 17 00:00:00 2001
From: "Christopher T. Johnson" <ctjctj@gmail.com>
Date: Fri, 17 Nov 2023 11:03:25 -0500
Subject: [PATCH] New layouts

---
 ui/EditDialog.py | 32 ++++++++++++++++++++------------
 ui/EditDialog.ui | 40 +++++++++++++++++++++++++++-------------
 ui/MainWindow.py |  9 +++++----
 ui/MainWindow.ui |  7 +++++--
 4 files changed, 57 insertions(+), 31 deletions(-)

diff --git a/ui/EditDialog.py b/ui/EditDialog.py
index 9928e78..778f42c 100644
--- a/ui/EditDialog.py
+++ b/ui/EditDialog.py
@@ -12,7 +12,7 @@ from PyQt6 import QtCore, QtGui, QtWidgets
 class Ui_Dialog(object):
     def setupUi(self, Dialog):
         Dialog.setObjectName("Dialog")
-        Dialog.resize(761, 427)
+        Dialog.resize(1024, 427)
         self.horizontalLayout = QtWidgets.QHBoxLayout(Dialog)
         self.horizontalLayout.setObjectName("horizontalLayout")
         self.stackedWidget = QtWidgets.QStackedWidget(parent=Dialog)
@@ -45,17 +45,23 @@ class Ui_Dialog(object):
         self.widget.setObjectName("widget")
         self.verticalLayout = QtWidgets.QVBoxLayout(self.widget)
         self.verticalLayout.setObjectName("verticalLayout")
-        self.defineBtn = QtWidgets.QPushButton(parent=self.widget)
-        self.defineBtn.setObjectName("defineBtn")
-        self.verticalLayout.addWidget(self.defineBtn)
-        self.wordsBtn = QtWidgets.QPushButton(parent=self.widget)
-        self.wordsBtn.setObjectName("wordsBtn")
-        self.verticalLayout.addWidget(self.wordsBtn)
+        self.addBtn = QtWidgets.QPushButton(parent=self.widget)
+        self.addBtn.setObjectName("addBtn")
+        self.verticalLayout.addWidget(self.addBtn)
         self.showBtn = QtWidgets.QPushButton(parent=self.widget)
         self.showBtn.setObjectName("showBtn")
         self.verticalLayout.addWidget(self.showBtn)
         spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
         self.verticalLayout.addItem(spacerItem)
+        self.scrollBtn = QtWidgets.QPushButton(parent=self.widget)
+        self.scrollBtn.setObjectName("scrollBtn")
+        self.verticalLayout.addWidget(self.scrollBtn)
+        self.nextParaBtn = QtWidgets.QPushButton(parent=self.widget)
+        self.nextParaBtn.setObjectName("nextParaBtn")
+        self.verticalLayout.addWidget(self.nextParaBtn)
+        self.prevParaBtn = QtWidgets.QPushButton(parent=self.widget)
+        self.prevParaBtn.setObjectName("prevParaBtn")
+        self.verticalLayout.addWidget(self.prevParaBtn)
         self.nextBtn = QtWidgets.QPushButton(parent=self.widget)
         self.nextBtn.setObjectName("nextBtn")
         self.verticalLayout.addWidget(self.nextBtn)
@@ -71,8 +77,10 @@ class Ui_Dialog(object):
     def retranslateUi(self, Dialog):
         _translate = QtCore.QCoreApplication.translate
         Dialog.setWindowTitle(_translate("Dialog", "Dialog"))
-        self.defineBtn.setText(_translate("Dialog", "Define"))
-        self.wordsBtn.setText(_translate("Dialog", "Words"))
-        self.showBtn.setText(_translate("Dialog", "Show"))
-        self.nextBtn.setText(_translate("Dialog", "Next"))
-        self.prevBtn.setText(_translate("Dialog", "Previous"))
+        self.addBtn.setText(_translate("Dialog", "Add Word"))
+        self.showBtn.setText(_translate("Dialog", "Definition"))
+        self.scrollBtn.setText(_translate("Dialog", "Scroll"))
+        self.nextParaBtn.setText(_translate("Dialog", "Next Para"))
+        self.prevParaBtn.setText(_translate("Dialog", "Prev Para"))
+        self.nextBtn.setText(_translate("Dialog", "Next Sect"))
+        self.prevBtn.setText(_translate("Dialog", "Prev. Sect"))
diff --git a/ui/EditDialog.ui b/ui/EditDialog.ui
index 9605f79..ddd4313 100644
--- a/ui/EditDialog.ui
+++ b/ui/EditDialog.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>761</width>
+    <width>1024</width>
     <height>427</height>
    </rect>
   </property>
@@ -52,23 +52,16 @@
     <widget class="QWidget" name="widget" native="true">
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <widget class="QPushButton" name="defineBtn">
+       <widget class="QPushButton" name="addBtn">
         <property name="text">
-         <string>Define</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="wordsBtn">
-        <property name="text">
-         <string>Words</string>
+         <string>Add Word</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QPushButton" name="showBtn">
         <property name="text">
-         <string>Show</string>
+         <string>Definition</string>
         </property>
        </widget>
       </item>
@@ -85,17 +78,38 @@
         </property>
        </spacer>
       </item>
+      <item>
+       <widget class="QPushButton" name="scrollBtn">
+        <property name="text">
+         <string>Scroll</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="nextParaBtn">
+        <property name="text">
+         <string>Next Para</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="prevParaBtn">
+        <property name="text">
+         <string>Prev Para</string>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QPushButton" name="nextBtn">
         <property name="text">
-         <string>Next</string>
+         <string>Next Sect</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QPushButton" name="prevBtn">
         <property name="text">
-         <string>Previous</string>
+         <string>Prev. Sect</string>
         </property>
        </widget>
       </item>
diff --git a/ui/MainWindow.py b/ui/MainWindow.py
index 4ca2a6d..a4c53bf 100644
--- a/ui/MainWindow.py
+++ b/ui/MainWindow.py
@@ -25,11 +25,12 @@ class Ui_MainWindow(object):
         self.verticalLayout = QtWidgets.QVBoxLayout(self.widget)
         self.verticalLayout.setObjectName("verticalLayout")
         self.WordButton = QtWidgets.QPushButton(parent=self.widget)
+        self.WordButton.setEnabled(False)
         self.WordButton.setObjectName("WordButton")
         self.verticalLayout.addWidget(self.WordButton)
-        self.ReadButton = QtWidgets.QPushButton(parent=self.widget)
-        self.ReadButton.setObjectName("ReadButton")
-        self.verticalLayout.addWidget(self.ReadButton)
+        self.toggleBtn = QtWidgets.QPushButton(parent=self.widget)
+        self.toggleBtn.setObjectName("toggleBtn")
+        self.verticalLayout.addWidget(self.toggleBtn)
         spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
         self.verticalLayout.addItem(spacerItem)
         self.bookBtn = QtWidgets.QPushButton(parent=self.widget)
@@ -61,7 +62,7 @@ class Ui_MainWindow(object):
         _translate = QtCore.QCoreApplication.translate
         MainWindow.setWindowTitle(_translate("MainWindow", "Reading Helper"))
         self.WordButton.setText(_translate("MainWindow", "Words"))
-        self.ReadButton.setText(_translate("MainWindow", "Read"))
+        self.toggleBtn.setText(_translate("MainWindow", "Enable"))
         self.bookBtn.setText(_translate("MainWindow", "Add Book"))
         self.menuFile.setTitle(_translate("MainWindow", "File"))
         self.menuBooks.setTitle(_translate("MainWindow", "Books"))
diff --git a/ui/MainWindow.ui b/ui/MainWindow.ui
index b999766..a099c0d 100644
--- a/ui/MainWindow.ui
+++ b/ui/MainWindow.ui
@@ -23,15 +23,18 @@
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
         <widget class="QPushButton" name="WordButton">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
          <property name="text">
           <string>Words</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QPushButton" name="ReadButton">
+        <widget class="QPushButton" name="toggleBtn">
          <property name="text">
-          <string>Read</string>
+          <string>Enable</string>
          </property>
         </widget>
        </item>