@@ -1,4 +1,12 @@

 -------------------------------------------------------------------

+Fri Apr 21 21:21:34 UTC 2017 - avvissu@yandex.by

+

+- Update to 0.2.3:

+  * see: /usr/share/doc/packages/curlew/ChangeLog

+- Update patches:

+  * curlew-0.2.1_path.patch -> curlew-0.2.3_path.patch 

+

+-------------------------------------------------------------------

 Mon Mar 14 11:58:45 UTC 2016 - avvissu@yandex.ru

 - Update to 0.2.2:

​

@@ -1,7 +1,7 @@

 #

 # spec file for package curlew

 #

-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.

+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.

 #

 # All modifications and additions to the file contributed by third parties

 # remain the property of their copyright owners, unless otherwise agreed

@@ -17,28 +17,30 @@

 Name:           curlew

-Version:        0.2.2

+Version:        0.2.3

 Release:        0

 Summary:        Multimedia converter

 License:        Waqf

-Group:          Productivity/Multimedia/Video/Convertors

+Group:          Productivity/Multimedia/Video/Editors and Convertors

 Url:            http://sourceforge.net/projects/curlew/

 Source0:        http://sourceforge.net/projects/curlew/files/curlew-%{version}/%{name}-%{version}.tar.gz

 # PATCH-FIX-OPENSUSE sitelib.patch avvissu@yandex.ru -- Change path to files (use site-packages)

-Patch0:         curlew-0.2.2_sitelib.patch

+Patch0:         curlew-0.2.3_sitelib.patch

+BuildRequires:  dbus-1-python3

 BuildRequires:  hicolor-icon-theme

 BuildRequires:  intltool

 BuildRequires:  python3-base >= 3.3.2

 BuildRequires:  python3-gobject >= 3.12.0

 BuildRequires:  python3-setuptools

 BuildRequires:  rsvg-view

+BuildRequires:  typelib-1_0-Gtk-3_0 >= 3.12.0

 BuildRequires:  update-desktop-files

 Requires:       dbus-1-python3

 Requires:       ffmpeg

 Requires:       mediainfo

 Requires:       mencoder

 Requires:       python3-gobject

-Requires:       typelib(Gtk) = 3.0

+Requires:       typelib-1_0-Gtk-3_0 >= 3.12.0

 Requires:       xdg-utils

 # Conflict with ffmpeg

 #Requires:       libav-tools

@@ -62,17 +64,14 @@

   - Combine subtitle with video file.

   - Show error details if exist.

   - And more ...

-  

+

 %lang_package

 %prep

 %setup -q

 %patch0 -p1

-# Set mplayer as the default player

-sed -i '/self.player/s/avplay/mplayer/' $(grep -rl 'avplay')

-

-# Fix spurious-executable-perm

+# Fix: spurious-executable-perm

 find . -type f -perm /u+x -exec chmod 644 {} \; || :

 %build

@@ -80,9 +79,7 @@

 %install

 python3 setup.py install --root=%{buildroot}

-

 %suse_update_desktop_file -r %{name} AudioVideo Video AudioVideoEditing

-

 %find_lang %{name}

 %post

@@ -94,12 +91,12 @@

 %desktop_database_postun

 %files

+%defattr(-,root,root)

 %doc LICENSE* AUTHORS ChangeLog README

 %{_bindir}/%{name}

 %{_datadir}/%{name}/

 %{_datadir}/applications/%{name}.desktop

-%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg

-%{_datadir}/icons/hicolor/*/apps/%{name}.png

+%{_datadir}/icons/hicolor/*/apps/%{name}.??g

 %{python3_sitelib}/%{name}-*.egg-info

 %{python3_sitelib}/%{name}/

​

@@ -1,160 +0,0 @@

-diff -U 3 -dHrN curlew-0.2.2.orig/curlew curlew-0.2.2/curlew

---- curlew-0.2.2.orig/curlew   2016-03-07 13:52:48.000000000 +0300

-+++ curlew-0.2.2/curlew    2016-03-14 15:02:59.504346113 +0300

-@@ -1,9 +1,5 @@

- #!/usr/bin/env python3

- 

--from site import addsitedir

--addsitedir('/usr/share/curlew')

--addsitedir('/usr/local/share/curlew')

--

- import sys

--from modules.curlew import main

-+from curlew.curlew import main

- main(*sys.argv[1:])

-diff -U 3 -dHrN curlew-0.2.2.orig/modules/codecs.py curlew-0.2.2/modules/codecs.py

---- curlew-0.2.2.orig/modules/codecs.py    2016-03-10 16:19:55.000000000 +0300

-+++ curlew-0.2.2/modules/codecs.py 2016-03-14 15:04:47.898214293 +0300

-@@ -21,7 +21,7 @@

- gi.require_version('Gtk', '3.0')

- 

- from gi.repository import Gtk, Pango

--from modules.functions import get_available_codecs

-+from curlew.functions import get_available_codecs

- 

- class CodecsDialog(Gtk.Dialog):

-     def __init__(self, prnt, encoder, title, headerbar):

-diff -U 3 -dHrN curlew-0.2.2.orig/modules/configs.py curlew-0.2.2/modules/configs.py

---- curlew-0.2.2.orig/modules/configs.py   2016-03-08 19:41:33.000000000 +0300

-+++ curlew-0.2.2/modules/configs.py    2016-03-14 15:08:07.496466859 +0300

-@@ -19,7 +19,7 @@

- 

- 

- from gi.repository import GLib

--from modules.consts import CONF_FILE

-+from curlew.consts import CONF_FILE

- 

- GROUP = 'configs'

- 

-diff -U 3 -dHrN curlew-0.2.2.orig/modules/consts.py curlew-0.2.2/modules/consts.py

---- curlew-0.2.2.orig/modules/consts.py    2016-03-07 13:52:48.000000000 +0300

-+++ curlew-0.2.2/modules/consts.py 2016-03-14 15:05:41.710010707 +0300

-@@ -26,7 +26,7 @@

- CONF_FILE = join(CONF_PATH, 'curlew.cfg')

- 

- PKG_DIR = dirname(realpath(__file__))

--DTA_DIR = join(PKG_DIR, '../')

-+DTA_DIR = join(PKG_DIR, '../../../../share/curlew')

- 

- ORG_FFILE = join(DTA_DIR, 'formats.cfg')

- USR_FFILE = join(CONF_PATH, 'formats.cfg')

-diff -U 3 -dHrN curlew-0.2.2.orig/modules/curlew.py curlew-0.2.2/modules/curlew.py

---- curlew-0.2.2.orig/modules/curlew.py    2016-03-12 00:37:11.000000000 +0300

