Merge branch 'Htylol-added-lastlaunch' into devel

data_from_portwine/locales/PortProton.pot

@@ -7,13 +7,13 @@
 msgid   ""
 msgstr  "Project-Id-Version: PACKAGE VERSION\n"
         "Report-Msgid-Bugs-To: \n"
-        "POT-Creation-Date: 2025-03-02 01:22+0500\n"
+        "POT-Creation-Date: 2025-03-06 03:47+0500\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
         "Language-Team: LANGUAGE <LL@li.org>\n"
         "Language: \n"
         "MIME-Version: 1.0\n"
-        "Content-Type: text/plain; charset=UTF-8\n"
+        "Content-Type: text/plain; charset=CHARSET\n"
         "Content-Transfer-Encoding: 8bit\n"
 
 msgid   "A running PortProton session was detected.\\nDo you want to end the "
@@ -1293,12 +1293,6 @@ msgstr  ""
 msgid   "Change settings gamescope for"
 msgstr  ""
 
-msgid   "<b>Gamescope is not detected on the system, to install it, run the "
-        "command in the terminal:\\nflatpak install -y runtime/org."
-        "freedesktop.Platform.VulkanLayer.gamescope/x86_64/$"
-        "%{GAMESCOPE_VERSION}%\\n(Can be selected and copied)</b>"
-msgstr  ""
-
 msgid   "<b>Gamescope is not detected on the system, please contact the "
         "manufacturer of your distribution\\nor search the Internet for "
         "information on how to install gamescope on your system.</b>"
@@ -1421,6 +1415,12 @@ msgstr  ""
 msgid   "Show in days, hours, minutes"
 msgstr  ""
 
+msgid   "According to last launch"
+msgstr  ""
+
+msgid   "By time"
+msgstr  ""
+
 msgid   "Recommended value"
 msgstr  ""
 
@@ -1476,11 +1476,10 @@ msgstr  ""
 msgid   "Displays time spent in an application or game"
 msgstr  ""
 
-msgid   "Sort shortcuts by time"
+msgid   "Sort shortcuts by"
 msgstr  ""
 
-msgid   "This setting sorts the shortcuts in the main menu depending on the "
-        "time spent in the application or game"
+msgid   "This setting sorts the shortcuts in the main menu"
 msgstr  ""
 
 msgid   "GLOBAL SETTINGS (USER.CONF)"
@@ -1628,14 +1627,6 @@ msgstr  ""
 msgid   "SAVE"
 msgstr  ""
 
-#, sh-format
-msgid   "PortProton v. ${install_ver}\n"
-        "scripts v. ${scripts_install_ver}"
-msgstr  ""
-
-msgid   "Copyright © $%DATE% Castro-Fidel (linux-gaming.ru)"
-msgstr  ""
-
 msgid   "This program comes with absolutely no warranty.\n"
         "See the License for details."
 msgstr  ""

data_from_portwine/locales/es/LC_MESSAGES/PortProton.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-03-02 01:22+0500\n"
+"POT-Creation-Date: 2025-03-05 23:40+0500\n"
 "PO-Revision-Date: 2024-11-13 08:18+0500\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -1680,17 +1680,6 @@ msgid "Change settings gamescope for"
 msgstr "Cambiar ajustes gamescope para"
 
 msgid ""
-"<b>Gamescope is not detected on the system, to install it, run the command "
-"in the terminal:\\nflatpak install -y runtime/org.freedesktop.Platform."
-"VulkanLayer.gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n(Can be selected and "
-"copied)</b>"
-msgstr ""
-"<b>Gamescope no se detecta en el sistema, para instalarlo, ejecute el "
-"comando en el terminal:\\n flatpak install -y runtime/org.freedesktop."
-"Platform.VulkanLayer.gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n (Se puede "
-"seleccionar y copiar)</b>"
-
-msgid ""
 "<b>Gamescope is not detected on the system, please contact the manufacturer "
 "of your distribution\\nor search the Internet for information on how to "
 "install gamescope on your system.</b>"
@@ -1850,6 +1839,13 @@ msgstr ""
 msgid "Show in days, hours, minutes"
 msgstr ""
 
+msgid "According to last launch"
+msgstr ""
+
+#, fuzzy
+msgid "By time"
+msgstr "Mostrar tiempo"
+
 msgid "Recommended value"
 msgstr ""
 
@@ -1908,12 +1904,12 @@ msgstr "Mostrar tiempo"
 msgid "Displays time spent in an application or game"
 msgstr "Muestra el tiempo transcurrido en una aplicación o juego"
 
-msgid "Sort shortcuts by time"
+#, fuzzy
+msgid "Sort shortcuts by"
 msgstr "Ordenar accesos directos por tiempo"
 
