From 0111ed37ba5842c65b894af56893a653c377f237 Mon Sep 17 00:00:00 2001
From: David Given <dg@cowlark.com>
Date: Wed, 7 Sep 2022 00:18:24 +0200
Subject: [PATCH] UI tidying.

---
 src/gui/layout.cpp | 8 +++++++-
 src/gui/layout.fbp | 8 ++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/gui/layout.cpp b/src/gui/layout.cpp
index 258187b1..95d70d32 100644
--- a/src/gui/layout.cpp
+++ b/src/gui/layout.cpp
@@ -297,7 +297,7 @@ MainWindowGen::MainWindowGen( wxWindow* parent, wxWindowID id, const wxString& t
 	#endif
 	browserMoreMenu->Append( browserNewDirectoryMenuItem );
 
-	browserRenameMenuItem = new wxMenuItem( browserMoreMenu, wxID_ANY, wxString( wxT("Rename file") ) , wxEmptyString, wxITEM_NORMAL );
+	browserRenameMenuItem = new wxMenuItem( browserMoreMenu, wxID_ANY, wxString( wxT("Move file") ) , wxEmptyString, wxITEM_NORMAL );
 	#ifdef __WXMSW__
 	browserRenameMenuItem->SetBitmaps( wxNullBitmap );
 	#elif (defined( __WXGTK__ ) || defined( __WXOSX__ ))
@@ -655,6 +655,8 @@ GetfileDialog::GetfileDialog( wxWindow* parent, wxWindowID id, const wxString& t
 	gbSizer1->Add( m_staticText7, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 	filenameText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 300,-1 ), wxTE_READONLY );
+	filenameText->Enable( false );
+
 	gbSizer1->Add( filenameText, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND, 5 );
 
 	m_staticText9 = new wxStaticText( this, wxID_ANY, wxT("File to save as:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -710,6 +712,8 @@ FileConflictDialog::FileConflictDialog( wxWindow* parent, wxWindowID id, const w
 	gbSizer1->Add( m_staticText9, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 	oldNameText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
+	oldNameText->Enable( false );
+
 	gbSizer1->Add( oldNameText, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND, 5 );
 
 	m_sdbSizer6 = new wxStdDialogButtonSizer();
@@ -758,6 +762,8 @@ FileRenameDialog::FileRenameDialog( wxWindow* parent, wxWindowID id, const wxStr
 	gbSizer1->Add( m_staticText9, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 	oldNameText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
+	oldNameText->Enable( false );
+
 	gbSizer1->Add( oldNameText, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND, 5 );
 
 	m_sdbSizer6 = new wxStdDialogButtonSizer();
diff --git a/src/gui/layout.fbp b/src/gui/layout.fbp
index b2f1952c..61a9f755 100644
--- a/src/gui/layout.fbp
+++ b/src/gui/layout.fbp
@@ -2439,7 +2439,7 @@
                                                         <property name="help"></property>
                                                         <property name="id">wxID_ANY</property>
                                                         <property name="kind">wxITEM_NORMAL</property>
-                                                        <property name="label">Rename file</property>
+                                                        <property name="label">Move file</property>
                                                         <property name="name">browserRenameMenuItem</property>
                                                         <property name="permission">protected</property>
                                                         <property name="shortcut"></property>
@@ -3809,7 +3809,7 @@
                         <property name="dock_fixed">0</property>
                         <property name="docking">Left</property>
                         <property name="drag_accept_files">0</property>
-                        <property name="enabled">1</property>
+                        <property name="enabled">0</property>
                         <property name="fg"></property>
                         <property name="floatable">1</property>
                         <property name="font"></property>
@@ -4336,7 +4336,7 @@
                         <property name="dock_fixed">0</property>
                         <property name="docking">Left</property>
                         <property name="drag_accept_files">0</property>
-                        <property name="enabled">1</property>
+                        <property name="enabled">0</property>
                         <property name="fg"></property>
                         <property name="floatable">1</property>
                         <property name="font"></property>
@@ -4729,7 +4729,7 @@
                         <property name="dock_fixed">0</property>
                         <property name="docking">Left</property>
                         <property name="drag_accept_files">0</property>
-                        <property name="enabled">1</property>
+                        <property name="enabled">0</property>
                         <property name="fg"></property>
                         <property name="floatable">1</property>
                         <property name="font"></property>