-+++ curlew-0.2.2/modules/curlew.py 2016-03-14 15:08:07.536464240 +0300

-@@ -38,23 +38,23 @@

-     from gi.repository import Gtk, GLib, Gdk, GObject, GdkPixbuf, Gio

-     import dbus.glib, dbus.service

-     

--    from modules.customwidgets import LabeledHBox, TimeLayout, HScale, \

-+    from curlew.customwidgets import LabeledHBox, TimeLayout, HScale, \

-     SpinsFrame, LabeledGrid, ComboWithEntry, ButtonWithIcon

--    from modules.about import About

--    from modules.functions import show_message, get_format_size, \

-+    from curlew.about import About

-+    from curlew.functions import show_message, get_format_size, \

-     duration_to_time, time_to_duration, check_codec

--    from modules.logdialog import LogDialog

--    from modules.tray import StatusIcon

--    from modules.languages import LANGUAGES

--    from modules.favdialog import Favorite

--    from modules.waitdialog import WaitDialog

--    from modules.fileinfos import FileInfos

--    from modules.formats import Formats

--    from modules.infobars import InfoBar

--    from modules.codecs import CodecsDialog

--    from modules.consts import CONF_PATH, HOME, CONF_FILE, DTA_DIR, \

-+    from curlew.logdialog import LogDialog

-+    from curlew.tray import StatusIcon

-+    from curlew.languages import LANGUAGES

-+    from curlew.favdialog import Favorite

-+    from curlew.waitdialog import WaitDialog

-+    from curlew.fileinfos import FileInfos

-+    from curlew.formats import Formats

-+    from curlew.infobars import InfoBar

-+    from curlew.codecs import CodecsDialog

-+    from curlew.consts import CONF_PATH, HOME, CONF_FILE, DTA_DIR, \

-     ORG_FFILE, USR_FFILE

--    from modules.configs import get_b_config

-+    from curlew.configs import get_b_config

- except Exception as e:

-     print(e)

-     sys.exit(1)

-@@ -72,7 +72,7 @@

- 

- # Localization.

- DOMAIN = 'curlew'

--LOCALDIR = join(DTA_DIR, 'locale')

-+LOCALDIR = join(DTA_DIR, '../locale')

- gettext.install(DOMAIN, LOCALDIR)

- 

- # Create ".curlew" folder if not exist

-diff -U 3 -dHrN curlew-0.2.2.orig/modules/edition.py curlew-0.2.2/modules/edition.py

---- curlew-0.2.2.orig/modules/edition.py   2016-03-11 19:29:53.000000000 +0300

-+++ curlew-0.2.2/modules/edition.py    2016-03-14 15:08:07.492467120 +0300

-@@ -24,9 +24,9 @@

- 

- from gi.repository import Gtk, GLib

- 

--from modules.customwidgets import LabeledGrid, ButtonWithIcon

--from modules.consts import CONF_FILE, ORG_FFILE

--from modules.functions import show_message

-+from curlew.customwidgets import LabeledGrid, ButtonWithIcon

-+from curlew.consts import CONF_FILE, ORG_FFILE

-+from curlew.functions import show_message

- 

- 

- class FormatEditor(Gtk.Dialog):

-diff -U 3 -dHrN curlew-0.2.2.orig/modules/formats.py curlew-0.2.2/modules/formats.py

---- curlew-0.2.2.orig/modules/formats.py   2016-03-12 00:41:14.000000000 +0300

-+++ curlew-0.2.2/modules/formats.py    2016-03-14 15:08:07.488467381 +0300

-@@ -21,8 +21,8 @@

- gi.require_version('Gtk', '3.0')

- 

- from gi.repository import Gtk

--from modules.edition import FormatEditor

--from modules.customwidgets import ButtonWithIcon

-+from curlew.edition import FormatEditor

-+from curlew.customwidgets import ButtonWithIcon

- 

- class Formats(Gtk.Popover):

-     

-diff -U 3 -dHrN curlew-0.2.2.orig/setup.py curlew-0.2.2/setup.py

---- curlew-0.2.2.orig/setup.py 2016-03-14 12:39:44.000000000 +0300

-+++ curlew-0.2.2/setup.py  2016-03-14 15:11:55.448256414 +0300

-@@ -17,8 +17,6 @@

- doc_files  = ['LICENSE-ar.txt', 'LICENSE-en.txt', 'AUTHORS', 'THANKS', 'ChangeLog', 'README']

- data_files = [('share/applications/', ['curlew.desktop']),

-               ('share/icons/hicolor/scalable/apps', ['curlew.svg']),

--              ('share/pixmaps', ['curlew.svg']),

--              ('share/doc/curlew', doc_files),

-               ('share/curlew', ['formats.cfg']),

-               #('share/curlew', ['formats.cfg', 'ffmpeg']), # Portable version

-               ('share/curlew/modules', glob("modules/*.py"))

-@@ -58,7 +56,7 @@

-         # Generate mo files

-         call("msgfmt {} -o {}".format(po_file, mo_path), shell=True)

-     

--    locales = map(lambda i: ('share/curlew/'+i, [i+'/curlew.mo', ]), glob('locale/*/LC_MESSAGES'))

-+    locales = map(lambda i: ('share/'+i, [i+'/curlew.mo', ]), glob('locale/*/LC_MESSAGES'))

-     data_files.extend(locales)

-     

-     return 0

-@@ -168,5 +166,7 @@

-                      'Topic :: Desktop Environment :: Gnome',

-                      'Topic :: Multimedia :: Sound/Audio :: Conversion',

-                      'Topic :: Utilities'],

--      data_files=data_files

-+      data_files=data_files,

-+      packages=['curlew'],

-+      package_dir={"curlew" : "modules"}

-       )

​

@@ -0,0 +1,188 @@

+diff -ruN curlew-0.2.3.orig/curlew curlew-0.2.3/curlew

+--- curlew-0.2.3.orig/curlew   2016-03-04 16:39:47.000000000 +0300

++++ curlew-0.2.3/curlew    2017-04-22 00:12:17.920666141 +0300

+@@ -1,9 +1,5 @@

+ #!/usr/bin/env python3

+ 

+-from site import addsitedir

+-addsitedir('/usr/share/curlew')

+-addsitedir('/usr/local/share/curlew')

+-

+ import sys

+-from modules.curlew import main

++from curlew.curlew import main

+ main(*sys.argv[1:])

+diff -ruN curlew-0.2.3.orig/modules/codecs.py curlew-0.2.3/modules/codecs.py

+--- curlew-0.2.3.orig/modules/codecs.py    2017-04-20 11:31:29.000000000 +0300

++++ curlew-0.2.3/modules/codecs.py 2017-04-22 00:13:35.652887426 +0300