-msgid ""
-"This setting sorts the shortcuts in the main menu depending on the time "
-"spent in the application or game"
+#, fuzzy
+msgid "This setting sorts the shortcuts in the main menu"
 msgstr ""
 "Esta configuración ordena los accesos directos en el menú principal según el "
 "tiempo transcurrido en la aplicación o juego"
@@ -2079,17 +2075,6 @@ msgstr "ATRÁS"
 msgid "SAVE"
 msgstr "AHORRAR"
 
-#, sh-format
-msgid ""
-"PortProton v. ${install_ver}\n"
-"scripts v. ${scripts_install_ver}"
-msgstr ""
-"PortProton v. ${install_ver}\n"
-"scripts v. ${scripts_install_ver}"
-
-msgid "Copyright © $%DATE% Castro-Fidel (linux-gaming.ru)"
-msgstr "Copyright © $%DATE% Castro-Fidel (linux-gaming.ru)"
-
 msgid ""
 "This program comes with absolutely no warranty.\n"
 "See the License for details."
@@ -2194,6 +2179,28 @@ msgstr "Restarting STEAM... Please wait."
 msgid "Please wait. downloading covers for"
 msgstr "Por favor, espera. Descargando portadas para"
 
+#~ msgid ""
+#~ "<b>Gamescope is not detected on the system, to install it, run the "
+#~ "command in the terminal:\\nflatpak install -y runtime/org.freedesktop."
+#~ "Platform.VulkanLayer.gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n(Can be "
+#~ "selected and copied)</b>"
+#~ msgstr ""
+#~ "<b>Gamescope no se detecta en el sistema, para instalarlo, ejecute el "
+#~ "comando en el terminal:\\n flatpak install -y runtime/org.freedesktop."
+#~ "Platform.VulkanLayer.gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n (Se puede "
+#~ "seleccionar y copiar)</b>"
+
+#, sh-format
+#~ msgid ""
+#~ "PortProton v. ${install_ver}\n"
+#~ "scripts v. ${scripts_install_ver}"
+#~ msgstr ""
+#~ "PortProton v. ${install_ver}\n"
+#~ "scripts v. ${scripts_install_ver}"
+
+#~ msgid "Copyright © $%DATE% Castro-Fidel (linux-gaming.ru)"
+#~ msgstr "Copyright © $%DATE% Castro-Fidel (linux-gaming.ru)"
+
 #~ msgid "Change the version of WINDOWS 10 to WINDOWS 7 in the prefix"
 #~ msgstr "Cambiar la versión de Windows 10 a Windows 7 en el prefijo"
 

data_from_portwine/locales/ru/LC_MESSAGES/PortProton.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-03-02 01:22+0500\n"
-"PO-Revision-Date: 2025-03-02 01:22+0500\n"
+"POT-Creation-Date: 2025-03-05 23:40+0500\n"
+"PO-Revision-Date: 2025-03-06 03:43+0500\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ru_RU\n"
@@ -1669,17 +1669,6 @@ msgid "Change settings gamescope for"
 msgstr "Изменить настройки Gamescope для"
 
 msgid ""
-"<b>Gamescope is not detected on the system, to install it, run the command "
-"in the terminal:\\nflatpak install -y runtime/org.freedesktop.Platform."
-"VulkanLayer.gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n(Can be selected and "
-"copied)</b>"
-msgstr ""
-"<b>Gamescope не найден в системе, для его установки выполните команду в "
-"терминале:\\nflatpak install -y runtime/org.freedesktop.Platform.VulkanLayer."
-"gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n(Данный текст можно выделить и "
-"скопировать)</b>"
-
-msgid ""
 "<b>Gamescope is not detected on the system, please contact the manufacturer "
 "of your distribution\\nor search the Internet for information on how to "
 "install gamescope on your system.</b>"
@@ -1838,6 +1827,12 @@ msgstr "Отображать в часах и минутах"
 msgid "Show in days, hours, minutes"
 msgstr "Отображать в днях, часах и минутах"
 
+msgid "According to last launch"
+msgstr "По данным последнего запуска"
+
+msgid "By time"
+msgstr "По проведённому времени"
+
 msgid "Recommended value"
 msgstr "Рекомендуемое значение"
 
@@ -1896,15 +1891,11 @@ msgstr "Отображение времени"
 msgid "Displays time spent in an application or game"
 msgstr "Отображает общее время проведённое в приложении или игре"
 
-msgid "Sort shortcuts by time"
-msgstr "Сортировка ярлыков по времени"
+msgid "Sort shortcuts by"
+msgstr "Сортировка ярлыков по"
 
