Merge branch 'Boria138-auto-shortcuts' into devel

data_from_portwine/scripts/portwine_db/setup.ppdb

@@ -14,7 +14,3 @@ export PW_FORCE_LARGE_ADDRESS_AWARE=1          # Force Wine to enable the LARGE_
 export PW_DLL_INSTALL=""
 # export WINEDLLOVERRIDES="mscoree,mshtml="
 export PW_WINE_USE=WINE_LG
-
-add_in_stop_portwine () {
-    pw_find_exe news
-}

data_from_portwine/scripts/pw_autoinstall/PW_UBC

@@ -3,6 +3,7 @@
 ########################################################################
 export LAUNCH_PARAMETERS=("/S" "/D=c:\Program Files (x86)\Ubisoft Game Launcher")
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/UbisoftConnectInstaller.exe"
+export PORTWINE_CREATE_SHORTCUT_NAME="Ubisoft Connect"
 start_portwine
 if try_download "https://ubistatic3-a.akamaihd.net/orbit/launcher_installer/UbisoftConnectInstaller.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then

data_from_portwine/scripts/start.sh

@@ -87,7 +87,7 @@ unset CHK_SYMLINK_FILE PW_MESA_GL_VERSION_OVERRIDE PW_VKD3D_FEATURE_LEVEL PATH_T
 unset PW_PREFIX_NAME WINEPREFIX VULKAN_MOD PW_WINE_VER PW_ADD_TO_ARGS_IN_RUNTIME PW_GAMEMODERUN_SLR AMD_VULKAN_ICD PW_WINE_CPU_TOPOLOGY
 unset PW_NAME_D_NAME PW_NAME_D_ICON PW_NAME_D_EXEC PW_EXEC_FROM_DESKTOP PW_ALL_DF PW_GENERATE_BUTTONS PW_NAME_D_ICON PW_NAME_D_ICON_48
 unset MANGOHUD_CONFIG FPS_LIMIT PW_WINE_USE WINEDLLPATH WINE WINEDIR WINELOADER WINESERVER PW_USE_RUNTIME PORTWINE_CREATE_SHORTCUT_NAME MIRROR
-unset PW_LOCALE_SELECT PW_SETTINGS_INDICATION PW_GUI_START PW_AUTOINSTALL_EXE NOSTSTDIR
+unset PW_LOCALE_SELECT PW_SETTINGS_INDICATION PW_GUI_START PW_AUTOINSTALL_EXE NOSTSTDIR USE_DUPLICATE_GUI
 
 export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp"
 rm -f "$PORT_WINE_TMP_PATH"/*{exe,msi,tar}*
@@ -172,7 +172,7 @@ then
 else
     # shellcheck source=/dev/null
     source "$PW_GUI_THEMES_PATH/default.pptheme"
-echo 'export GUI_THEME="default"' >> "$USER_CONF"
+    echo 'export GUI_THEME="default"' >> "$USER_CONF"
 fi
 [[ "$XDG_SESSION_DESKTOP" == "KDE" ]] && export YAD_OPTIONS+="--center"
 
@@ -630,6 +630,9 @@ else
     else PW_GUI_SORT_TABS=(2 3 4 5 1)
     fi
     PW_GENERATE_BUTTONS="--field=   $(gettext "Create shortcut...")!${PW_GUI_ICON_PATH}/find_48.svg!:FBTN%@bash -c \"button_click pw_find_exe\"%"
+    if grep -i "[Desktop Entry]" "${PORT_WINE_PATH}/duplicate"/* &>/dev/null ; then
+        PW_GENERATE_BUTTONS+="--field=   $(gettext "Duplicates")!${PW_GUI_ICON_PATH}/duplicate.svg!:FBTN%@bash -c \"button_click pw_duplicate\"%"
+    fi
     for PW_DESKTOP_FILES in ${PW_ALL_DF} ; do
         PW_NAME_D_ICON="$(grep Icon "${PORT_WINE_PATH}/${PW_DESKTOP_FILES}" | awk -F= '{print $2}')"
         PW_NAME_D_ICON_48="${PW_NAME_D_ICON//".png"/"_48.png"}"
@@ -842,6 +845,7 @@ fi
     gui_credits) gui_credits ;;
     pw_start_cont_xterm) pw_start_cont_xterm ;;
     pw_find_exe) pw_find_exe ;;
+    pw_duplicate) pw_duplicate ;;
     PW_*) pw_autoinstall_from_db ;;
     *.desktop) run_desktop_b_click ;;
     1|252|*) exit 0 ;;

data_from_portwine/themes/classic.pptheme

@@ -23,6 +23,9 @@ export TAB_SIZE=28
 export PW_MAIN_SIZE_W=1100
 export PW_MAIN_SIZE_H=350
 
+export PW_DUPLICATE_SIZE_W=1100
+export PW_DUPLICATE_SIZE_H=350
+
 export PW_START_SIZE_W=600
 export PW_START_SIZE_H=350
 export PW_TAB_POSITON=top

data_from_portwine/themes/compact.pptheme

@@ -23,10 +23,13 @@ export BUTTON_SIZE=32 # 24, 28, 32, 36, 40
 
 export TAB_SIZE=32 # 24, 28, 32, 36, 40
 
-export PW_MAIN_SIZE_W=1
+export PW_MAIN_SIZE_W=500
 export PW_MAIN_SIZE_H=350
 
-export PW_START_SIZE_W=1
+export PW_DUPLICATE_SIZE_W=1000
+export PW_DUPLICATE_SIZE_H=350
+
+export PW_START_SIZE_W=500
 export PW_START_SIZE_H=350
 export PW_TAB_POSITON=top
 

data_from_portwine/themes/default.pptheme

@@ -31,9 +31,13 @@ export BUTTON_SIZE=28 # 24, 28, 32, 36, 40
 export TAB_SIZE=32 # 24, 28, 32, 36, 40
 
 # размер главного меню
-export PW_MAIN_SIZE_W=1
+export PW_MAIN_SIZE_W=500
 export PW_MAIN_SIZE_H=330
 
+# размер окна для дубликатов
+export PW_DUPLICATE_SIZE_W=1000
+export PW_DUPLICATE_SIZE_H=330
+
 # размер меню запуска и положения табов
 export PW_START_SIZE_W=800
 export PW_START_SIZE_H=330