+@@ -21,7 +21,7 @@

+ gi.require_version('Gtk', '3.0')

+ 

+ from gi.repository import Gtk, Pango

+-from modules.functions import get_available_codecs

++from curlew.functions import get_available_codecs

+ 

+ class CodecsDialog(Gtk.Dialog):

+     def __init__(self, prnt, encoder, title, headerbar):

+diff -ruN curlew-0.2.3.orig/modules/configs.py curlew-0.2.3/modules/configs.py

+--- curlew-0.2.3.orig/modules/configs.py   2017-04-20 11:31:29.000000000 +0300

++++ curlew-0.2.3/modules/configs.py    2017-04-22 00:13:35.652887426 +0300

+@@ -19,7 +19,7 @@

+ 

+ 

+ from gi.repository import GLib

+-from modules.consts import CONF_FILE

++from curlew.consts import CONF_FILE

+ 

+ GROUP = 'configs'

+ 

+diff -ruN curlew-0.2.3.orig/modules/consts.py curlew-0.2.3/modules/consts.py

+--- curlew-0.2.3.orig/modules/consts.py    2017-04-20 11:31:29.000000000 +0300

++++ curlew-0.2.3/modules/consts.py 2017-04-22 00:14:14.996999426 +0300

+@@ -26,7 +26,7 @@

+ CONF_FILE = join(CONF_PATH, 'curlew.cfg')

+ 

+ PKG_DIR = dirname(realpath(__file__))

+-DTA_DIR = join(PKG_DIR, '../')

++DTA_DIR = join(PKG_DIR, '../../../../share/curlew')

+ 

+ SOUND_FILE = join(DTA_DIR, 'done.ogg')

+ 

+diff -ruN curlew-0.2.3.orig/modules/curlew.py curlew-0.2.3/modules/curlew.py

+--- curlew-0.2.3.orig/modules/curlew.py    2017-04-21 02:26:15.000000000 +0300

++++ curlew-0.2.3/modules/curlew.py 2017-04-22 00:17:59.627062169 +0300

+@@ -39,24 +39,24 @@

+     from gi.repository import Gtk, GLib, Gdk, GObject, GdkPixbuf, Gio

+     import dbus.glib, dbus.service

+     

+-    from modules.customwidgets import LabeledHBox, TimeLayout, HScale, \

++    from curlew.customwidgets import LabeledHBox, TimeLayout, HScale, \

+     SpinsFrame, LabeledGrid, ComboWithEntry, ButtonWithIcon

+-    from modules.about import About

+-    from modules.functions import show_message, get_format_size, \

++    from curlew.about import About

++    from curlew.functions import show_message, get_format_size, \

+     duration_to_time, time_to_duration, check_codec

+-    from modules.logdialog import LogDialog

+-    from modules.tray import StatusIcon

+-    from modules.languages import LANGUAGES

+-    from modules.favdialog import Favorite

+-    from modules.waitdialog import WaitDialog

+-    from modules.fileinfos import FileInfos

+-    from modules.formats import Formats

+-    from modules.infobars import InfoBar

+-    from modules.codecs import CodecsDialog

+-    from modules.consts import CONF_PATH, HOME, CONF_FILE, DTA_DIR, \

++    from curlew.logdialog import LogDialog

++    from curlew.tray import StatusIcon

++    from curlew.languages import LANGUAGES

++    from curlew.favdialog import Favorite

++    from curlew.waitdialog import WaitDialog

++    from curlew.fileinfos import FileInfos

++    from curlew.formats import Formats

++    from curlew.infobars import InfoBar

++    from curlew.codecs import CodecsDialog

++    from curlew.consts import CONF_PATH, HOME, CONF_FILE, DTA_DIR, \

+     ORG_FFILE, USR_FFILE, SOUND_FILE

+-    from modules.configs import get_b_config, get_s_config

+-    from modules.players import Players

++    from curlew.configs import get_b_config, get_s_config

++    from curlew.players import Players

+ except Exception as e:

+     print(e)

+     sys.exit(1)

+@@ -74,7 +74,7 @@

+ 

+ # Localization.

+ DOMAIN = 'curlew'

+-LOCALDIR = join(DTA_DIR, 'locale')

++LOCALDIR = join(DTA_DIR, '../locale')

+ gettext.install(DOMAIN, LOCALDIR)

+ 

+ # Treeview cols nbrs

+diff -ruN curlew-0.2.3.orig/modules/edition.py curlew-0.2.3/modules/edition.py

+--- curlew-0.2.3.orig/modules/edition.py   2017-04-20 11:31:29.000000000 +0300

++++ curlew-0.2.3/modules/edition.py    2017-04-22 00:13:35.640887391 +0300

+@@ -24,9 +24,9 @@

+ 

+ from gi.repository import Gtk, GLib

+ 

+-from modules.customwidgets import LabeledGrid, ButtonWithIcon

+-from modules.consts import CONF_FILE, ORG_FFILE

+-from modules.functions import show_message

++from curlew.customwidgets import LabeledGrid, ButtonWithIcon

++from curlew.consts import CONF_FILE, ORG_FFILE

++from curlew.functions import show_message

+ 

+ 

+ class FormatEditor(Gtk.Dialog):

+diff -ruN curlew-0.2.3.orig/modules/formats.py curlew-0.2.3/modules/formats.py

+--- curlew-0.2.3.orig/modules/formats.py   2017-04-20 11:49:28.000000000 +0300

++++ curlew-0.2.3/modules/formats.py    2017-04-22 00:13:35.644887403 +0300

+@@ -21,8 +21,8 @@

+ gi.require_version('Gtk', '3.0')

+ 

+ from gi.repository import Gtk

+-from modules.edition import FormatEditor

+-from modules.customwidgets import ButtonWithIcon

++from curlew.edition import FormatEditor

++from curlew.customwidgets import ButtonWithIcon

+ 

+ class Formats(Gtk.Popover):

+     

+diff -ruN curlew-0.2.3.orig/modules/__init__.py curlew-0.2.3/modules/__init__.py

+--- curlew-0.2.3.orig/modules/__init__.py  2017-04-20 11:30:11.000000000 +0300

++++ curlew-0.2.3/modules/__init__.py   2017-04-22 00:13:35.640887391 +0300

+@@ -19,7 +19,7 @@

+ 

+ from gi.repository import GLib

+ 

+-from modules.consts import CONF_FILE, USR_FFILE, CONF_PATH

++from curlew.consts import CONF_FILE, USR_FFILE, CONF_PATH

+ from os.path import exists

+ import os

+ 

+diff -ruN curlew-0.2.3.orig/modules/players.py curlew-0.2.3/modules/players.py

+--- curlew-0.2.3.orig/modules/players.py   2017-04-20 11:31:29.000000000 +0300

