diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 67ec6652..4b654890 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,7 +29,6 @@ jobs:
VER="continuous"
fi
echo "::set-output name=version::$VER"
-
main_build:
name: ${{ matrix.config.name }}
runs-on: ${{ matrix.config.os }}
@@ -114,6 +113,10 @@ jobs:
if: (steps.cache-ff7tk.outputs.cache-hit != 'true')
run: ${{matrix.config.install_ff7tk}}
+ - name: Set FF7tk Path
+ if: runner.os == 'Linux'
+ run: echo /opt/ff7tk/lib | sudo tee /etc/ld.so.conf.d/ff7tk.conf
+
- name: Build Black_Chocobo
id: main_build
run: |
@@ -143,7 +146,9 @@ jobs:
- name: Upload
uses: actions/upload-artifact@v3
with:
- path: ${{github.workspace}}/${{env.PackageGLOB}}
+ path: |
+ ${{github.workspace}}/${{env.PackageGLOB}}
+ ${{github.workspace}}/black*.deb
release_assets:
name: Release
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 893aa5a0..46360d77 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
cmake_policy(SET CMP0010 NEW)
-project( blackchocobo VERSION 1.12.0 DESCRIPTION "Final Fantasy 7 Save Editor")
+project( blackchocobo VERSION 1.12.1 DESCRIPTION "Final Fantasy 7 Save Editor")
# Get the version from git if it's a git repository
IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
FIND_PACKAGE(Git)
@@ -71,7 +71,8 @@ find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS
Xml
)
-find_package(ff7tk 0.82 REQUIRED NO_MODULE COMPONENTS
+set(REQUIRED_FF7TK_VERSION 0.82.1)
+find_package(ff7tk ${REQUIRED_FF7TK_VERSION} REQUIRED NO_MODULE COMPONENTS
ff7tk
ff7tkWidgets
)
diff --git a/deploy/CMakeLists.txt b/deploy/CMakeLists.txt
index b6ef6fd4..a2eb11be 100644
--- a/deploy/CMakeLists.txt
+++ b/deploy/CMakeLists.txt
@@ -30,11 +30,20 @@ if(NOT CPACK_PACKAGE_VERSION)
endif()
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${CMAKE_PROJECT_DESCRIPTION})
+set(CPACK_DEBIAN_PACKAGE_NAME "blackchocobo")
+set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER "sithlord48@gmail.com")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "libff7tk (>= ${REQUIRED_FF7TK_VERSION}) | libff7tk-all (>=${REQUIRED_FF7TK_VERSION})")
+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
#install generic files needed for linux package
set(CPACK_GENERATOR "TXZ")
EXECUTE_PROCESS( COMMAND uname -m COMMAND tr -d '\n' OUTPUT_VARIABLE ARCHITECTURE)
set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-linux-${ARCHITECTURE}")
+ if(EXISTS "/usr/bin/dpkg")
+ list(APPEND CPACK_GENERATOR "DEB")
+ endif()
elseif(CMAKE_SYSTEM_NAME MATCHES "Windows")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "Black_Chocobo")
set(CPACK_NSIS_DISPLAY_NAME ${CMAKE_PACKAGE_NAME})
diff --git a/lang/bchoco_de.ts b/lang/bchoco_de.ts
index d394a573..e7af82bc 100644
--- a/lang/bchoco_de.ts
+++ b/lang/bchoco_de.ts
@@ -191,6 +191,14 @@ p, li { white-space: pre-wrap; }
Default to PC type, when saving unknown type
+
+ Allow for an item cap 99 always
+
+
+
+ Prepend drive to file dialog sidebars
+
+
BlackChocobo
diff --git a/lang/bchoco_en.ts b/lang/bchoco_en.ts
index 192d2f69..9cf75ab1 100644
--- a/lang/bchoco_en.ts
+++ b/lang/bchoco_en.ts
@@ -191,6 +191,14 @@ p, li { white-space: pre-wrap; }
Default to PC type, when saving unknown type
+
+ Allow for an item cap 99 always
+
+
+
+ Prepend drive to file dialog sidebars
+
+
BlackChocobo
diff --git a/lang/bchoco_es.ts b/lang/bchoco_es.ts
index 78e135c2..d484341c 100644
--- a/lang/bchoco_es.ts
+++ b/lang/bchoco_es.ts
@@ -191,6 +191,14 @@ p, li { white-space: pre-wrap; }
Default to PC type, when saving unknown type
+
+ Allow for an item cap 99 always
+
+
+
+ Prepend drive to file dialog sidebars
+
+
BlackChocobo
diff --git a/lang/bchoco_fr.ts b/lang/bchoco_fr.ts
index 47eade22..ba255687 100644
--- a/lang/bchoco_fr.ts
+++ b/lang/bchoco_fr.ts
@@ -191,6 +191,14 @@ p, li { white-space: pre-wrap; }
Default to PC type, when saving unknown type
+
+ Allow for an item cap 99 always
+
+
+
+ Prepend drive to file dialog sidebars
+
+
BlackChocobo
diff --git a/lang/bchoco_ja.ts b/lang/bchoco_ja.ts
index c4b2eb99..ea1e1cbe 100644
--- a/lang/bchoco_ja.ts
+++ b/lang/bchoco_ja.ts
@@ -187,6 +187,14 @@ p, li { white-space: pre-wrap; }
Default to PC type, when saving unknown type
+
+ Allow for an item cap 99 always
+
+
+
+ Prepend drive to file dialog sidebars
+
+
BlackChocobo
diff --git a/lang/bchoco_pl.ts b/lang/bchoco_pl.ts
index e29c994b..a349f6f0 100644
--- a/lang/bchoco_pl.ts
+++ b/lang/bchoco_pl.ts
@@ -191,6 +191,14 @@ p, li { white-space: pre-wrap; }
Default to PC type, when saving unknown type
+
+ Allow for an item cap 99 always
+
+
+
+ Prepend drive to file dialog sidebars
+
+
BlackChocobo
diff --git a/lang/bchoco_re.ts b/lang/bchoco_re.ts
index 77d7eb59..2ecf249b 100644
--- a/lang/bchoco_re.ts
+++ b/lang/bchoco_re.ts
@@ -191,6 +191,14 @@ p, li { white-space: pre-wrap; }
Default to PC type, when saving unknown type
+
+ Allow for an item cap 99 always
+
+
+
+ Prepend drive to file dialog sidebars
+
+
BlackChocobo
diff --git a/src/dialogs/bcdialog.cpp b/src/dialogs/bcdialog.cpp
index 063147d8..d3a0cc56 100644
--- a/src/dialogs/bcdialog.cpp
+++ b/src/dialogs/bcdialog.cpp
@@ -129,7 +129,8 @@ QString BCDialog::getSaveFileName(QWidget *parent, const QString ®ion, const
dialog->setDefaultSuffix(QStringLiteral(".vgs"));
name = QStringLiteral("vgsCard");
}
- name.append(QStringLiteral("%1").arg(dialog->defaultSuffix()));
+ if(!dialog->defaultSuffix().isEmpty())
+ name.append(QStringLiteral(".%1").arg(dialog->defaultSuffix()));
dialog->selectFile(name);
});
}