Merge pull request #2597 from mitya57/issue2596

Rename desktop files, so that far2l.desktop is the WX version
elfmz · Dec 29, 2024 · b13a695 · b13a695
2 parents 1ccce00 + c2e3a76
commit b13a695
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/far2l/CMakeLists.txt b/far2l/CMakeLists.txt
@@ -281,19 +281,19 @@ add_custom_command(TARGET far2l POST_BUILD
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 #TODO
 else()
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/DE/far2l-tty.desktop" "${CMAKE_CURRENT_BINARY_DIR}/DE/far2l-tty.desktop")
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/DE/far2ledit-tty.desktop" "${CMAKE_CURRENT_BINARY_DIR}/DE/far2ledit-tty.desktop")
     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/DE/far2l.desktop" "${CMAKE_CURRENT_BINARY_DIR}/DE/far2l.desktop")
     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/DE/far2ledit.desktop" "${CMAKE_CURRENT_BINARY_DIR}/DE/far2ledit.desktop")
-    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/DE/far2l-wx.desktop" "${CMAKE_CURRENT_BINARY_DIR}/DE/far2l-wx.desktop")
-    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/DE/far2ledit-wx.desktop" "${CMAKE_CURRENT_BINARY_DIR}/DE/far2ledit-wx.desktop")
 
     install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/DE/icons" DESTINATION "share" USE_SOURCE_PERMISSIONS COMPONENT desktop FILES_MATCHING PATTERN "*")
 
 	# Have to make desktop files executable, see:
 	# https://wiki.ubuntu.com/SecurityTeam/Policies#Execute-Permission_Bit_Required
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/DE/far2l.desktop"
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/DE/far2l-tty.desktop"
+                  "${CMAKE_CURRENT_BINARY_DIR}/DE/far2ledit-tty.desktop"
+                  "${CMAKE_CURRENT_BINARY_DIR}/DE/far2l.desktop"
                   "${CMAKE_CURRENT_BINARY_DIR}/DE/far2ledit.desktop"
-                  "${CMAKE_CURRENT_BINARY_DIR}/DE/far2l-wx.desktop"
-                  "${CMAKE_CURRENT_BINARY_DIR}/DE/far2ledit-wx.desktop"
         DESTINATION "share/applications"
         COMPONENT desktop
         PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE)

diff --git a/far2l/DE/far2l-wx.desktop → far2l/DE/far2l-tty.desktop b/far2l/DE/far2l-wx.desktop → far2l/DE/far2l-tty.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Type=Application
-Name=far2l (WX GUI)
+Name=far2l (Terminal)
 GenericName=far2l
 Comment=File and archive manager
-Exec=far2l --notty
+Exec=far2l --tty
 TryExec=far2l
-Terminal=false
+Terminal=true
 Categories=Utility;FileManager;System;FileTools;
 Icon=far2l
 StartupNotify=true
diff --git a/far2l/DE/far2l.desktop b/far2l/DE/far2l.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Type=Application
-Name=far2l (Terminal)
+Name=far2l (WX GUI)
 GenericName=far2l
 Comment=File and archive manager
-Exec=far2l --tty
+Exec=far2l --notty
 TryExec=far2l
-Terminal=true
+Terminal=false
 Categories=Utility;FileManager;System;FileTools;
 Icon=far2l
 StartupNotify=true
diff --git a/far2l/DE/far2ledit-wx.desktop → far2l/DE/far2ledit-tty.desktop b/far2l/DE/far2ledit-wx.desktop → far2l/DE/far2ledit-tty.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Type=Application
-Name=Far2l Editor (WX GUI)
-Name[ru]=Редактор Far2l (WX GUI)
+Name=Far2l Editor (Terminal)
+Name[ru]=Редактор Far2l (Терминал)
 Comment=Edit text files
 Comment[ru]=Редактирование текстовых файлов
-Exec=far2ledit --notty %f
+Exec=far2ledit --tty %f
 TryExec=far2ledit
-Terminal=false
+Terminal=true
 MimeType=text/plain;
 Categories=Utility;TextEditor;
 Icon=far2ledit

diff --git a/far2l/DE/far2ledit.desktop b/far2l/DE/far2ledit.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Type=Application
-Name=Far2l Editor (Terminal)
-Name[ru]=Редактор Far2l (Терминал)
+Name=Far2l Editor (WX GUI)
+Name[ru]=Редактор Far2l (WX GUI)
 Comment=Edit text files
 Comment[ru]=Редактирование текстовых файлов
-Exec=far2ledit --tty %f
+Exec=far2ledit --notty %f
 TryExec=far2ledit
-Terminal=true
+Terminal=false
 MimeType=text/plain;
 Categories=Utility;TextEditor;
 Icon=far2ledit