++++ curlew-0.2.3/modules/players.py    2017-04-22 00:13:35.652887426 +0300

+@@ -23,8 +23,8 @@

+ from shutil import which

+ 

+ from gi.repository import Gtk

+-from modules.customwidgets import ComboWithEntry

+-from modules.configs import set_s_config

++from curlew.customwidgets import ComboWithEntry

++from curlew.configs import set_s_config

+ 

+ PLAYERS_LIST = [

+     'mpv',

+diff -ruN curlew-0.2.3.orig/setup.py curlew-0.2.3/setup.py

+--- curlew-0.2.3.orig/setup.py 2016-12-01 17:26:10.000000000 +0300

++++ curlew-0.2.3/setup.py  2017-04-22 00:19:55.035178724 +0300

+@@ -17,8 +17,6 @@

+ doc_files  = ['LICENSE-ar.txt', 'LICENSE-en.txt', 'AUTHORS', 'THANKS', 'ChangeLog', 'README']

+ data_files = [('share/applications/', ['curlew.desktop']),

+               ('share/icons/hicolor/scalable/apps', ['curlew.svg']),

+-              ('share/pixmaps', ['curlew.svg']),

+-              ('share/doc/curlew', doc_files),

+               ('share/curlew', ['formats.cfg', 'done.ogg']),

+               #('share/curlew', ['formats.cfg', 'ffmpeg']), # Portable version

+               ('share/curlew/modules', glob("modules/*.py"))

+@@ -58,7 +56,7 @@

+         # Generate mo files

+         call("msgfmt {} -o {}".format(po_file, mo_path), shell=True)

+     

+-    locales = map(lambda i: ('share/curlew/'+i, [i+'/curlew.mo', ]), glob('locale/*/LC_MESSAGES'))

++    locales = map(lambda i: ('share/'+i, [i+'/curlew.mo', ]), glob('locale/*/LC_MESSAGES'))

+     data_files.extend(locales)

+     

+     return 0

+@@ -168,5 +166,7 @@

+                      'Topic :: Desktop Environment :: Gnome',

+                      'Topic :: Multimedia :: Sound/Audio :: Conversion',

+                      'Topic :: Utilities'],

+-      data_files=data_files

++      data_files=data_files,

++      packages=['curlew'],

++      package_dir={"curlew" : "modules"}

+       )

​

@@ -1,9 +1,21 @@

-Version 0.2.1

+Version 0.2.3

+-------------

+

+* Show dialog in the first install to choose the favorite player.

+* Added "German" translation (by Rainer Peichl).