-msgid ""
-"This setting sorts the shortcuts in the main menu depending on the time "
-"spent in the application or game"
-msgstr ""
-"Эта настройка сортирует ярлыки в главном меню в зависимости от времени, "
-"проведенного в приложении или игре"
+msgid "This setting sorts the shortcuts in the main menu"
+msgstr "Эта настройка сортирует ярлыки в главном меню"
 
 msgid "GLOBAL SETTINGS (USER.CONF)"
 msgstr "ГЛОБАЛЬНЫЕ НАСТРОЙКИ (USER.CONF)"
@@ -2066,17 +2057,6 @@ msgstr "НАЗАД"
 msgid "SAVE"
 msgstr "СОХРАНИТЬ"
 
-#, sh-format
-msgid ""
-"PortProton v. ${install_ver}\n"
-"scripts v. ${scripts_install_ver}"
-msgstr ""
-"PortProton v. ${install_ver}\n"
-"версия v. ${scripts_install_ver}"
-
-msgid "Copyright © $%DATE% Castro-Fidel (linux-gaming.ru)"
-msgstr "Авторские права © $%DATE% Castro-Fidel (linux-gaming.ru)"
-
 msgid ""
 "This program comes with absolutely no warranty.\n"
 "See the License for details."
@@ -2181,6 +2161,28 @@ msgstr "Перезапускаем STEAM... Пожалуйста, подожди
 msgid "Please wait. downloading covers for"
 msgstr "Пожалуйста, подождите. Загрузка обложек для"
 
+#~ msgid ""
+#~ "<b>Gamescope is not detected on the system, to install it, run the "
+#~ "command in the terminal:\\nflatpak install -y runtime/org.freedesktop."
+#~ "Platform.VulkanLayer.gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n(Can be "
+#~ "selected and copied)</b>"
+#~ msgstr ""
+#~ "<b>Gamescope не найден в системе, для его установки выполните команду в "
+#~ "терминале:\\nflatpak install -y runtime/org.freedesktop.Platform."
+#~ "VulkanLayer.gamescope/x86_64/$%{GAMESCOPE_VERSION}%\\n(Данный текст можно "
+#~ "выделить и скопировать)</b>"
+
+#, sh-format
+#~ msgid ""
+#~ "PortProton v. ${install_ver}\n"
+#~ "scripts v. ${scripts_install_ver}"
+#~ msgstr ""
+#~ "PortProton v. ${install_ver}\n"
+#~ "версия v. ${scripts_install_ver}"
+
+#~ msgid "Copyright © $%DATE% Castro-Fidel (linux-gaming.ru)"
+#~ msgstr "Авторские права © $%DATE% Castro-Fidel (linux-gaming.ru)"
+
 #~ msgid "WineD3D Vulkan (Damavand experimental)"
 #~ msgstr "WineD3D Vulkan (Damavand - экспериментальный)"
 

data_from_portwine/scripts/start.sh

@@ -270,11 +270,21 @@ if [[ -z $DESKTOP_WITH_TIME ]] ; then
     export DESKTOP_WITH_TIME="posnumber1"
 fi
 
-# TODO:fixes_after_update
+# SORT_WITH_TIME by default sorts from the last run
+if [[ -z $SORT_WITH_TIME ]] ; then
+    echo 'export SORT_WITH_TIME="lastlaunch"' >> "$USER_CONF"
+    export SORT_WITH_TIME="lastlaunch"
+fi
+
+# TODO:fixes_after_update (со временем можно будет дропнуть)
 if fixes_after_update "2395: DESKTOP_WITH_TIME by default displays hours and minutes" ; then
     DESKTOP_WITH_TIME="posnumber1"
     edit_user_conf_from_gui DESKTOP_WITH_TIME
 fi
+if fixes_after_update "2398: SORT_WITH_TIME by default sorts from the last run" ; then
+    SORT_WITH_TIME="lastlaunch"
+    edit_user_conf_from_gui SORT_WITH_TIME
+fi
 
 # choose wine dpi default
 if [[ -z $PW_WINE_DPI_VALUE ]] ; then
@@ -645,7 +655,7 @@ else
     fi
 
     unset PW_NAME_D_ICON PW_ICON_PATH PW_GAME_TIME PW_ALL_DF PW_AMOUNT_NEW_DESKTOP 
