From 6f0450ec1c25b0536055946d18c30fc59458c159 Mon Sep 17 00:00:00 2001 From: Zlatin Balevsky Date: Thu, 7 Apr 2022 12:36:14 +0100 Subject: [PATCH] center all frames correctly relative to main frame. GitHub issues #130 and #133 --- .../views/com/muwire/gui/ChatMonitorView.groovy | 7 +++++-- .../views/com/muwire/gui/CollectionWizardView.groovy | 9 ++++++--- .../views/com/muwire/gui/NewMessageView.groovy | 7 +++++-- .../views/com/muwire/gui/chat/ChatFavoritesView.groovy | 5 ++++- .../gui/resultdetails/ResultDetailsFrameView.groovy | 5 ++++- 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/gui/griffon-app/views/com/muwire/gui/ChatMonitorView.groovy b/gui/griffon-app/views/com/muwire/gui/ChatMonitorView.groovy index 708db78a..22205b98 100644 --- a/gui/griffon-app/views/com/muwire/gui/ChatMonitorView.groovy +++ b/gui/griffon-app/views/com/muwire/gui/ChatMonitorView.groovy @@ -22,13 +22,15 @@ class ChatMonitorView { @MVCMember @Nonnull ChatMonitorModel model - def window + JFrame window def roomsTable + def mainFrame void initUI() { int rowHeight = application.context.getAsInt("row-height") + mainFrame = application.windowManager.findWindow("main-frame") - window = builder.frame (visible : false, locationRelativeTo : null, + window = builder.frame (visible : false, locationRelativeTo : mainFrame, defaultCloseOperation : JFrame.DISPOSE_ON_CLOSE, iconImage : builder.imageIcon("/MuWire-48x48.png").image, preferredSize: [800,800]){ @@ -62,6 +64,7 @@ class ChatMonitorView { } }) window.pack() + window.setLocationRelativeTo(mainFrame) window.setVisible(true) } } \ No newline at end of file diff --git a/gui/griffon-app/views/com/muwire/gui/CollectionWizardView.groovy b/gui/griffon-app/views/com/muwire/gui/CollectionWizardView.groovy index b6693c4a..da921cbb 100644 --- a/gui/griffon-app/views/com/muwire/gui/CollectionWizardView.groovy +++ b/gui/griffon-app/views/com/muwire/gui/CollectionWizardView.groovy @@ -36,7 +36,7 @@ class CollectionWizardView { @MVCMember @Nonnull CollectionWizardModel model - def window + JFrame window JPanel mainPanel def nameTextField @@ -45,11 +45,13 @@ class CollectionWizardView { def lastFilesTableSortEvent JTree jTree + def mainFrame + void initUI() { - + mainFrame = application.windowManager.findWindow("main-frame") int rowHeight = application.context.get("row-height") - window = builder.frame(visible: false, locationRelativeTo : null, + window = builder.frame(visible: false, locationRelativeTo : mainFrame, defaultCloseOperation : JFrame.DISPOSE_ON_CLOSE, iconImage : builder.imageIcon("/MuWire-48x48.png").image, preferredSize: [800,800]){ @@ -163,6 +165,7 @@ class CollectionWizardView { } }) window.pack() + window.setLocationRelativeTo(mainFrame) window.setVisible(true) } diff --git a/gui/griffon-app/views/com/muwire/gui/NewMessageView.groovy b/gui/griffon-app/views/com/muwire/gui/NewMessageView.groovy index a4b97021..0b9b6e45 100644 --- a/gui/griffon-app/views/com/muwire/gui/NewMessageView.groovy +++ b/gui/griffon-app/views/com/muwire/gui/NewMessageView.groovy @@ -47,15 +47,17 @@ class NewMessageView { @MVCMember @Nonnull NewMessageModel model - def window + JFrame window DefaultListModel recipientsModel JList recipientsList JTextField subjectField JTextArea bodyArea JTable attachmentsTable def lastAttachmentsTableSortEvent + def mainFrame void initUI() { + mainFrame = application.windowManager.findWindow("main-frame") int rowHeight = application.context.get("row-height") recipientsModel = new DefaultListModel() @@ -64,7 +66,7 @@ class NewMessageView { } recipientsList = new JList(recipientsModel) - window = builder.frame(visible : false, locationRelativeTo : null, + window = builder.frame(visible : false, locationRelativeTo : mainFrame, defaultCloseOperation : JFrame.DISPOSE_ON_CLOSE, iconImage : builder.imageIcon("/MuWire-48x48.png").image, preferredSize: [800, 800]){ @@ -174,6 +176,7 @@ class NewMessageView { } }) window.pack() + window.setLocationRelativeTo(mainFrame) window.setVisible(true) } diff --git a/gui/griffon-app/views/com/muwire/gui/chat/ChatFavoritesView.groovy b/gui/griffon-app/views/com/muwire/gui/chat/ChatFavoritesView.groovy index 41c126ab..0694be3a 100644 --- a/gui/griffon-app/views/com/muwire/gui/chat/ChatFavoritesView.groovy +++ b/gui/griffon-app/views/com/muwire/gui/chat/ChatFavoritesView.groovy @@ -28,8 +28,10 @@ class ChatFavoritesView { JFrame window private JTable favoritesTable + def mainFrame + void initUI() { - def mainFrame = application.windowManager.findWindow("main-frame") + mainFrame = application.windowManager.findWindow("main-frame") int rowHeight = application.context.get("row-height") window = builder.frame(visible : false, locationRelativeTo: mainFrame, @@ -89,6 +91,7 @@ class ChatFavoritesView { } }) window.pack() + window.setLocationRelativeTo(mainFrame) window.setVisible(true) } diff --git a/gui/griffon-app/views/com/muwire/gui/resultdetails/ResultDetailsFrameView.groovy b/gui/griffon-app/views/com/muwire/gui/resultdetails/ResultDetailsFrameView.groovy index b9dc84a5..e8f740bb 100644 --- a/gui/griffon-app/views/com/muwire/gui/resultdetails/ResultDetailsFrameView.groovy +++ b/gui/griffon-app/views/com/muwire/gui/resultdetails/ResultDetailsFrameView.groovy @@ -38,8 +38,10 @@ class ResultDetailsFrameView { def certificatesGroup, collectionsGroup + def mainFrame + void initUI() { - def mainFrame = application.windowManager.findWindow("main-frame") + mainFrame = application.windowManager.findWindow("main-frame") int rowHeight = application.context.get("row-height") int frameHeight = 150 @@ -140,6 +142,7 @@ class ResultDetailsFrameView { } }) window.pack() + window.setLocationRelativeTo(mainFrame) window.setVisible(true) }