+* Fix infobar hiding (workaround https://bugzilla.gnome.org/show_bug.cgi?id=710888).

+* Stop player on exit.

+* Add an option for bad-index files (AVI,M2V,TS,dump-stream MPEG).

+* Don't start the conversion if codecs are missing.

+* Accept folder as argument and only add audio/video mimetypes.

+* Updated Spanish translation.

+

+Version 0.2.2

 -------------

 * Added -Use CSD- option, to enable/disable HeaderBar.  

 * Limited Favorite list to only 10 elements.

-* Fixed bug when add files/folders contains special caracters.

+* Fixed bug when add files/folders contains special characters.

 * Updated translations and some other changes.

 Version 0.2.1

​

@@ -1,6 +1,6 @@

 Metadata-Version: 1.1

 Name: curlew

-Version: 0.2.2

+Version: 0.2.3

 Summary: Easy to use multimedia converter in Linux

 Home-page: http://sourceforge.net/projects/curlew

 Author: Fayssal Chamekh

@@ -13,7 +13,7 @@

         - Hide the advanced options with the ability to show them.

         - Convert to more than 100 different formats.

         - Allow to edit formats.

-        - Shutdown or suspend PC afer a conversion process.

+        - Shutdown or suspend PC after a conversion process.

         - Show file informations (duration, remaining time, estimated size, progress value).

         - Show file details using mediainfo.

         - Allow to skip or remove file during conversion process.

​

@@ -13,7 +13,7 @@

 - Hide the advanced options with the ability to show them.

 - Convert to more than 100 different formats.

 - Allow to edit formats.

-- Shutdown or suspend PC afer a conversion process.

+- Shutdown or suspend PC after a conversion process.

 - Show file informations (duration, remaining time, estimated size, progress value).

 - Show file details using mediainfo.

 - Allow to skip or remove file during conversion process.

@@ -35,6 +35,7 @@

     - python3-gi >= 3.12

     - python3-dbus

     - gir1.2-gtk-3.0 >> 3.12

+    - gir1.2-gstreamer-1.0

     - libav-tools >= 0.8 (or ffmpeg)

     - libavcodec-extra (Ubuntu/Debian)

     - xdg-utils

​

@@ -5,6 +5,9 @@

     Ehab El-Gedawy <ehabsas@gmail.com>

     Ken <lxgator@gmail.com>

     Andrej Kvasnica <andrej@gmail.com>

+    OLEG N <legon1@yandex.ru>

+    Matteo Alessio Carrara <sw.matteoac@gmail.com>

+    Booker <bookletchoir@mailbox.org>

 Translators:

@@ -12,15 +15,24 @@

     Basque: Alexander Gabilondo <alexgabi@irakasle.net>

     Traditional Chinese: by taijuin <taijuin@gmail.com>

     Czech: Pavel Fric <pavelfric@seznam.cz>

-    Italian: by bersil <bmsavone@gmail.com>

+    German: Rainer Peichl <peichl.rainer@gmail.com>

+    Italian: bersil <bmsavone@gmail.com>

     Nederlands: JohnV

     Polish: Daniel Napora <napcok@gmail.com>

     Português - Brazil: by vagner <vagner.unix@gmail.com>

-    Serbian: by Ch_Brozović <chajbo@ro.ru>

-    Spanish: by bersil <bmsavone@gmail.com>

+    Serbian: Ch_Brozović <chajbo@ro.ru>

+    Spanish: bersil <bmsavone@gmail.com>, Toni Estévez <toni.estevez@gmail.com>

     Russian: VitalD <vitald@ro.ru>

 Designers:

 ----------

    Smail <kungfu07mail@gmail.com>

+

+

+Others:

+-------

+    Curlew sound: Pete Smith <petesoundrecordist@gmail.com>

+

+

+

​

@@ -5,7 +5,8 @@

 * Prevent to duplicate file in the same session.

 Changes:

-* Use GLib.spawn_* functions instead of subprocess

+

 Features:

-* ...

+* Added GIF support.

+

​

@@ -14,7 +14,7 @@

    height="128"

    id="svg2"

    version="1.1"

-   inkscape:version="0.48.4 r9939"

+   inkscape:version="0.91 r13725"

    sodipodi:docname="curlew.svg">

   <defs

      id="defs4">

@@ -35,9 +35,9 @@

       <stop

          id="stop4147"

          offset="0"

-         style="stop-color:#0197fd;stop-opacity:1" />

+         style="stop-color:#68b9ff;stop-opacity:1" />

       <stop

-         style="stop-color:#f47f88;stop-opacity:1;"

+         style="stop-color:#ffb380;stop-opacity:1"

          offset="1"

          id="stop4231" />

     </linearGradient>

@@ -446,15 +446,15 @@

      inkscape:pageopacity="0.0"

      inkscape:pageshadow="2"

      inkscape:zoom="3.7730777"

-     inkscape:cx="-3.4698748"

-     inkscape:cy="62.315095"

+     inkscape:cx="83.064256"

+     inkscape:cy="59.929776"

      inkscape:document-units="px"

      inkscape:current-layer="g3912"

      showgrid="false"

      inkscape:window-width="1600"

-     inkscape:window-height="841"

-     inkscape:window-x="-2"

-     inkscape:window-y="-3"

+     inkscape:window-height="832"

+     inkscape:window-x="0"

+     inkscape:window-y="31"

      inkscape:window-maximized="1"

      inkscape:snap-to-guides="false"

      inkscape:snap-bbox="false" />

@@ -489,14 +489,14 @@

          inkscape:connector-curvature="0"

          id="rect3936"

          d="m 12.511647,934.09138 c -3.0336958,0 -5.4913034,2.42807 -5.4913034,5.46176 l 0,98.48926 c 0,3.0336 2.4576076,5.4616 5.4913034,5.4616 l 102.976713,0 c 3.03367,0 5.4913,-2.428 5.4913,-5.4616 l 0,-98.48926 c 0,-3.03369 -2.45763,-5.46176 -5.4913,-5.46176 l -102.976713,0 z"

-         style="fill:#000000;fill-opacity:1;stroke:#333333" />

+         style="fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a" />

       <path

-         transform="translate(0,924.36218)"

          id="path4130"

          d="M 12.5 9.53125 C 9.4663042 9.53125 7.03125 11.96631 7.03125 15 L 7.03125 99 C 9.4230337 98.739784 12.123492 98.688625 14.09375 99.4375 C 15.681507 100.041 17.669365 101.51385 19.125 102.34375 C 26.467939 106.53025 40.773799 102.65625 48.59375 102.65625 C 54.569389 102.65625 63.589121 106.7616 69.375 104.5625 C 70.599109 104.0972 71.279585 102.3389 72.46875 102 C 78.688788 100.2268 85.610361 98.8402 91.25 95.625 C 94.974527 93.5015 99.934278 95.1668 103.625 93.0625 C 104.93203 92.3173 104.89455 90.74215 105.5625 89.21875 C 107.36905 85.09895 110.63814 86.16275 113.71875 84.40625 C 114.8176 83.779874 118.59065 80.628268 120.96875 79.4375 L 120.96875 15 C 120.96875 11.96631 118.53367 9.53125 115.5 9.53125 L 12.5 9.53125 z "

-         style="fill:url(#linearGradient4136);fill-opacity:1;stroke:#333333" />

+         style="fill:url(#linearGradient4136);fill-opacity:1;stroke:#1a1a1a"

+         transform="translate(0,924.36218)" />

       <path

-         style="fill:#000000;fill-opacity:1;stroke:none"

+         style="fill:#1a1a1a;fill-opacity:1;stroke:none"

          d="m 49.31123,1028.4445 c -2.515551,-1.245 -3.010151,-1.9139 -1.915679,-2.5903 1.335432,-0.8257 0.571333,-5.623 -1.754995,-11.019 -2.286771,-5.3043 -2.317921,-5.4675 -1.266562,-6.6405 2.454124,-2.7382 2.327148,-2.8916 -2.043609,-2.4688 -12.136761,1.1735 -14.268429,1.5537 -18.456789,3.2934 -5.516121,2.2911 -10.075981,3.6557 -10.075981,3.0152 0,-0.2715 0.729427,-0.6984 1.620952,-0.9484 l 1.620952,-0.454 -1.718741,-0.3467 c -1.713991,-0.3452 -1.709101,-0.3526 1.768311,-2.6469 1.917883,-1.2654 7.333139,-6.0909 12.033907,-10.7232 8.45654,-8.33294 17.208812,-15.28845 22.808786,-18.12615 1.676802,-0.84973 3.189122,-2.11727 3.598771,-3.01635 0.388613,-0.85289 0.706569,-4.02235 0.706569,-7.04317 0,-6.40362 0.871099,-8.10587 4.74148,-9.26546 2.162304,-0.64788 2.517425,-0.57281 5.209358,1.10056 1.793248,1.11473 4.086748,1.94433 6.047378,2.18735 7.814632,0.96867 14.334892,3.09708 15.559842,5.07911 0.22073,0.35713 -0.36906,0.25095 -1.31064,-0.23597 -5.10038,-2.63754 -15.050672,-3.58209 -18.832042,-1.78772 -3.092989,1.46772 -3.334709,2.39715 -2.240123,8.61367 1.484677,8.43215 0.439588,15.16359 -3.068248,19.76259 -0.842907,1.1052 -3.135933,3.18974 -5.09561,4.63264 -1.959683,1.4427 -3.908392,3.2886 -4.330463,4.1023 -0.422074,0.8134 -1.279099,2.1298 -1.904504,2.9249 -0.977994,1.2434 -1.145814,2.4883 -1.1994,8.8985 -0.03925,4.6965 0.180322,7.7451 0.593689,8.2433 0.360792,0.4344 0.491355,1.4461 0.29014,2.2482 -0.410691,1.6359 0.886882,2.6839 3.324702,2.6839 0.769831,0 1.914564,0.3889 2.543861,0.865 1.055803,0.7987 0.916538,0.867 -1.803012,0.8837 -1.840762,0.018 -3.887648,-0.4473 -5.4523,-1.2217 z m -1.384469,-15.4108 c -0.03164,-1.0538 0.136058,-3.0428 0.372691,-4.4208 0.483283,-2.8141 -0.258569,-3.3387 -1.483933,-1.049 -0.923567,1.7256 -0.936546,4.4746 -0.02914,6.1702 0.910685,1.7012 1.207028,1.5194 1.14038,-0.7004 z"

          id="path3850"

          inkscape:connector-curvature="0" />

​

@@ -1607,6 +1607,12 @@

 cmd = -crf 15.0 -coder 1 -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8 -me_method hex -subq 6 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 8 -refs 16 -trellis 2 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -threads 0

 ext = mov

+[AVI - Unpack DivX-style packed B-frames]

+type = copy

+ext = None

+flag = custom

+extra = -vbsf mpeg4_unpack_bframes -vtag XVID

+

 [Copy Mode]

​

@@ -1,1 +1,35 @@

+# -*- coding: utf-8 -*-

+

+# Curlew - Easy to use multimedia converter

+#

+# Copyright (C) 2012-2017 Fayssal Chamekh <chamfay@gmail.com>

+#

+# Released under terms on waqf public license.

+#

+# Curlew is free software; you can redistribute it and/or modify it 

+# under the terms of the latest version waqf public license as published by 

+# ojuba.org.

+#

+# Curlew is distributed in the hope that it will be useful, but WITHOUT 

+# ANY WARRANTY; without even the implied warranty 

+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

+#        

+# The latest version of the license can be found on:

+# http://waqf.ojuba.org/license

+

+from gi.repository import GLib

+

+from modules.consts import CONF_FILE, USR_FFILE, CONF_PATH

+from os.path import exists

+import os

+

+# Create ".curlew" folder if not exist

+if not exists(CONF_PATH): os.mkdir(CONF_PATH)

+

+# Create empty config file (curlew.cfg).

+if not exists(CONF_FILE):

+    conf = GLib.KeyFile()

+    conf.set_string('configs', 'formats_file', USR_FFILE)

+    conf.save_to_file(CONF_FILE)

+    conf.unref()

​

@@ -2,7 +2,7 @@

 # Curlew - Easy to use multimedia converter

 #

-# Copyright (C) 2012-2016 Fayssal Chamekh <chamfay@gmail.com>

+# Copyright (C) 2012-2017 Fayssal Chamekh <chamfay@gmail.com>

 #

 # Released under terms on waqf public license.

 #

@@ -24,7 +24,7 @@

 PROGRAMMER = 'Fayssal Chamekh <chamfay@gmail.com>'

 WEBSITE = 'http://sourceforge.net/projects/curlew'

-VERSION='0.2.2'

+VERSION = '0.2.3'

 class About(Gtk.AboutDialog):

@@ -32,7 +32,7 @@

         Gtk.AboutDialog.__init__(self, parent=parent, wrap_license=True)

         self.set_program_name(_('Curlew'))

         self.set_authors([PROGRAMMER, 'Ehab El-Gedawy <ehabsas@gmail.com>', 'Andrej Kvasnica <andrej@gmail.com>'])

-        self.set_copyright("Copyright © 2012-2016 Fayssal Chamekh <chamfay@gmail.com>")

+        self.set_copyright("Copyright © 2012-2017 Fayssal Chamekh <chamfay@gmail.com>")

         self.set_version(VERSION)

         self.set_title(_('About Curlew'))

         self.set_logo_icon_name('curlew')

​

@@ -2,7 +2,7 @@

 # Curlew - Easy to use multimedia converter

 #

-# Copyright (C) 2012-2016 Fayssal Chamekh <chamfay@gmail.com>

+# Copyright (C) 2012-2017 Fayssal Chamekh <chamfay@gmail.com>

 #

 # Released under terms on waqf public license.

 #

​

@@ -2,7 +2,7 @@

 # Curlew - Easy to use multimedia converter

 #

-# Copyright (C) 2012-2016 Fayssal Chamekh <chamfay@gmail.com>

+# Copyright (C) 2012-2017 Fayssal Chamekh <chamfay@gmail.com>

 #

 # Released under terms on waqf public license.

 #

@@ -39,6 +39,23 @@

         pass

     return bool_value

+def set_s_config(key, value):

+    conf = GLib.KeyFile()

+    conf.load_from_file(CONF_FILE, GLib.KeyFileFlags.NONE)

+    conf.set_string(GROUP, key, value)

+    conf.save_to_file(CONF_FILE)

+

+def get_s_config(key):

+    str_value = ''

+    try:

+        conf = GLib.KeyFile()

+        conf.load_from_file(CONF_FILE, GLib.KeyFileFlags.NONE)

+        str_value = conf.get_string(GROUP, key)

+    except:

+        pass

+    return str_value

+

+

​

@@ -2,7 +2,7 @@

 # Curlew - Easy to use multimedia converter

 #

-# Copyright (C) 2012-2016 Fayssal Chamekh <chamfay@gmail.com>

+# Copyright (C) 2012-2017 Fayssal Chamekh <chamfay@gmail.com>

 #

 # Released under terms on waqf public license.

 #

@@ -28,6 +28,8 @@

 PKG_DIR = dirname(realpath(__file__))

 DTA_DIR = join(PKG_DIR, '../')

+SOUND_FILE = join(DTA_DIR, 'done.ogg')

+

 ORG_FFILE = join(DTA_DIR, 'formats.cfg')

 USR_FFILE = join(CONF_PATH, 'formats.cfg')

​

@@ -2,7 +2,7 @@

 # Curlew - Easy to use multimedia converter

 #

-# Copyright (C) 2012-2016 Fayssal Chamekh <chamfay@gmail.com>

+# Copyright (C) 2012-2017 Fayssal Chamekh <chamfay@gmail.com>

 #

 # Released under terms on waqf public license.

 #

@@ -20,6 +20,7 @@

 from configparser import ConfigParser

 import gettext

+import mimetypes

 import os

 from os.path import basename, isdir, splitext, join, dirname, realpath, \

 isfile, exists, getsize, abspath

@@ -53,8 +54,9 @@

     from modules.infobars import InfoBar

     from modules.codecs import CodecsDialog

     from modules.consts import CONF_PATH, HOME, CONF_FILE, DTA_DIR, \

-    ORG_FFILE, USR_FFILE

-    from modules.configs import get_b_config

+    ORG_FFILE, USR_FFILE, SOUND_FILE

+    from modules.configs import get_b_config, get_s_config

+    from modules.players import Players

 except Exception as e:

     print(e)

     sys.exit(1)

@@ -75,9 +77,6 @@

 LOCALDIR = join(DTA_DIR, 'locale')

 gettext.install(DOMAIN, LOCALDIR)

-# Create ".curlew" folder if not exist

-if not exists(CONF_PATH): os.mkdir(CONF_PATH)

-

 # Treeview cols nbrs

 C_SKIP = 0  # Skip (checkbox)

 C_NAME = 1  # File name

@@ -116,6 +115,17 @@

         dlg.show_dialog()

         return True

+    def play_sound(self, sfile):

+        try:

+            gi.require_version('Gst', '1.0')

+            from gi.repository import Gst

+            Gst.init()

+            pl = Gst.ElementFactory.make("playbin", "player")

+            pl.set_property('uri', 'file://' + sfile)

+            pl.set_state(Gst.State.PLAYING)

+        except Exception as e:

+            print(e)

+    

     def on_select_fav(self, action, param, item):

         sele_fmt = item.get_attribute_value(Gio.MENU_ATTRIBUTE_LABEL).get_string()

@@ -141,12 +151,12 @@

         # limit fav list to 10 elmnts

         if len(fav_list) > 9:

-            print('Favorite list number is limited to 10.')

+            print('Favorite list number is limited to only 10 elements.')

             return

         # format already exist

         if fav_format in fav_list:

-            print('Format already exsit!')

+            print('Format "{}" already exist in favorite list!'.format(fav_format))

             return

         fav_list.append(fav_format)

@@ -222,6 +232,7 @@

         self.counter = 20

         self.errs_nbr = 0

         self.pass_nbr = 0

+        self.play_process = None

         '''

         self.pass_nbr = 0: Single pass encoding option

@@ -230,7 +241,7 @@

         '''

         self.encoder = ''

-        self.player = 'avplay'

+        self.player  = ''

         self.is_preview = False

         self._start_time = None

@@ -260,7 +271,6 @@

         self.csd = get_b_config('use-csd')

         if self.csd:

-            self.header.set_title(_('Curlew'))

             self.header.set_show_close_button(True)

             self.set_titlebar(self.header)

         else:

@@ -270,6 +280,7 @@

         self.info_bar = InfoBar()

         vbox_global.pack_start(self.info_bar, False, False, 0)

+        

         # Add File/Folder buttons

         box_add = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)

         Gtk.StyleContext.add_class(box_add.get_style_context(), "linked")

