Skip to content

Commit

Permalink
Merge pull request #68 from videomorph-dev/bump-version1.5rc
Browse files Browse the repository at this point in the history
Bump version1.5rc
  • Loading branch information
leonel-lordford authored Feb 21, 2021
2 parents ba23f8d + aa3d548 commit eed4f91
Show file tree
Hide file tree
Showing 59 changed files with 31 additions and 30 deletions.
6 changes: 3 additions & 3 deletions changelog
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
videomorph (1.5) focal; urgency=high
videomorph (1.5rc) focal; urgency=high

* VideoMorph v1.5 Canelo. Release Date: Sun, 30 Jan 2021
* VideoMorph v1.5rc Canelo. Release Date: Sun, 14 Feb 2021

-- Leodanis Pozo Ramos <[email protected]> Mon, 6 Jul 2020 12:15:38 -0400
-- Leodanis Pozo Ramos <[email protected]> Sun, 14 Feb 2021 12:15:38 -0400

videomorph (1.4); urgency=high

Expand Down
Binary file modified changelog.gz
Binary file not shown.
Binary file modified screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed share/doc/videomorph/manual/Ayuda.odt
Binary file not shown.
Binary file removed share/doc/videomorph/manual/Help.odt
Binary file not shown.
Binary file not shown.
Binary file removed share/doc/videomorph/manual/images/barra_menu.png
Binary file not shown.
Binary file removed share/doc/videomorph/manual/images/calidad.png
Binary file not shown.
Binary file not shown.
Binary file removed share/doc/videomorph/manual/images/convert_to.png
Binary file not shown.
Binary file removed share/doc/videomorph/manual/images/convertir_a.png
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added share/doc/videomorph/manual/images/en/options.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added share/doc/videomorph/manual/images/en/toolbar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added share/doc/videomorph/manual/images/es/calidad.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Diff not rendered.
Binary file removed share/doc/videomorph/manual/images/menu_archivo.png
Diff not rendered.
Binary file removed share/doc/videomorph/manual/images/menu_ayuda.png
Diff not rendered.
Binary file removed share/doc/videomorph/manual/images/menu_bar.png
Diff not rendered.
Diff not rendered.
Binary file removed share/doc/videomorph/manual/images/menu_convert.png
Diff not rendered.
Binary file removed share/doc/videomorph/manual/images/menu_edicion.png
Diff not rendered.
Binary file removed share/doc/videomorph/manual/images/menu_edit.png
Diff not rendered.
Binary file removed share/doc/videomorph/manual/images/menu_file.png
Diff not rendered.
Binary file removed share/doc/videomorph/manual/images/menu_help.png
Diff not rendered.
Binary file removed share/doc/videomorph/manual/images/opciones.png
Diff not rendered.
Binary file removed share/doc/videomorph/manual/images/options.png
Diff not rendered.
Binary file removed share/doc/videomorph/manual/images/output_dir.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed share/doc/videomorph/manual/images/toolbar.png
Diff not rendered.
Diff not rendered.
26 changes: 13 additions & 13 deletions share/doc/videomorph/manual/manual_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@

# **<div style="text-align:center;">User’s Manual</div>**

<div style="text-align:center;">Version 1.5 “Canelo”</div>
<div style="text-align:center;">Version 1.5rc “Canelo”</div>
---

[TOC]

<div style="page-break-after: always; break-after: page;"></div>
## Introduction

![main window](images/main_window.png)
![main window](images/en/main_window.png)

**VideoMorph** is a multi-platform application, dedicated to the conversion of video formats. There are many applications for these purposes, but all of them have many options that can be complicated for new users, so we decided to focus on the main task, facilitating the conversion of your audiovisual materials in an intuitive and easy way. **VideoMorph** was developed with Python 3 programming language, Ffmpeg multimedia processing library and PyQt5 for the Graphical User Interface. With **VideoMorph** it is possible to convert your videos to the most popular video formats at present, such as **MP4, AVI,** **DVD, VCD,** **MOV,** **MPG, FLV, WEBM,** **OGV,** **WMV, MKV**, some of them ready to use in social networks like Youtube, also it is possible to use **VideoMorph** for extracting audio in **MP3** or **OGA** formats.

Expand All @@ -21,11 +21,11 @@

It contains the elements:

![toolbar](images/toolbar.png)
![toolbar](images/en/toolbar.png)

