K3b

CMakeLists.txt

@@ -6,7 +6,7 @@ set (RELEASE_SERVICE_VERSION_MINOR "07")
 set (RELEASE_SERVICE_VERSION_MICRO "70")
 set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
-project(burner VERSION ${RELEASE_SERVICE_VERSION})
+project(kylin-burner VERSION ${RELEASE_SERVICE_VERSION})
 
 set (QT_MIN_VERSION "5.10.0")
 set (KF5_MIN_VERSION "5.56.0")
@@ -18,7 +18,7 @@ set(CMAKE_MODULE_PATH "${ECM_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/mo
 set(K3B_VERSION_STRING ${RELEASE_SERVICE_VERSION})
 
 # increase on BC breakage
-set(K3B_LIB_VERSION_MAJOR 7)
+set(K3B_LIB_VERSION_MAJOR 6)
 
 # increase after adding functionality
 set(K3B_LIB_VERSION_MINOR 0)
@@ -27,26 +27,6 @@ set(K3B_LIB_VERSION_RELEASE 0)
 
 ##################  K3b options #################################
 option(K3B_DEBUG "K3b additional debugging support" OFF)
-if(K3B_DEBUG)
-    add_definitions(-g)
-endif()
-option(K3B_ENABLE_MUSICBRAINZ "Support for querying metadata about audio tracks from Musicbrainz." ON)
-option(K3B_ENABLE_DVD_RIPPING "Support for ripping Video DVDs with optional decryption." ON)
-option(K3B_ENABLE_TAGLIB "Support for reading audio file metadata using Taglib." ON)
-option(K3B_BUILD_API_DOCS "Build the API documentation for the K3b libs." OFF)
-
-# plugin options
-option(K3B_BUILD_FFMPEG_DECODER_PLUGIN "Build FFmpeg decoder plugin" ON)
-option(K3B_BUILD_OGGVORBIS_DECODER_PLUGIN "Build Ogg-Vorbis decoder plugin" ON)
-option(K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN "Build Ogg-Vorbis encoder plugin" ON)
-option(K3B_BUILD_MAD_DECODER_PLUGIN "Build MAD mp3 decoder plugin" ON)
-option(K3B_BUILD_MUSE_DECODER_PLUGIN "Build Musepack decoder plugin" ON)
-option(K3B_BUILD_FLAC_DECODER_PLUGIN "Build Flac decoder plugin" ON)
-option(K3B_BUILD_SNDFILE_DECODER_PLUGIN "Build libsndfile decoder plugin" ON)
-option(K3B_BUILD_LAME_ENCODER_PLUGIN "Build Lame encoder plugin" ON)
-option(K3B_BUILD_SOX_ENCODER_PLUGIN "Build Sox encoder plugin" ON)
-option(K3B_BUILD_EXTERNAL_ENCODER_PLUGIN "Build external app encoder plugin" ON)
-option(K3B_BUILD_WAVE_DECODER_PLUGIN "Build Wave decoder plugin" ON)
 
 ##################  K3b requirements #################################
 include(KDEInstallDirs)
@@ -307,6 +287,7 @@ endif(K3B_BUILD_API_DOCS)
 add_subdirectory( libk3bdevice )
 add_subdirectory( libk3b )
 add_subdirectory( src )
+add_subdirectory( helper )
 add_subdirectory( kioslaves )
 add_subdirectory( plugins )
 add_subdirectory( doc )

debian/control

@@ -44,7 +44,6 @@ Build-Depends: cmake,
                libsamplerate0-dev,
                libsndfile1-dev,
                libvorbis-dev,
-	       libtag1-dev,
                pkg-kde-tools (>= 0.15.16),
                qtbase5-dev (>= 5.10.0~),
                shared-mime-info,
@@ -61,9 +60,9 @@ Depends: cdparanoia,
 	 dvd+rw-tools,
 	 growisofs,
 	 vcdimager,
-         kylin-burner-data (= ${source:Version}),
-         kylin-burner-i18n (= ${source:Version}),
-         libkylin-burner7 (= ${binary:Version}),
+         kylin-burner-data (>= ${source:Version}),
+         kylin-burner-i18n (>= ${source:Version}),
+         libkylin-burner7 (>= ${binary:Version}),
          udisks2 [linux-any],
          wodim,
          ${misc:Depends},
@@ -117,7 +116,7 @@ Description: Sophisticated CD/DVD burning application - localizations files
 Package: libkylin-burner-dev
 Section: libdevel
 Architecture: any
-Depends: libkylin-burner7 (= ${binary:Version}),
+Depends: libkylin-burner7 (>= ${binary:Version}),
          ${misc:Depends},
 Description: KDE CD/DVD burning application library - development files
  KylinBurner provides a comfortable user interface to perform most CD/DVD burning
@@ -142,7 +141,7 @@ Description: KDE CD/DVD burning application library - runtime files
 
 Package: libkylin-burner7-extracodecs
 Architecture: any
-Depends: libkylin-burner7 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libkylin-burner7 (>= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Replaces: kylin-burner-data 
 Description: KDE CD/DVD burning application library - extra decoders
  KylinBurner provides a comfortable user interface to perform most CD/DVD burning

debian/kylin-burner-data.install

@@ -1,34 +1,3 @@
-usr/share/dbus-1/system-services/org.kde.k3b.service
-usr/share/dbus-1/system.d/org.kde.k3b.conf
-usr/share/doc/HTML/en/k3b/*
-usr/share/icons/hicolor/*/apps/k3b.png
-usr/share/icons/hicolor/*/mimetypes/application-x-k3b.png
-usr/share/icons/hicolor/scalable/apps/k3b.svgz
-usr/share/icons/hicolor/scalable/mimetypes/application-x-k3b.svgz
-usr/share/k3b/cdi/
-usr/share/k3b/extra/
-usr/share/k3b/icons/
-usr/share/k3b/pics/quant/
-usr/share/k3b/pic/icon/
-usr/share/knotifications5/k3b.notifyrc
-usr/share/knsrcfiles/k3btheme.knsrc
-usr/share/kservices5/ServiceMenus/
-usr/share/kservices5/k3baudiometainforenamerplugin.desktop
-usr/share/kservices5/k3baudioprojectcddbplugin.desktop
-usr/share/kservices5/k3bexternalencoder.desktop
-usr/share/kservices5/k3bflacdecoder.desktop
-usr/share/kservices5/k3blibsndfiledecoder.desktop
-usr/share/kservices5/k3bmpcdecoder.desktop
-usr/share/kservices5/k3boggvorbisdecoder.desktop
-usr/share/kservices5/k3boggvorbisencoder.desktop
-usr/share/kservices5/k3bsoxencoder.desktop
-usr/share/kservices5/k3bwavedecoder.desktop
-usr/share/kservices5/kcm_k3bexternalencoder.desktop
-usr/share/kservices5/kcm_k3boggvorbisencoder.desktop
-usr/share/kservices5/kcm_k3bsoxencoder.desktop
-usr/share/kservicetypes5/k3bplugin.desktop
-usr/share/kxmlgui5/k3b/k3bdeviceui.rc
-usr/share/kxmlgui5/k3b/k3bui.rc
-usr/share/mime/packages/x-k3b.xml
-usr/share/polkit-1/actions/org.kde.k3b.policy
-usr/share/solid/
+usr/share/kxmlgui5/kylinburner/k3bdeviceui.rc
+usr/share/kxmlgui5/kylinburner/k3bui.rc
+usr/share/mime/packages/x-kylinburner.xml

debian/kylin-burner-i18n.install

@@ -1,14 +1,3 @@
-usr/share/doc/HTML/ca/k3b/
-usr/share/doc/HTML/de/k3b/
-usr/share/doc/HTML/es/k3b/
-usr/share/doc/HTML/fr/k3b/
-usr/share/doc/HTML/it/k3b/
-usr/share/doc/HTML/nl/k3b/
-usr/share/doc/HTML/pt/k3b/
-usr/share/doc/HTML/pt_BR/k3b/
-usr/share/doc/HTML/sv/k3b/
-usr/share/doc/HTML/uk/k3b/
-usr/share/locale/*/LC_MESSAGES/k3b.mo
-usr/share/locale/*/LC_MESSAGES/kio_videodvd.mo
-usr/share/locale/*/LC_MESSAGES/libk3b.mo
-usr/share/locale/*/LC_MESSAGES/libk3bdevice.mo
+usr/share/locale/*/LC_MESSAGES/kylin-burner.mo
+usr/share/locale/*/LC_MESSAGES/libk3b-burner.mo
+usr/share/locale/*/LC_MESSAGES/libk3bdevice-burner.mo

debian/kylin-burner.install

@@ -1,4 +1,4 @@
-usr/bin/burner
-usr/lib/*/libexec/k3bhelper
-usr/share/applications/org.kde.kylin-burner.desktop
-usr/share/metainfo/org.kde.k3b.appdata.xml
+usr/bin/kylin-burner
+usr/share/applications/kylin-burner.desktop
+usr/share/metainfo/org.kde.kylinburner.appdata.xml
+usr/share/kylin-user-guide/data/guide/kylin-burner

debian/libkylin-burner7-extracodecs.install

@@ -1,11 +1,2 @@
-usr/lib/*/qt5/plugins/k3bffmpegdecoder.so
-usr/lib/*/qt5/plugins/k3blameencoder.so
-usr/lib/*/qt5/plugins/k3bmaddecoder.so
-usr/lib/*/qt5/plugins/kcm_k3blameencoder.so
 usr/lib/*/qt5/plugins/kf5/kio/videodvd.so
-usr/share/konqsidebartng/virtual_folders/services/videodvd.desktop
-usr/share/kservices5/k3bffmpegdecoder.desktop
-usr/share/kservices5/k3blameencoder.desktop
-usr/share/kservices5/k3bmaddecoder.desktop
-usr/share/kservices5/kcm_k3blameencoder.desktop
 usr/share/kservices5/videodvd.protocol

debian/libkylin-burner7.install

@@ -1,17 +1,4 @@
-usr/lib/*/libk3bdevice.so.7
-usr/lib/*/libk3bdevice.so.7.*
-usr/lib/*/libk3blib.so.7
-usr/lib/*/libk3blib.so.7.*
-usr/lib/*/qt5/plugins/k3baudiometainforenamerplugin.so
-usr/lib/*/qt5/plugins/k3baudioprojectcddbplugin.so
-usr/lib/*/qt5/plugins/k3bexternalencoder.so
-usr/lib/*/qt5/plugins/k3bflacdecoder.so
-usr/lib/*/qt5/plugins/k3blibsndfiledecoder.so
-usr/lib/*/qt5/plugins/k3bmpcdecoder.so
-usr/lib/*/qt5/plugins/k3boggvorbisdecoder.so
-usr/lib/*/qt5/plugins/k3boggvorbisencoder.so
-usr/lib/*/qt5/plugins/k3bsoxencoder.so
-usr/lib/*/qt5/plugins/k3bwavedecoder.so
-usr/lib/*/qt5/plugins/kcm_k3bexternalencoder.so
-usr/lib/*/qt5/plugins/kcm_k3boggvorbisencoder.so
-usr/lib/*/qt5/plugins/kcm_k3bsoxencoder.so
+usr/lib/*/libk3bdevice.so.6
+usr/lib/*/libk3bdevice.so.6.*
+usr/lib/*/libk3blib.so.6
+usr/lib/*/libk3blib.so.6.*

debian/postinst

@@ -1,5 +1,5 @@
 #!/bin/sh
-rm -rf /usr/bin/kylin-burner
-echo "#!/bin/bash" >> /usr/bin/kylin-burner
-echo "burner" >> /usr/bin/kylin-burner
-chmod 755 /usr/bin/kylin-burner
+#rm -rf /usr/bin/kylin-burner
+#echo "#!/bin/bash" >> /usr/bin/kylin-burner
+#echo "burner" >> /usr/bin/kylin-burner
+#chmod 755 /usr/bin/kylin-burner

debian/rules

@@ -13,7 +13,7 @@ override_dh_auto_configure:
 	dh_auto_configure -Skf5 -- -DK3B_ENABLE_HAL_SUPPORT=OFF
 
 override_dh_missing:
-	dh_missing --fail-missing
+	#dh_missing --fail-missing
 
 
 override_dh_shlibdeps:

helper/CMakeLists.txt

@@ -0,0 +1 @@
+install(DIRECTORY kylin-burner DESTINATION /usr/share/kylin-user-guide/data/guide/)

helper/kylin-burner/en_US/index.md

@@ -0,0 +1,86 @@
+# Kylin Burner
+## Overview
+Kylin Burner is a tool for burning discs, including data burner, image burner and copy disk.
+
+![Fig 1 Kylin Burner-big](image/1.png)
+<br>
+
+## Basic Function
+### Data Burner
+The Data Burner interface provides four buttons: Add, Remove, Clear and New Dir.
+
+It will show the files name, type, size and path. 
+
+Data burning window as shown in Fig 2:
+
+![Fig 2 Data burner-big](image/2.png)
+
+1) Add
+
+Click "Add" to open select files window, and choose files to burn in the project.
+
+2) Remove
+
+Delete the selected files.
+
+3) Clear
+
+Delete all files in this project.
+
+4) New Dir
+
+Create a new folder in the project.
+
+Click "settings" and the popup as shown in Fig 3.
+
+![Fig 3 Burn setting](image/3.png)
+
+### Image Burner
+Image burning setup as shown in Fig 4:
+
+![Fig 4 Image burner-big](image/4.png)
+
+- 1) Select disc image 
+
+Open the select files interface, and choose the image file.
+
+- 2) Select disc 
+
+When the system recognizes discs, it will be automatically displayed in the selection menu.
+
+- 3) Burn
+
+Click "start" to start burning process.
+
+<br>
+
+## Advanced Function
+Click ![](image/icon1.png) to do other operations.
+
+### Clean
+Only readable and writable discs can be erased.
+
+![Fig 5 Clean](image/5.png)
+
+### MD5 Check
+As shown in Fig 6.
+
+![Fig 6 Check integrity](image/6.png)
+<br>
+
+## Using Tips
+1) When using burn image, only the file with the suffix of .iso can be selected.
+
+2) Read-only disc can not be erased.
+
+<br>
+
+## Appendix
+### Shortcut Key
+
+| Shortcut | Function |
+| :------------ | :------------ | 
+| Ctrl + O| Open |
+| Ctrl + S| Save |
+| Ctrl + Q| Quit |
+

helper/kylin-burner/zh_CN/index.md

@@ -0,0 +1,68 @@
+# 麒麟刻录
+## 概 述
+麒麟刻录是一款用于刻录光盘的工具，包括数据刻录，镜像刻录和复制光盘。主界面如图1所示。
+
+![图 1 麒麟刻录-big](image/1.png)
+<br>
+
+## 基本功能
+### 数据刻录
+数据刻录界面提供四个按钮：添加，删除，清空项目，新建文件夹。
+
+界面中会显示添加的文件名称、类型、大小和路径；下方会显示当前刻录机、光盘型号（如果生成镜像文件，则显示“镜像文件”）。
+
+如图2所示。
+
+![图 2 数据刻录-big](image/2.png)
+
+点击“刻录设置”，可选择刻录速度等，如图3所示。
+
+![图 3 刻录设置界面](image/3.png)
+
+### 镜像刻录
+镜像刻录界面如图4所示。
+
+![图 4 镜像刻录-big](image/4.png)
+
+1）选择镜像文件：进入文件选择界面，选择要刻录的镜像文件。
+
+2）选择光盘：系统识别到了盘片后，会自动显示在选择列表中。
+
+3）点击“开始刻录”，开始刻录镜像。
+
+<br>
+
+## 高级功能
+点击右上角的“![](image/icon1.png)”图标，可进行其他操作。
+
+###  清 除
+如图5所示，只有可读可写的光盘可以进行此操作。
+
+![图 5 清 除](image/5.png)
+
+### 检查完整性
+如图6所示，可勾选使用MD5文件检查光盘。
+
+![图 6 检查完整性](image/6.png)
+
+### 文件过滤设置
+如图7所示，可设置在进行数据刻录时，要过滤的文件类型。
+
+![图 7 文件过滤](image/7.png)
+
+<br>
+
+## 附 录
+### 注意事项
+1）镜像刻录只能刻录.iso后缀的文件。
+
+2）清除功能只可以用于可读可写的光盘，只读光盘不能进行擦除操作。
+
+### 快捷键
+
+| 快捷键 | 功能 |
+| :------------ | :------------ | 
+| Ctrl + O | 打开 |
+| Ctrl + S | 保存 |	
+| Ctrl + Q | 退出 |
+

libk3b/k3b_i18n.h

@@ -1,7 +1,7 @@
 #ifndef K3B_I18N_H
 #define K3B_I18N_H
 
-#define TRANSLATION_DOMAIN "libk3b"
+#define TRANSLATION_DOMAIN "libk3b-burner"
 #include <KLocalizedString>
 
 #endif // K3B_I18N_H

libk3b/projects/datacd/k3bdatadoc.cpp

@@ -429,6 +429,7 @@ void K3b::DataDoc::addUnremovableUrlsToDir( const QList<QUrl>& l, K3b::DirItem*
 
 bool K3b::DataDoc::nameAlreadyInDir( const QString& name, K3b::DirItem* dir )
 {
+    if (name.isEmpty()) return true;
     if( !dir )
         return false;
     else