@@ -320,7 +331,6 @@

         self.btn_convert = Gtk.Button(_('Convert'))

         self.btn_convert.set_tooltip_text(_('Start Conversion'))

-        self.btn_convert.set_size_request(60, 1)

         self.btn_convert.connect('clicked', self.on_convert_cb)

         box_convert.pack_start(self.btn_convert, False, False, 0)

@@ -612,6 +622,11 @@

         self.cb_video_only.connect('toggled', self.on_cb_video_only_toggled)

         hbox.pack_start(self.cb_video_only, False, False, 0)

+        # Fix for bad index file

+        self.cb_bad_indx = Gtk.CheckButton(_('Fix bad index'))

+        self.cb_bad_indx.set_tooltip_text("")

+        hbox.pack_start(self.cb_bad_indx, False, False, 0)

+        

         self.vb_video.pack_start(Gtk.Separator(), False, False, 0)

         # Video quality for ogv

@@ -789,6 +804,12 @@

         self.cmb_encoder.set_active(0)

+        

+        # Check player

+        if not get_s_config('player'):

+            player_dlg = Players(self)

+            self.entry_player.set_text(player_dlg.show_dialog())

+        

         #--- Configuration page

         self.vb_config = Gtk.Box(spacing=4, border_width=5, orientation=Gtk.Orientation.VERTICAL)

         self.note.append_page(self.vb_config, Gtk.Label(_('Configs')))