- **Add Files**: Opens a dialog to select the video files you want to convert. Once selected, they are placed in the **List of Conversion Tasks**.

![conversion tasks](images/conversion_tasks.png)
![conversion tasks](images/en/conversion_tasks.png)

- **Clear List**: Deletes the entire List of Conversion Tasks.
- **Remove File**: Deletes an individual file selected from the files in the List of Conversion Tasks.
Expand All @@ -39,19 +39,19 @@ It contains the elements:

- **Convert to**: Select the output video format, that is, the format you want to give to the files arranged in the List of Conversion Tasks, from the list of available video formats in the Convert to drop-down list

![convert to drop-down](images/convert_to.png)
![convert to drop-down](images/en/convert_to.png)

- **Target Quality**: Select the quality you want to use in the conversion process from the Target Quality drop-down list

![target quality](images/target_quality.png)
![target quality](images/en/target_quality.png)

- **Output Directory**: Selected output folder where the converted video files will be saved

![output dir](images/output_dir.png)
![output dir](images/en/output_dir.png)

- **Other Options**: Several options that may be useful

![other options](images/options.png)
![other options](images/en/options.png)

- **Insert Subtitles if Available**: This option is very interesting, because it allows us to embed the subtitle inside the video you are converting, as long as you have the subtitle file in ***.srt*** format.
- **Delete Input Video Files when Finished**: This allows you to delete the original video file when the conversion is finished, this way you will not have two identical video files, saving disk space.
Expand All @@ -63,11 +63,11 @@ It contains the elements:

The Main Menu of the application has 4 entries: **File**, **Edit**, **Convert** and **Help**

![menu](images/menu_bar.png)
![menu](images/en/menu_bar.png)

- **File Menu**: Allows you to perform the following actions

![menu file](images/menu_file.png)
![menu file](images/en/file_menu.png)

1. Add files to the Conversion Task List.
2. Add a folder to convert all the video files contained in it.
Expand All @@ -76,15 +76,15 @@ The Main Menu of the application has 4 entries: **File**, **Edit**, **Convert**

- **Edit Menu**: Includes the following actions

![menu edit](images/menu_edit.png)
![menu edit](images/en/edit_menu.png)

1. Delete all video files from the List of Conversion Tasks.
2. Delete the selected video file from the List of Conversion Tasks.


- **Conversion Menu**: Allows you to perform the following actions

![menu convert](images/menu_convert.png)
![menu convert](images/en/convert_menu.png)

1. Starts the conversion process.
2. Stops the conversion of the current task.
Expand All @@ -93,7 +93,7 @@ The Main Menu of the application has 4 entries: **File**, **Edit**, **Convert**

- **Help Menu**: Includes options

![menu help](images/menu_help.png)
![menu help](images/en/help_menu.png)

1. Shows the contents of this manual.
2. View the application Changelog.
Expand Down
Binary file modified share/doc/videomorph/manual/manual_en.pdf
Binary file not shown.
27 changes: 14 additions & 13 deletions share/doc/videomorph/manual/manual_es.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@

# **<div style="text-align:center;">Manual de Usuario</div>**

<div style="text-align:center;">Version 1.5 “Canelo”</div>
<div style="text-align:center;">Versión 1.5rc “Canelo”</div>

---

[TOC]

<div style="page-break-after: always; break-after: page;"></div>
## Introducción

![ventana principal](images/ventana_principal.png)
![ventana principal](images/es/ventana_principal.png)

**VideoMorph** es una aplicación multiplataforma, dedicada a la conversión de formatos de video. Existen muchas aplicaciones para estos fines, pero todas de un modo u otro disponen de muchas opciones que pueden resultar complicadas para los usuarios noveles, por eso decidimos concentrar la atención en la tarea principal, facilitar la conversión de sus materiales audiovisuales de una manera intuitiva y fácil. **VideoMorph** se desarrolla con el lenguaje de programación Python 3, la librería de procesamiento multimedia Ffmpeg y PyQt5 para la Interfaz Gráfica de Usuario. Con **VideoMorph** es posible convertir a los formatos de video más empleados en la actualidad, dígase **MP4**, **AVI**, **DVD**, **VCD**, **MOV**, **MPG**, **FLV**, **WEBM**, **OGV**, **WMV**, **MKV**, algunos de ellos listos para usar en redes sociales como **Youtube**, también es posible usar **VideoMorph** para extraer el audio en formatos **MP3** y **OGA**.