-    unset PW_DESKTOP_FILES_REGEX PW_AMOUNT_OLD_DESKTOP PW_DESKTOP_FILES
+    unset PW_DESKTOP_FILES_REGEX PW_AMOUNT_OLD_DESKTOP PW_DESKTOP_FILES PW_LAST_LAUNCH
     # Поиск .desktop файлов
     AMOUNT_GENERATE_BUTTONS="0"
     for desktop_file in "$PORT_WINE_PATH"/* ; do
@@ -679,13 +689,17 @@ else
                 fi
                 while read -r -a line2 ; do
                     if [[ \"${line2[0]//#@_@#/ }\" == "${PW_NAME_D_ICON["$AMOUNT_GENERATE_BUTTONS"]}" ]] ; then
-                        PW_GAME_TIME["$AMOUNT_GENERATE_BUTTONS"]=${line2[2]}
+                        [[ $SORT_WITH_TIME == "bytime" ]] && PW_GAME_TIME["$AMOUNT_GENERATE_BUTTONS"]=${line2[2]}
+                        if [[ $SORT_WITH_TIME == "lastlaunch" ]] ; then
+                            [[ -n ${line2[5]} ]] && PW_LAST_LAUNCH["$AMOUNT_GENERATE_BUTTONS"]=${line2[5]//L5-/}
+                        fi
                         break
                     else
-                        PW_GAME_TIME["$AMOUNT_GENERATE_BUTTONS"]=0
+                        [[ $SORT_WITH_TIME == "bytime" ]] && PW_GAME_TIME["$AMOUNT_GENERATE_BUTTONS"]=0
+                        [[ $SORT_WITH_TIME == "lastlaunch" ]] && PW_LAST_LAUNCH["$AMOUNT_GENERATE_BUTTONS"]=0
                     fi
                 done < "$PORT_WINE_TMP_PATH/statistics"
-                if [[ $SORT_WITH_TIME == enabled ]] && [[ ${line2[3]} == NEW_DESKTOP ]] ; then
+                if [[ $SORT_WITH_TIME != "disabled" ]] && [[ ${line2[3]} == "NEW_DESKTOP" ]] ; then
                     sed -i "s/${line2[1]} ${line2[2]} NEW_DESKTOP/${line2[1]} ${line2[2]} OLD_DESKTOP/" "$PORT_WINE_TMP_PATH/statistics"
                     PW_AMOUNT_NEW_DESKTOP+=("$AMOUNT_GENERATE_BUTTONS")
                 else
@@ -696,7 +710,7 @@ else
         fi
     done
     # Переопределение элементов в массивах в зависимости от PW_GAME_TIME, от большего значения к меньшему.
-    if [[ $SORT_WITH_TIME == enabled ]] && [[ -n ${PW_GAME_TIME[1]} ]] ; then
+    if [[ $SORT_WITH_TIME == "bytime" ]] && [[ -n ${PW_GAME_TIME[1]} ]] ; then
         for i in "${PW_AMOUNT_OLD_DESKTOP[@]}" ; do
             for j in "${PW_AMOUNT_OLD_DESKTOP[@]}" ; do
                 if (( ${PW_GAME_TIME[$i]} > ${PW_GAME_TIME[$j]} )) ; then
@@ -718,6 +732,29 @@ else
             done
         done
     fi
+    # Переопределение элементов в массивах в зависимости от того, какое приложение в последний раз использовалось
+    if [[ $SORT_WITH_TIME == "lastlaunch" ]] && [[ -n ${PW_LAST_LAUNCH[1]} ]] ; then
+        for i in "${PW_AMOUNT_OLD_DESKTOP[@]}" ; do
+            for j in "${PW_AMOUNT_OLD_DESKTOP[@]}" ; do
+                if (( ${PW_LAST_LAUNCH[$i]} > ${PW_LAST_LAUNCH[$j]} )) ; then
+                    tmp_0=${PW_LAST_LAUNCH[$i]}
+                    tmp_1=${PW_ALL_DF[$i]}
+                    tmp_2=${PW_NAME_D_ICON[$i]}
+                    tmp_4=${PW_ICON_PATH[$i]}
+
+                    PW_LAST_LAUNCH[i]=${PW_LAST_LAUNCH[$j]}
+                    PW_ALL_DF[i]=${PW_ALL_DF[$j]}
+                    PW_NAME_D_ICON[i]=${PW_NAME_D_ICON[$j]}
+                    PW_ICON_PATH[i]=${PW_ICON_PATH[$j]}
+
+                    PW_LAST_LAUNCH[j]=$tmp_0
+                    PW_ALL_DF[j]=$tmp_1
+                    PW_NAME_D_ICON[j]=$tmp_2
+                    PW_ICON_PATH[j]=$tmp_4
+                fi
+            done
+        done
+    fi
     # Генерация .desktop баттанов для главного меню
     IFS=$'\n'
     PW_GENERATE_BUTTONS="--field=   ${translations[Create shortcut...]}!${PW_GUI_ICON_PATH}/find_48.svg!:FBTNR%@bash -c \"button_click --normal pw_find_exe\"%"