@@ -834,6 +855,10 @@

         self.cb_suspend.connect('toggled', self.on_cb_suspend_toggled)

         self.vb_config.pack_start(self.cb_suspend, False, False, 0)

+        # Play sound after conversion

+        self.cb_play = Gtk.CheckButton(_('Play sound after finish'))

+        self.vb_config.pack_start(self.cb_play, False, False, 0)

+        

         # Output page

         self.vb_output = Gtk.Box(spacing=4, border_width=5, orientation=Gtk.Orientation.VERTICAL)

         grid_output = LabeledGrid(self.vb_output)

@@ -924,7 +949,27 @@

         self.trayico.set_visible(self.cb_tray.get_active())

         if files_list:

-            self.add_files(*files_list)

+            media_files = []

+

+            for entry in files_list:

+                if os.path.isdir(entry):

+                    # Get all files with mimetype and avoid args like `dir/*`

+                    dir_files = [[os.path.realpath(entry) + "/" + name, mimetypes.guess_type(name)[0]] \

+                                 for name in os.listdir(entry)]

+

+                    # Add to main list

+                    media_files += dir_files

+                elif os.path.isfile(entry):

+                    media_files.append([os.path.realpath(entry), mimetypes.guess_type(entry)[0]])

+

+            # Drop NoneType from list

+            media_files = [[name, mime] for name, mime in media_files \

+                           if mime is not None]

+

+            # Filter video/audio mimetypes

+            media_files = [name for name, mime in media_files \

+                           if "video" in mime or "audio" in mime]

+            self.add_files(*media_files)

     def on_toggled_cb(self, widget, Path):

         self.store[Path][C_SKIP] = not self.store[Path][C_SKIP]        

@@ -948,6 +993,12 @@

     def quit_cb(self, *args):

         self.save_states()

+        

+        # Stop playing.

+        if self.play_process != None:

+            if self.play_process.poll() == None:

+                self.play_process.kill()

