Fix rename editor location

model/placesmodel.cpp

@@ -83,7 +83,7 @@ PlacesModel::PlacesModel(QObject *parent)
         m_items.append(item);
     }
 
-    PlacesItem *trashItem = new PlacesItem(tr("Trash"), QUrl(QStringLiteral("trash:/")));
+    PlacesItem *trashItem = new PlacesItem(tr("Trash"), QUrl(QStringLiteral("trash:///")));
     trashItem->setIconPath("user-trash.svg");
     m_items.append(trashItem);
 

qml/Dialogs/CreateFolderDialog.qml

@@ -31,7 +31,7 @@ Window {
     visible: true
 
     width: 400 + FishUI.Units.largeSpacing * 2
-    height: _mainLayout.implicitHeight + FishUI.Units.largeSpacing * 2
+    height: _mainLayout.implicitHeight + FishUI.Units.largeSpacing
 
     minimumWidth: width
     minimumHeight: height
@@ -48,7 +48,8 @@ Window {
         anchors.fill: parent
         anchors.leftMargin: FishUI.Units.largeSpacing
         anchors.rightMargin: FishUI.Units.largeSpacing
-        spacing: 0
+        anchors.bottomMargin: FishUI.Units.largeSpacing
+        spacing: FishUI.Units.largeSpacing
 
         TextField {
             id: _textField

qml/Dialogs/EmptyTrashDialog.qml

@@ -32,7 +32,7 @@ Window {
     visible: true
 
     width: 300 + FishUI.Units.largeSpacing * 2
-    height: _mainLayout.implicitHeight + FishUI.Units.largeSpacing * 3
+    height: _mainLayout.implicitHeight + FishUI.Units.largeSpacing * 2
 
     minimumWidth: width
     minimumHeight: height

qml/FolderGridView.qml

@@ -147,7 +147,9 @@ GridView {
     highlightMoveDuration: 0
     keyNavigationEnabled : true
     keyNavigationWraps : true
-    Keys.onPressed: {        
+    Keys.onPressed: {
+        control.keyPress(event)
+
         if (event.key === Qt.Key_Control) {
             ctrlPressed = true
         } else if (event.key === Qt.Key_Shift) {
@@ -160,8 +162,6 @@ GridView {
         } else if (event.key === Qt.Key_Minus && event.modifiers & Qt.ControlModifier) {
             control.decreaseIconSize()
         }
-
-        control.keyPress(event)
     }
     Keys.onReleased: {
         if (event.key === Qt.Key_Control) {
@@ -625,7 +625,6 @@ GridView {
                     width = targetItem.width - FishUI.Units.smallSpacing
                     height = targetItem.labelArea.paintedHeight + FishUI.Units.largeSpacing * 2
                     x = targetItem.x + Math.abs(Math.min(control.contentX, control.originX))
-                    x = targetItem.x + (targetItem.width - _editor.width)
                     y = pos.y - FishUI.Units.largeSpacing
                     text = targetItem.labelArea.text
                     targetItem.labelArea.visible = false

qml/FolderListView.qml

@@ -96,6 +96,8 @@ ListView {
     highlightMoveDuration: 0
     Keys.enabled: true
     Keys.onPressed: {
+        control.keyPress(event)
+
         if (event.key === Qt.Key_Control) {
             ctrlPressed = true
         } else if (event.key === Qt.Key_Shift) {
@@ -104,8 +106,6 @@ ListView {
             if (currentIndex != -1)
                 anchorIndex = currentIndex
         }
-
-        control.keyPress(event)
     }
 
     Keys.onReleased: {

translations/zh_CN.ts

@@ -6,12 +6,12 @@
     <message>
         <location filename="../qml/Dialogs/CreateFolderDialog.qml" line="29"/>
         <source>New folder name</source>
-        <translation>新文件夹名</translation>
+        <translation>新建文件夹名称</translation>
     </message>
     <message>
         <location filename="../qml/Dialogs/CreateFolderDialog.qml" line="57"/>
         <source>New folder</source>
-        <translation>新文件夹</translation>
+        <translation>新建文件夹</translation>
     </message>
     <message>
         <location filename="../qml/Dialogs/CreateFolderDialog.qml" line="72"/>