ff-qtah: Align start/end

Author: cblp

ff-qtah/FF/Qt/DateComponent.hs

@@ -1,41 +1,24 @@
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE ViewPatterns #-}
 
-module FF.Qt.DateComponent (DateComponent (super), new, setDate) where
+module FF.Qt.DateComponent (DateComponent (..), new, setDate) where
 
 import Data.Time (Day, toGregorian)
 import Graphics.UI.Qtah.Core.QDate qualified as QDate
 import Graphics.UI.Qtah.Widgets.QAbstractSpinBox qualified as QAbstractSpinBox
-import Graphics.UI.Qtah.Widgets.QBoxLayout qualified as QBoxLayout
 import Graphics.UI.Qtah.Widgets.QDateEdit (QDateEdit)
 import Graphics.UI.Qtah.Widgets.QDateEdit qualified as QDateEdit
 import Graphics.UI.Qtah.Widgets.QDateTimeEdit qualified as QDateTimeEdit
-import Graphics.UI.Qtah.Widgets.QHBoxLayout (QHBoxLayout)
-import Graphics.UI.Qtah.Widgets.QHBoxLayout qualified as QHBoxLayout
-import Graphics.UI.Qtah.Widgets.QLabel (QLabel)
-import Graphics.UI.Qtah.Widgets.QLabel qualified as QLabel
 
-data DateComponent = DateComponent
-    { super :: QHBoxLayout
-    , label :: QLabel
-    , dateEdit :: QDateEdit
-    }
-
-new :: String -> IO DateComponent
-new title = do
-    super <- QHBoxLayout.new
-
-    label <- QLabel.newWithText title
-    QBoxLayout.addWidget super label
+newtype DateComponent = DateComponent {dateEdit :: QDateEdit}
 
+new :: IO DateComponent
+new = do
     dateEdit <- QDateEdit.new
     QDateTimeEdit.setCalendarPopup dateEdit True
     QDateTimeEdit.setDisplayFormat dateEdit "ddd d MMM yyyy"
-    QBoxLayout.addWidget super dateEdit
-
-    QBoxLayout.addStretch super
 
-    let this = DateComponent{super, label, dateEdit}
+    let this = DateComponent{dateEdit}
     setEditable this False
     pure this
 

ff-qtah/FF/Qt/TaskWidget.hs

@@ -10,7 +10,7 @@ module FF.Qt.TaskWidget (
 -- global
 import Foreign.Hoppy.Runtime (toGc)
 import Graphics.UI.Qtah.Core.Types (QtAlignmentFlag (AlignTop))
-import Graphics.UI.Qtah.Widgets.QBoxLayout qualified as QBoxLayout
+import Graphics.UI.Qtah.Widgets.QFormLayout qualified as QFormLayout
 import Graphics.UI.Qtah.Widgets.QFrame (QFrame)
 import Graphics.UI.Qtah.Widgets.QFrame qualified as QFrame
 import Graphics.UI.Qtah.Widgets.QLabel (QLabel)
@@ -19,7 +19,6 @@ import Graphics.UI.Qtah.Widgets.QScrollArea (QScrollArea)
 import Graphics.UI.Qtah.Widgets.QScrollArea qualified as QScrollArea
 import Graphics.UI.Qtah.Widgets.QSizePolicy (QSizePolicy, QSizePolicyPolicy)
 import Graphics.UI.Qtah.Widgets.QSizePolicy qualified as QSizePolicy
-import Graphics.UI.Qtah.Widgets.QVBoxLayout qualified as QVBoxLayout
 import Graphics.UI.Qtah.Widgets.QWidget qualified as QWidget
 import RON.Storage.FS (runStorage)
 import RON.Storage.FS qualified as Storage
@@ -42,7 +41,7 @@ data TaskWidget = TaskWidget
     { super :: QScrollArea
     , frame :: QFrame
     -- ^ widget inside the scroll area
-    , textLabel :: QLabel
+    , textContent :: QLabel
     -- ^ label for the text
     , storage :: Storage.Handle
     , start :: DateComponent
@@ -56,28 +55,28 @@ new storage = do
     frame <- QFrame.new
     QScrollArea.setWidget super frame
 
-    textLabel <- QLabel.new
-    QWidget.setSizePolicy textLabel
+    textContent <- QLabel.new
+    QWidget.setSizePolicy textContent
         =<< makeSimpleSizePolicy QSizePolicy.MinimumExpanding
-    QLabel.setAlignment textLabel AlignTop
-    QLabel.setWordWrap textLabel True
+    QLabel.setAlignment textContent AlignTop
+    QLabel.setWordWrap textContent True
 
-    start <- DateComponent.new "Start:"
-    end <- DateComponent.new "Deadline:"
+    start <- DateComponent.new
+    end <- DateComponent.new
 
-    box <- QVBoxLayout.newWithParent frame
-    QBoxLayout.addWidget box textLabel
-    QBoxLayout.addLayout box start.super
-    QBoxLayout.addLayout box end.super
+    form <- QFormLayout.newWithParent frame
+    QFormLayout.addRowWidget form textContent
+    QFormLayout.addRowStringWidget form "Start:" start.dateEdit
+    QFormLayout.addRowStringWidget form "Deadline:" end.dateEdit
 
-    pure TaskWidget{super, frame, textLabel, storage, start, end}
+    pure TaskWidget{super, frame, textContent, storage, start, end}
 
 update :: TaskWidget -> NoteId -> IO ()
 update this noteId = do
     Entity{entityVal} <- runStorage this.storage $ loadNote noteId >>= viewNote
     let NoteView{note} = entityVal
     let Note{note_text, note_start, note_end} = note
-    QLabel.setText this.textLabel $ fromRgaM note_text
+    QLabel.setText this.textContent $ fromRgaM note_text
     DateComponent.setDate this.start note_start
     DateComponent.setDate this.end note_end
     QWidget.adjustSize this.frame