+        

         if self.is_converting:

             ''' Press quit btn during conversion process '''

             resp = show_message(self, _('Do you want to quit Curlew and \

@@ -1191,6 +1242,10 @@

         cmd = [self.encoder, '-y']  # , '-xerror']

+        # Bad index

+        if self.cb_bad_indx.get_active():

+            cmd.extend(['-fflags','+igndts+genpts'])

+        

         if start_pos != '-1' and part_dura != '-1':

             cmd.extend(['-ss', start_pos])

@@ -1322,6 +1377,7 @@

         #--- Last

         cmd.append(out_file)

+        print(' '.join(cmd))

         return cmd

     #--- Convert funtcion

@@ -1344,6 +1400,21 @@

             self.note.set_current_page(6)

             return

+        # Invalid audio and video codecs

+        codec_txts = []

+        

+        acodec = self.c_acodec.get_active_text()

+        if not check_codec(self.encoder, acodec):

+            codec_txts = [_('"{}" audio codec not found.'.format(acodec))]

+        

+        vcodec = self.c_vcodec.get_active_text()

+        if not check_codec(self.encoder, vcodec):

+            codec_txts.append(_('"{}" video codec not found.').format(vcodec))

+        

+        if codec_txts:

+            self.info_bar.show_message('\n'.join(codec_txts))

+            return

+        

         # Show files list

         self.toggle_opts.set_active(False)

@@ -1483,7 +1554,7 @@

     #--- Stop conversion cb

-    def on_btn_stop_clicked(self, *args):        

+    def on_btn_stop_clicked(self, *args):

         if self.is_converting == True:

             resp = show_message(self,

                                 _('Do you want to stop conversion process?'),

@@ -1601,9 +1672,14 @@

     def on_play_cb(self, *args):

         if self.get_selected_iters():

             Iter = self.get_selected_iters()[0]

-            GLib.spawn_command_line_async('{} "{}"'.

-                                          format(self.player,

-                                                 self.store[Iter][C_FILE]))

+            

+            # Kill previous process.

+            if self.play_process != None:

+                if self.play_process.poll() == None:

+                    self.play_process.kill()

+            

+            cmd = [self.player, '{}'.format(self.store[Iter][C_FILE])]

+            self.play_process = Popen(cmd, universal_newlines=True, bufsize=-1)

     def on_browse_src_cb(self, widget):

         sel_iter = self.get_selected_iters()[0]

@@ -1769,6 +1845,9 @@

         if self.tree_iter == None:

             self.enable_controls(True)

             self.label_details.set_text('')

+            # Play sound

+            if self.cb_play.get_active() and err_code==0:

+                self.play_sound(SOUND_FILE)

             # Shutdown system

             if self.cb_halt.get_active():

                 self.shutdown()

@@ -1960,7 +2039,7 @@

         conf.set_boolean(group, 'is_same_dest', self.cb_dest.get_active())

         conf.set_integer(group, 'overwrite_mode', self.cmb_exist.get_active())

         conf.set_string(group, 'encoder', self.cmb_encoder.get_active_text())

-        conf.set_string(group, 'player', self.player)

+        conf.set_string(group, 'player', self.entry_player.get_text())

         conf.set_string(group, 'font', self.b_font.get_font_name())

         conf.set_string(group, 'encoding', self.cmb_encoding.get_active_id())  #

         conf.set_boolean(group, 'side_bar', self.cb_sideb.get_active())

@@ -1970,6 +2049,9 @@

         conf.set_boolean(group, 'video_2pass', self.cb_2pass.get_active())

         conf.set_boolean(group, 'video_video_only', self.cb_video_only.get_active())

+        # play sound

+        conf.set_boolean(group, 'play-sound', self.cb_play.get_active())

+        

         # csd

         conf.set_boolean(group, 'use-csd', self.cb_csd.get_active())

@@ -2014,6 +2096,9 @@

             self.cb_2pass.set_active(conf.get_boolean(group, 'video_2pass'))

             self.cb_video_only.set_active(conf.get_boolean(group, 'video_video_only'))

+            # play sound

+            self.cb_play.set_active(conf.get_boolean(group, 'play-sound'))

+            

             # csd

             self.cb_csd.set_active(conf.get_boolean(group, 'use-csd'))

@@ -2041,9 +2126,9 @@

         conf = GLib.KeyFile()

         try:

             conf.load_from_file(CONF_FILE, GLib.KeyFileFlags.NONE)

+            lang_name = conf.get_string('configs', 'language')

         except: return

-        lang_name = conf.get_string('configs', 'language')

         # System language

         if lang_name == '< System >':

​

@@ -2,7 +2,7 @@

 # Curlew - Easy to use multimedia converter

 #

-# Copyright (C) 2012-2016 Fayssal Chamekh <chamfay@gmail.com>

+# Copyright (C) 2012-2017 Fayssal Chamekh <chamfay@gmail.com>

 #

 # Released under terms on waqf public license.

 #

​

@@ -2,7 +2,7 @@

 # Curlew - Easy to use multimedia converter

 #

-# Copyright (C) 2012-2016 Fayssal Chamekh <chamfay@gmail.com>

+# Copyright (C) 2012-2017 Fayssal Chamekh <chamfay@gmail.com>

 #

 # Released under terms on waqf public license.

 #

@@ -134,7 +134,7 @@

                  'video':   [True, True, True, True, True, True, True, True, True],

                  'presets': [False, False, False, False, False, False, False, False, False],

                  'copy': [False, False, False, False, False, False, False, False, False]

-                 }

+                }

         self.entry_ab.set_sensitive(sens[media_type][0])

         self.spin_def_ab.set_sensitive(sens[media_type][0])

@@ -241,6 +241,7 @@

                             use_header_bar=headerbar)

         self.set_size_request(700, 450)

         self.set_border_width(4)

+        self.set_title(_('Edition'))

         self.format = frmt

         self.store = store

@@ -251,8 +252,14 @@

             self.get_content_area().add(self.titlebar)

         self.main_win = prnt

+        self.vbox.set_spacing(6)

         grid = LabeledGrid(self.vbox)

+        # Warning

+        lbl_warn = Gtk.Label(_('<span foreground="red"><i><b>WARNING:</b> Please change these values with care!</i></span>'), use_markup=True)

+        self.vbox.pack_end(lbl_warn, False, False, 0)

+        self.vbox.pack_end(Gtk.Separator(), False, False, 0)

+        

         grid.append_title(_('Audio:'))

         self.entry_ab = Gtk.Entry()

​

@@ -2,7 +2,7 @@

 # Curlew - Easy to use multimedia converter

 #

-# Copyright (C) 2012-2016 Fayssal Chamekh <chamfay@gmail.com>

+# Copyright (C) 2012-2017 Fayssal Chamekh <chamfay@gmail.com>

 #

 # Released under terms on waqf public license.

 #

​

@@ -2,7 +2,7 @@

 # Curlew - Easy to use multimedia converter

 #

-# Copyright (C) 2012-2016 Fayssal Chamekh <chamfay@gmail.com>

+# Copyright (C) 2012-2017 Fayssal Chamekh <chamfay@gmail.com>

 #

 # Released under terms on waqf public license.

 #

​

@@ -2,7 +2,7 @@

 # Curlew - Easy to use multimedia converter

 #

-# Copyright (C) 2012-2016 Fayssal Chamekh <chamfay@gmail.com>

+# Copyright (C) 2012-2017 Fayssal Chamekh <chamfay@gmail.com>

 #

 # Released under terms on waqf public license.

 #

​

@@ -2,7 +2,7 @@

 # Curlew - Easy to use multimedia converter

 #

-# Copyright (C) 2012-2016 Fayssal Chamekh <chamfay@gmail.com>

+# Copyright (C) 2012-2017 Fayssal Chamekh <chamfay@gmail.com>

 #

 # Released under terms on waqf public license.

 #

​

@@ -2,7 +2,7 @@

 # Curlew - Easy to use multimedia converter

 #

-# Copyright (C) 2012-2016 Fayssal Chamekh <chamfay@gmail.com>

+# Copyright (C) 2012-2017 Fayssal Chamekh <chamfay@gmail.com>

 #

 # Released under terms on waqf public license.

 #

@@ -24,8 +24,7 @@

 class InfoBar(Gtk.InfoBar):

     def __init__(self):

-        Gtk.InfoBar.__init__(self)

-        self.set_show_close_button(True)

+        Gtk.InfoBar.__init__(self, show_close_button=True)