Expand All @@ -21,11 +22,11 @@

Contiene los elementos:

![barra herramientas](images/barra_herramientas.png)
![barra herramientas](images/es/barra_herramientas.png)

- **Añadir Archivos**: Abre un diálogo para seleccionar los archivos de video que desea convertir, una vez seleccionados, se ubican en la **Lista de Tareas de Conversión**.

![tareas de conversion](images/tareas_conversion.png)
![tareas de conversion](images/es/tareas_conversion.png)

- **Eliminar Lista**: Elimina toda la Lista de Tareas Conversión.
- **Eliminar Archivo**: Elimina el archivo seleccionado en la Lista de Tareas de Conversión.
Expand All @@ -39,19 +40,19 @@ Contiene los elementos:

- **Convertir a**: Selecciona el formato de video de salida, es decir, el formato que quiere darle a los archivos dispuestos en la lista de conversión, desde la lista desplegable de formatos de video disponibles

![convertir a](images/convertir_a.png)
![convertir a](images/es/convertir_a.png)

- **Calidad Objetivo**: Selecciona la calidad que desea emplear en el proceso de conversión, desde la lista desplegable de calidades objetivo

![calidad](images/calidad.png)
![calidad](images/es/calidad.png)

- **Directorio Destino**: Directorio seleccionado donde los archivos de video convertidos se guardarán

![directorio salida](images/directorio_salida.png)
![directorio salida](images/es/directorio_salida.png)

- **Otras Opciones**: Opciones que pudieran resultar útiles:

![otras optiones](images/opciones.png)
![otras optiones](images/es/opciones.png)

- **Incrustar Subtítulos si están Disponibles**: Esta opción es muy interesante, pues nos permite incrustar el subtítulo dentro del video a convertir, siempre y cuando disponga del archivo de subtítulos en formato ***.srt***.
- **Eliminar Archivos de Video de Entrada al Finalizar**: Esto permite eliminar el video original al concluir la conversión, de esta forma no tendrá dos archivos de video iguales, ahorrando espacio en disco.
Expand All @@ -63,11 +64,11 @@ Contiene los elementos:

El Menú Principal de la aplicación está compuesto por 4 elementos: Archivo, Edición, Conversión y Ayuda

![menu](images/barra_menu.png)
![menu](images/es/barra_menu.png)

- **Menú Archivo**: Permite realizar las acciones siguientes

![menu archivo](images/menu_archivo.png)
![menu archivo](images/es/menu_archivo.png)

1. Añadir archivos a la Lista de Tareas de Conversión.
2. Agrega una carpeta para convertir todos los archivos de video contenidos en ella.
Expand All @@ -76,15 +77,15 @@ El Menú Principal de la aplicación está compuesto por 4 elementos: Archivo, E

- **Menú Edición**: Incluye las acciones siguientes

![menu edicion](images/menu_edicion.png)
![menu edicion](images/es/menu_edicion.png)

1. Eliminar todos los archivos de video de la Lista de Tareas de Conversión.
2. Eliminar el archivo de video seleccionado de la Lista de Tareas de Conversión.


- **Menú Conversión**: Permite realizar las acciones siguientes

![menu conversion](images/menu_conversion.png)
![menu conversion](images/es/menu_conversion.png)

1. Inicia el proceso de conversión.
2. Detiene la conversión del archivo de video en proceso.
Expand All @@ -93,7 +94,7 @@ El Menú Principal de la aplicación está compuesto por 4 elementos: Archivo, E

- **Menú Ayuda**: Incluye las opciones siguientes

![menu ayuda](images/menu_ayuda.png)
![menu ayuda](images/es/menu_ayuda.png)

1. Muestra el contenido de este manual.
2. Visualiza el registro de cambios de la aplicación.
Expand Down
Binary file modified share/doc/videomorph/manual/manual_es.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion share/man/man1/videomorph.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH VIDEOMORPH "1" "Jul 2020" "Version 1.5 Canelo" "VideoMorph"
.TH VIDEOMORPH "1" "Jul 2020" "Version 1.5rc Canelo" "VideoMorph"

.SH NAME
videomorph \- Video Converter based on ffmpeg, Python 3 and PyQt5.
Expand Down
Binary file modified share/man/man1/videomorph.1.gz
Binary file not shown.

0 comments on commit eed4f91

Please sign in to comment.