@@ -1,4 +1,24 @@

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

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

+

+- Update to 0.2.2:

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

+- Update patches:

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

+

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

+Sun Feb 28 04:04:00 UTC 2016 - avvissu@yandex.ru

+

+- Set mplayer as the default player

+

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

+Sat Feb 27 16:34:14 UTC 2016 - avvissu@yandex.ru

+

+- Update to 0.2.1:

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

+- Add a language pack

+

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

 Fri Apr 10 21:09:24 UTC 2015 - avvissu@yandex.ru

 - Initial package

​

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

 #

 # spec file for package curlew

 #

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

+# Copyright (c) 2016 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,27 +17,28 @@

 Name:           curlew

-Version:        0.1.22.3

+Version:        0.2.2

 Release:        0

 Summary:        Multimedia converter

 License:        Waqf

 Group:          Productivity/Multimedia/Video/Convertors

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

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

-# PATCH-FIX-OPENSUSE desktop.patch avvissu@yandex.ru -- Generic name of the application

-Patch0:         curlew-0.1.22.3_desktop.patch

-BuildRequires:  ImageMagick

-BuildRequires:  desktop-file-utils

+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

 BuildRequires:  hicolor-icon-theme

 BuildRequires:  intltool

-BuildRequires:  python-devel

-BuildRequires:  python-distutils-extra

-BuildRequires:  python-gobject >= 3.0

-BuildRequires:  python-setuptools

+BuildRequires:  python3-base >= 3.3.2

+BuildRequires:  python3-gobject >= 3.12.0

+BuildRequires:  python3-setuptools

+BuildRequires:  rsvg-view

+BuildRequires:  update-desktop-files

+Requires:       dbus-1-python3

 Requires:       ffmpeg

 Requires:       mediainfo

 Requires:       mencoder

-Requires:       python-gobject

+Requires:       python3-gobject

+Requires:       typelib(Gtk) = 3.0

 Requires:       xdg-utils

 # Conflict with ffmpeg

 #Requires:       libav-tools

@@ -61,47 +62,48 @@

   - 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

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

 %build

-python setup.py build

+python3 setup.py build

 %install

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

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

+

+%suse_update_desktop_file -r %{name} AudioVideo Video AudioVideoEditing

 %find_lang %{name}

 %post

 %icon_theme_cache_post

 %desktop_database_post

-# Notify user about changes

-if [ $1 -ge 2 ] ; then

-mkdir -p %{_localstatedir}/adm/update-messages

-cat > %{_localstatedir}/adm/update-messages/%{name}-%{version} << EOF

-INFO: ValueError: unsupported pickle protocol: 3

-INFO: If you are switching between python versions, you will need to 

-INFO: remove the old profile from ~/.%{name}

-EOF

-fi

 %postun

 %icon_theme_cache_postun

 %desktop_database_postun

-%files -f %{name}.lang

-%defattr(-,root,root,-)

-%doc %{_datadir}/doc/curlew

+%files

+%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

-%{python_sitelib}/Curlew

-%{python_sitelib}/%{name}-*

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

+%{python3_sitelib}/%{name}/

+

+%files lang -f %{name}.lang

+%defattr(-,root,root,-)

 %changelog

​

@@ -1,16 +0,0 @@

-diff -U 3 -H -d -r -N -- curlew-0.1.22.3.orig/curlew.desktop curlew-0.1.22.3/curlew.desktop

---- curlew-0.1.22.3.orig/curlew.desktop    2013-10-08 11:52:26.000000000 +0300

-+++ curlew-0.1.22.3/curlew.desktop 2015-04-11 01:14:51.039378764 +0300

-@@ -12,7 +12,11 @@

- Comment=Easy to use Multimedia Converter for Linux

- Comment[ar]=محول وسائط على لينكس سهل الاستخدام

- Comment[fr]=Un Convertisseur Multimédia simple à utiliser sous Linux

--Categories=AudioVideo;Video;

-+GenericName=Multimedia Converter

-+GenericName[ru]=Мультимедиа конвертер

-+GenericName[ar]=تحويل الوسائط المتعددة

-+GenericName[fr]=Convertisseur multimédia

-+Categories=AudioVideo;Video;AudioVideoEditing;

- #MimeType=audio/vorbis;audio/x-mp3;audio/x-ms-wma;audio/x-vorbis;audio/x-wav;video/x-ms-asf;audio/ogg;audio/3gpp;audio/AMR;audio/AMR-WB;video/3gpp;video/flv;video/mpeg;video/msvideo;video/x-mpeg;video/x-ms-asf;video/x-ms-wmv;video/quicktime;audio/x-realaudio;audio/x-pn-realaudio;video/vnd.rn-realvideo;audio/mp4a-latm;video/x-m4v;video/mp4;audio/x-matroska;video/x-matroska;audio/x-aiff;audio/x-monkeys-audio;video/x-m4v;audio/mp4a-latm;video/webm

- Encoding=UTF-8

- Terminal=false

​

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

+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"}

+       )

​

-(directory)

​

@@ -1,54 +0,0 @@

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

-

-# Curlew - Easy to use multimedia converter

-#

-# Copyright (C) 2012-2014 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://www.ojuba.org/wiki/doku.php/waqf/license

-

-

-from gi.repository import Gtk

-

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

-WEB_SITE = 'https://github.com/chamfay/Curlew'

-

-class About(Gtk.AboutDialog):

-    def __init__(self, parent):

-        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, 2014 Fayssal Chamekh <chamfay@gmail.com>")

-        self.set_version('0.1.22.3')

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

-        self.set_logo_icon_name('curlew')

-        self.set_icon_name('curlew')

-        self.set_comments(_('Easy to use Multimedia Converter for Linux'))

-        self.set_license("""

-Released under terms on waqf public license.

-

-This program 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.

-

-This program 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://www.ojuba.org/wiki/doku.php/waqf/license

-""")

-        self.set_website(WEB_SITE)

-        self.set_website_label(WEB_SITE)

-        self.set_translator_credits(_("translator-credits"))

-        self.set_artists([PROGRAMMER, 'Smail <kungfu07mail@gmail.com>'])

-    

-    def show(self):

-        self.run()

-        self.destroy()

​

@@ -1,2452 +0,0 @@

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

-

-# Curlew - Easy to use multimedia converter

-#

-# Copyright (C) 2012-2014 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://www.ojuba.org/wiki/doku.php/waqf/license

-

-

-try:

-    import sys

-    import os

-    import re

-    import time

-    import gettext

-    from subprocess import Popen, PIPE, call

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

-    isfile, exists, getsize

-    from os import listdir

-    from ConfigParser import ConfigParser, NoOptionError

-    from urllib import unquote

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

-    import dbus.glib, dbus.service

-    import cPickle

-    from glob import glob

-

-    from customwidgets import LabeledHBox, TimeLayout, CustomHScale, \

-    CustomToolButton, SpinsFrame, LabeledGrid, CustomComboEntry

-    from about import About

-    from functions import show_message, get_format_size, duration_to_time, \

-    time_to_duration

-    from logdialog import LogDialog

-    from tray import StatusIcon

-    from languages import LANGUAGES

-    from favdialog import Favorite

-    from waitdialog import WaitDialog

-    from fileinfos import FileInfos

-    

-except Exception as detail:

-    print(detail)

-    sys.exit(1)

-

-#--- Localization setup

-exedir = dirname(sys.argv[0])

-

-DOMAIN = 'curlew'

-LOCALDIR = ''

-

-# Curlew script (default locale)

-if isdir(join(exedir, '..', 'share/locale')):

-    LOCALDIR = join(exedir, '..', 'share/locale')

-

-# Curlew script (test)

-elif isdir(join(exedir, 'locale')):

-    LOCALDIR = join(exedir, 'locale')

-

-# curlew.py

-else:

-    LOCALDIR = join(exedir, '..', 'locale')

-    

-gettext.install(DOMAIN, LOCALDIR)

-

-

-#--- Constants

-APP_DIR = dirname(realpath(__file__))

-HOME = os.getenv("HOME")

-TEN_SECONDS = '10'

-CONF_PATH = join(HOME, '.curlew')

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

-ERROR_LOG = join(CONF_PATH, 'errors.log')

-PASS_LOG = '/tmp/pass1log'

-PASS_1_FILE = '/tmp/pass1file'

-PREVIEW_FILE = '/tmp/preview'

-IMG_PREV = '/tmp/img_prev.jpeg'

-FAV_FILE = join(CONF_PATH, 'fav.list')

-

-

-# Make .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

-C_FSIZE = 2  # File size

-C_FDURA = 3  # File duration

-C_ESIZE = 4  # Estimated output size

-C_ELAPT = 5  # Elapsed time

-C_REMN = 6  # Remaining time

-C_PRGR = 7  # Progress value

-C_STAT = 8  # Stat string

-C_PULS = 9  # Pulse

-C_FILE = 10  # complete file name /path/file.ext

-

-

-#--- Main class        

-class Curlew(Gtk.Window):    

-    

-    def __init__(self, *cmd_line_files):

-        #--- Global Variables

-        self.curr_open_folder = HOME

-        self.curr_save_folder = HOME

-        self.is_converting = False

-        self.fp = None

-        self.Iter = None

-        self.total_duration = 0.0

-        self.out_file = None

-        self.counter = 20

-        self.errs_nbr = 0

-        self.pass_nbr = 0

-        

-        '''

-        self.pass_nbr = 0: Single pass encoding option

-        self.pass_nbr = 1: Two-pass encoding option (1st pass)

-        self.pass_nbr = 2: Two-pass encoding option (2nd pass)

-        '''

-        

-        self.encoder = ''

-        self.player = 'avplay'

-        self.is_preview = False

-        self.dict_icons = {}

-        self.icons_path = ''

-        

-        self._start_time = None

-        self.elapsed_time = '0.00.00'

-        

-        self.last_format = None

-        

-        self.is_maxi = False

-        

-        #--- Regex

-        self.reg_avconv_u = \

-        re.compile('''size=\s+(\d+\.*\d*).*time=(\d+\.\d*)''')  # ubuntu

-        self.reg_avconv_f = \

-        re.compile('''size=\s+(\d+\.*\d*).*time=(\d+:\d+:\d+.\d+)''')  # fedora

-        self.reg_menc = \

-        re.compile('''.(\d+\.*\d*)s.*\((.\d+)%.*\s+(\d+)mb''')

-        self.reg_duration = \

-        re.compile('''Duration:.*(\d+:\d+:\d+\.\d+)''')

-        

-        # Install Local

-        self.install_locale()

-               

-        Gtk.Window.__init__(self)

-        #self.set_position(Gtk.WindowPosition.CENTER)

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

-        self.set_size_request(730, -1)

-        self.set_icon_name('curlew')

-        

-        #--- Global vbox

-        vbox_global = Gtk.Box(spacing=6, orientation=Gtk.Orientation.VERTICAL)

-        self.add(vbox_global)

-        

-        #--- Toolbar

-        toolbar = Gtk.Toolbar()

-        toolbar.set_style(Gtk.ToolbarStyle.ICONS)

-        toolbar.set_icon_size(Gtk.IconSize.DIALOG)

-        toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_PRIMARY_TOOLBAR);

-        vbox_global.pack_start(toolbar, False, True, 0)

-        

-        

-        #--- ToolButtons

-        # Add file toolbutton

-        self.add_file_tb = CustomToolButton('add-file', _('Add File'),

-                                       _('Add files'),

-                                       self.tb_add_file_cb, toolbar)

-        # Add folder toolbutton

-        self.add_folder_tb = CustomToolButton('add-folder', _('Add Folder'),

-                                       _('Add folders'),

-                                       self.tb_add_folder_cb, toolbar)

-        

-        # Remove toolbutton

-        self.remove_tb = CustomToolButton('remove', _('Remove'),

-                                          _('Remove files'),

-                                          self.tb_remove_cb, toolbar)

-        

-        # Clear toolbutton

-        self.clear_tb = CustomToolButton('clear', _('Clear'),

-                                         _('Clear files list'),

-                                         self.tb_clear_cb, toolbar)

-        

-        # Separator

-        toolbar.insert(Gtk.SeparatorToolItem(), -1)

-        

-        # Convert toolbutton

-        self.convert_tb = CustomToolButton('convert', _('Convert'),

-                                           _('Start Conversion'),

-                                           self.convert_cb, toolbar)

-        

​

@@ -1,245 +0,0 @@

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

-

-# Curlew - Easy to use multimedia converter

-#

-# Copyright (C) 2012-2014 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://www.ojuba.org/wiki/doku.php/waqf/license

-

-

-from gi.repository import Gtk

-from os.path import join

-

-

-class SpinsFrame(Gtk.Frame):

-    '''4 SpinButton collection'''

-    def __init__(self, title):

-        Gtk.Frame.__init__(self)

-        

-        self._top = 0

-        self._bottom = 0

-        self._left = 0

-        self._right = 0

-        self._sum = 0

-        

-        hbox = Gtk.Box(sensitive=False, spacing=4, border_width=4)

-        self.add(hbox)

-        

-        self.check_btn = Gtk.CheckButton(title)

-        self.set_label_widget(self.check_btn)

-        

-        # Adjustments

-        adj_top    = Gtk.Adjustment(0, 0, 10000, 1)

-        adj_bottom = Gtk.Adjustment(0, 0, 10000, 1)

-        adj_left   = Gtk.Adjustment(0, 0, 10000, 1)

-        adj_right  = Gtk.Adjustment(0, 0, 10000, 1)

-        

-        # Top spin

-        self.spin_top = Gtk.SpinButton(adjustment=adj_top)

-        self.spin_top.set_numeric(True)

-        hbox.pack_start(Gtk.Label(_('Top')), False, False, 0)

-        hbox.pack_start(self.spin_top, False, False, 0)

-        

-        hbox.pack_start(Gtk.VSeparator(), False, False, 8)

-        

-        # bottom spin

-        self.spin_bottom = Gtk.SpinButton(adjustment=adj_bottom)

-        self.spin_bottom.set_numeric(True)

-        hbox.pack_start(Gtk.Label(_('Bottom')), False, False, 0)

-        hbox.pack_start(self.spin_bottom, False, False, 0)

-        

-        hbox.pack_start(Gtk.VSeparator(), False, False, 8)

-        

-        # Left Spin

-        self.spin_left = Gtk.SpinButton(adjustment=adj_left)

-        self.spin_left.set_numeric(True)

-        hbox.pack_start(Gtk.Label(_('Left')), False, False, 0)

-        hbox.pack_start(self.spin_left, False, False, 0)

-        

-        hbox.pack_start(Gtk.VSeparator(), False, False, 8)

-        

-        # Right spin

-        self.spin_right = Gtk.SpinButton(adjustment=adj_right)

-        self.spin_right.set_numeric(True)

-        hbox.pack_start(Gtk.Label(_('Right')), False, False, 0)

-        hbox.pack_start(self.spin_right, False, False, 0)

-        

-        

-        # Connection

-        self.spin_top.connect('value-changed', self._on_spins_changed)

-        self.spin_bottom.connect('value-changed', self._on_spins_changed)

-        self.spin_left.connect('value-changed', self._on_spins_changed)

-        self.spin_right.connect('value-changed', self._on_spins_changed)

-        self.check_btn.connect('toggled', self._on_check_cb, hbox)

-    

-    def _on_check_cb(self, check_btn, hbox):

-        hbox.set_sensitive(check_btn.get_active())

-    

-    def _on_spins_changed(self, spin):

-        self._top = self.spin_top.get_value_as_int()

-        self._bottom = self.spin_bottom.get_value_as_int()

-        self._left = self.spin_left.get_value_as_int()

-        self._right = self.spin_right.get_value_as_int()

-        

-        self._sum = self._top + self._bottom + self._left + self._right

-    

-    def get_active(self):

-        return self.check_btn.get_active() and self._sum != 0

-    

-    def get_crop(self):

-        return 'crop=iw-{}:ih-{}:{}:{}'.format(self._left+self._right,

-                                               self._top+self._bottom,

-                                               self._left, self._top)

-    

-    def get_pad(self):

-        return 'pad=iw+{}:ih+{}:{}:{}'.format(self._left+self._right,

-                                               self._top+self._bottom,

-                                               self._left, self._top)

-    

-    

-class CustomToolButton(Gtk.ToolButton):

-    def __init__(self, name, label, tooltip, callback, toolbar):

-        

-        Gtk.ToolButton.__init__(self)

-        self._name = name + '.png'

-        self.set_tooltip_markup(tooltip)

-        self.set_label(label)

-        self.connect('clicked', callback)

-        self.set_is_important(True)

-        toolbar.insert(self, -1)

-    

-    def set_icon(self, path):

-        image_path = join(path, self._name)

-        image = Gtk.Image.new_from_file(image_path)

-        self.set_icon_widget(image)

-        

-        

-class CustomHScale(Gtk.HScale):

-    def __init__(self, container, def_value, min_value, max_value, step=1):

-        Gtk.HScale.__init__(self)

-        container.pack_start(self, True, True, 0)

-        adj = Gtk.Adjustment(def_value, min_value, max_value, step)

-        self.set_adjustment(adj)

-        self.set_value_pos(Gtk.PositionType.RIGHT)

-        self.set_digits(0)

-        

-

-class LabeledHBox(Gtk.Box):

-    def __init__(self, label, container=None):

-        ''' hbox with label'''

-        Gtk.Box.__init__(self, spacing=4)

-        _label = Gtk.Label(label, use_markup=True)

-        _label.set_alignment(0, 0.5)

-        self.pack_start(_label, False, False, 0)

-        if container != None:

-            container.pack_start(self, False, False, 0)

-

-

-class LabeledGrid(Gtk.Grid):

-    def __init__(self, container):

-        super(LabeledGrid, self).__init__()

-        self.set_column_spacing(4)

-        self.set_row_spacing(4)

-        self.set_row_homogeneous(False)

-        self._n_childs = 0

-        container.pack_start(self, False, False, 0)

-        

-    def append_row(self, label, widget, expanded=False):

-        _label = Gtk.Label(label, use_markup=True)

-        _label.set_alignment(0, 0.5)

-        _hbox = Gtk.Box()

-        _hbox.set_hexpand(True)

-        _hbox.pack_start(widget, expanded, expanded, 0)

-        self.attach(_label, 0, self._n_childs, 1, 1)

-        self.attach(_hbox, 1, self._n_childs, 1, 1)

-        self._n_childs += 1

-

-

-class TimeLayout(Gtk.Box):

-    def __init__(self, container, label):

-        '''    Time widget    '''

-        Gtk.Box.__init__(self)

-        self._spin_h = Gtk.SpinButton().new_with_range(0, 5, 1)

-        self._spin_m = Gtk.SpinButton().new_with_range(0, 59, 1)

-        self._spin_s = Gtk.SpinButton().new_with_range(0, 59, 1)

-        

-        _label = Gtk.Label(label, use_markup=True)

-        _label.set_alignment(0, 0.5)

-        _label.set_width_chars(10)

-        

-        self.pack_start(_label, False, False, 0)

-        

-        self.pack_start(self._spin_h, False, False, 3)

-        self.pack_start(Gtk.Label(label=_('hr')), False, False, 0)

-        

-        self.pack_start(Gtk.Label(6*' '), False, False, 0)

-        

-        self.pack_start(self._spin_m, False, False, 3)

-        self.pack_start(Gtk.Label(label=_('min')), False, False, 0)

-        

-        self.pack_start(Gtk.Label(6*' '), False, False, 0)

-        

-        self.pack_start(self._spin_s, False, False, 3)

-        self.pack_start(Gtk.Label(label=_('sec')), False, False, 0)

-        

-        container.pack_start(self, False, False, 0)

-    

-    def set_duration(self, duration):

-        ''' Set duration in seconds '''

​

@@ -1,105 +0,0 @@

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

-

-# Curlew - Easy to use multimedia converter

-#

-# Copyright (C) 2012-2014 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://www.ojuba.org/wiki/doku.php/waqf/license

-

-

-from gi.repository import Gtk, Gdk

-import cPickle

-

-class Favorite(Gtk.Dialog):

-    def __init__(self, prnt, fav_list):

-        Gtk.Dialog.__init__(self, parent=prnt)

-        self.set_title(_('Favorite list'))

-        self.set_icon_name('curlew')

-        self.set_border_width(4)

-        self.set_size_request(350, 280)

-        self.store = Gtk.ListStore(str)

-        self.list_view = Gtk.TreeView(self.store)

-        self.list_view.connect("key-press-event", self.on_key_press)

-        

-        cell = Gtk.CellRendererText()

-        col = Gtk.TreeViewColumn(_("Format"), cell, text=0)

-        self.list_view.append_column(col)

-        

-        hbox = Gtk.Box(spacing=6, orientation=Gtk.Orientation.HORIZONTAL)

-        

-        scroll = Gtk.ScrolledWindow()

-        scroll.set_shadow_type(Gtk.ShadowType.IN)

-        scroll.add(self.list_view)

-        

-        hbox.pack_start(scroll, True, True, 0)

-        

-        vbox_tool = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)

-        hbox.pack_start(vbox_tool, False, False, 0)

-        

-        btn_delete = Gtk.Button()

-        btn_delete.set_image(Gtk.Image.new_from_stock(Gtk.STOCK_REMOVE, Gtk.IconSize.MENU))

-        btn_delete.connect('clicked', self.delete_item)

-        vbox_tool.pack_end(btn_delete, False, False, 0)

-        

-        btn_up = Gtk.Button()

-        btn_up.set_image(Gtk.Image.new_from_stock(Gtk.STOCK_GO_UP, Gtk.IconSize.MENU))

-        btn_up.connect('clicked', self.go_up)

-        vbox_tool.pack_start(btn_up, False, False, 0)

-        

-        btn_down = Gtk.Button()

-        btn_down.set_image(Gtk.Image.new_from_stock(Gtk.STOCK_GO_DOWN, Gtk.IconSize.MENU))

-        btn_down.connect('clicked', self.go_down)

-        vbox_tool.pack_start(btn_down, False, False, 0)

-        

-        self.vbox.pack_start(hbox, True, True, 0)

-        

-        self.add_button(Gtk.STOCK_OK, Gtk.ResponseType.OK)

-        

-        # load

-        for fformat in fav_list:

-            self.store.append((fformat,))

-        

-        self.show_all()

-    

-    # Delete Item

-    def delete_item(self, *args):

-        sele = self.get_selected_iter()

-        if sele:

-            self.store.remove(sele)

-    

-    def go_up(self, widget):

-        sel_iter = self.get_selected_iter()

-        if sel_iter:

-            self.store.move_before(sel_iter, self.store.iter_previous(sel_iter))

-    

-    def go_down(self, widget):

-        sel_iter = self.get_selected_iter()

-        if sel_iter:

-            self.store.move_after(sel_iter, self.store.iter_next(sel_iter))

-    

-    def get_selected_iter(self):

-        return self.list_view.get_selection().get_selected()[1]

-    

-    def save(self, file_name):

-        fav_list = []

-        for row in self.store:

-            fav_list.append(row[0])

-        favfile = open(file_name, "wb")

-        cPickle.dump(fav_list, favfile)

-        favfile.close()

-    

-    def on_key_press(self, widget, event):

-        if event.keyval == Gdk.KEY_Delete:

-            self.delete_item()

-    

​

@@ -1,57 +0,0 @@

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

-

-# Curlew - Easy to use multimedia converter

-#

-# Copyright (C) 2012-2014 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://www.ojuba.org/wiki/doku.php/waqf/license

-

-from gi.repository import Gtk, Pango

-from subprocess import check_output

-

-class FileInfos(Gtk.Dialog):

-    def __init__(self, prnt, file_name):

-        Gtk.Dialog.__init__(self, parent=prnt)

-        self.set_title(_("File informations"))

-        self.set_size_request(580, 450)

-        self.set_border_width(6)

-        

-        txt_info = Gtk.TextView()

-        txt_info.set_editable(False)

-        txt_info.set_cursor_visible(False)

-        txt_info.set_border_width(8)

-        

-        scroll = Gtk.ScrolledWindow()

-        scroll.set_shadow_type(Gtk.ShadowType.IN)

-        scroll.add(txt_info)

-        self.vbox.pack_start(scroll, True, True, 0)

-        

-        self.add_button(Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE)

-        

-        font_desc = Pango.FontDescription('Monospace')

-        txt_info.override_font(font_desc)

-        

-        txt_buffer = Gtk.TextBuffer()

-        txt_info.set_buffer(txt_buffer)

-        

-        # Show info        

-        buf = check_output('mediainfo "{}"'.format(file_name), shell=True)

-        txt_buffer.set_text(buf.strip())

-        

-    

-    

-    def show_dialog(self):

-        self.show_all()

-        self.run()

-        self.destroy()

\ No newline at end of file

​

@@ -1,1771 +0,0 @@

-[MP3 Audio]

-encoder = f

-type = audio

-ab = 32k 64k 96k 128k 196k 256k

-afreq = 44100 8000 16000 22050 32000

-ach = default 2 1

-acodec = libmp3lame copy

-def_ab = 128k

-ff = mp3

-ext = mp3

-

-[Ac3 DVD - 192kbps Stereo]

-type = audio

-encoder = f

-ab = 192k

-afreq = 48000

-ach = 2

-acodec = ac3

-ff = ac3

-ext = ac3

-

-[Ac3 DVD - 384kbps Stereo]

-type = audio

-encoder = f

-ab = 384k

-afreq = 48000

-ach = 2

-acodec = ac3

-ff = ac3

-ext = ac3

-

-[MPEG4 Audio (m4a)]

-encoder = f

-type = audio

-ab = 112k

-afreq = 48000

-ach = default 2

-acodec = libvo_aacenc aac

-ext = m4a

-

-[CDMA Phone Audio (3g2)]

-type = audio

-encoder = f

-ab = 128k

-ach = default

-afreq = 22050

-acodec = libvo_aacenc aac

-ff = 3g2

-ext = 3g2

-

-[Wav for CD]

-type = presets

-encoder = f

-cmd = -vn -ar 44100

-ext = wav

-

-[Wave Audio]

-encoder = f

-type = audio

-ab = 1000k 1200k 1411k 1500k 1600k

-afreq = 44100 8000 16000 22050 32000

-ach = default 2 1

-acodec = pcm_s16le pcm_u8 adpcm_ms adpcm_ima_wav

-def_ab = 1200k

-ff = wav

-ext = wav

-

-[Window Media Audio]

-encoder = f

-type = audio

-ab = 16k 32k 64k 128k 192k 256k

-afreq = 44100 8000 16000 22050 32000

-ach = default 2 1

-acodec = wmav2 wmav1

-def_ab = 128k

-ff = asf

-ext = wma

-

-[OGG Vorbis Audio]

-encoder = f

-type = ogg

-ab = default

-afreq = 44100 8000 16000 22050 32000

-ach = default 2 1

-acodec = libvorbis

-ff = ogg

-ext = ogg

-

-[OGG Theora Video]

-encoder = f

-type = ogv

-ab = default

-afreq = 44100 8000 16000 22050 32000

-ach = default 2 1

-acodec = flac libvorbis

-vb = default

-vfps = default

-vcodec = libtheora

-vsize = default 320:240 640:480 800:600 1024:768 1600:1200 2048:1536 1280:1024 2560:2048 5120:4096 852:480 1366:768 1600:1024 1920:1200 2560:1600 3200:2048 3840:2400 6400:4096 7680:4800 320:200 640:350 852:480 1280:720 1920:1080

-vratio = default

-extra = -rc_lookahead 16 -keyint_min 0 -g 360 -skip_threshold 0 -level 116

-ff = ogg

-ext = ogv

-

-

-

-[MPEG1 Video]

-encoder = f

-type = video

-ab = 64k 96k 128k 196k 256k

-afreq = 44100 8000 16000 22050 32000

-ach = default 2 1

-acodec = libmp3lame  mp2

-def_ab = 128k

-vb = 200k 320k 500k 700k 1100k 1500K

-def_vb = 1100k

-vfps = 30 25

-vcodec = mpeg1video

-vsize = default 320:240 640:480 800:600 1024:768 1600:1200

-vratio = default

-ff = mpeg

-ext = mpg

-extra = -mbd rd -cmp 2 -subcmp 2 -bf 2

-

-[MPEG2 Video]

-encoder = f

-type = video

-ab = 64k 96k 128k 196k 256k

-afreq = 44100 8000 16000 22050 32000

-ach = default 2 1

-acodec = libmp3lame mp2

-def_ab = 128k

-vb = 200k 320k 500k 700k 1100k 1500K

-def_vb = 1100k

-vfps = 30 25

-vcodec = mpeg2video

-vsize = default 320:240 640:480 800:600 1024:768 1600:1200

-vratio = default

-ff = mpeg

-ext = mpg

-extra = -mbd rd -cmp 2 -subcmp 2 -bf 2

-

-

-[AVI Video]

-encoder = f

-type = video

-ab = 64k 96k 128k 196k 256k

-afreq = 44100 8000 16000 22050 32000

-ach = default 2 1

-acodec = libmp3lame mp2

-def_ab = 128k

-vb = 200k 320k 500k 700k 1100k 1500K

-def_vb = 1100k

-vfps = 30 25

-vcodec = msmpeg4 msmpeg4v2 libxvid mpeg4

-vsize = default 320:240 640:480 800:600 1024:768 1600:1200 2048:1536 1280:1024 2560:2048 5120:4096 852:480 1366:768 1600:1024 1920:1200 2560:1600 3200:2048 3840:2400 6400:4096 7680:4800 320:200 640:350 852:480 1280:720 1920:1080

-vratio = default 1:1 4:3 5:4 16:9

-ff = avi

-ext = avi

-

-[MP4 Video]

-encoder = f

-type = video

-ab = 64k 96k 128k 196k 256k

-afreq = 44100 8000 16000 22050 32000

-ach = default 2 1

-acodec = libvo_aacenc aac

-def_ab = 128k

-vb = 200k 320k 500k 700k 1100k 1500K

-def_vb = 1100k

-vfps = 30 25

-vcodec = mpeg4

-vsize = default 320:240 640:480 800:600 1024:768 1600:1200 2048:1536 1280:1024 2560:2048 5120:4096 852:480 1366:768 1600:1024 1920:1200 2560:1600 3200:2048 3840:2400 6400:4096 7680:4800 320:200 640:350 852:480 1280:720 1920:1080

-vratio = 4:3 1:1 4:3 5:4 16:9

-ff = mp4

-ext = mp4

-

-[Flash Video (FLV)]

-encoder = f

-type = video

-ab = 64k 96k 128k 196k 256k

-afreq = 44100 8000 16000 22050 32000

-ach = default 2 1

-acodec = libmp3lame

-def_ab = 128k

-vb = 200k 320k 500k 700k 1100k 1500K

-def_vb = 1100k

-vfps = 25

-vcodec = flv

-vsize = default 320:240 640:480 800:600 1024:768 1600:1200 2048:1536 1280:1024 2560:2048 5120:4096 852:480 1366:768 1600:1024 1920:1200 2560:1600 3200:2048 3840:2400 6400:4096 7680:4800 320:200 640:350 852:480 1280:720 1920:1080

-vratio = default 1:1 4:3 5:4 16:9

-ff = flv

-ext = flv

-

-[Windows Media Video]

-encoder = f

-type = video

-ab = 64k 96k 128k 196k 256k

-afreq = 44100 8000 16000 22050 32000

​

@@ -1,64 +0,0 @@

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

-

-# Curlew - Easy to use multimedia converter

-#

-# Copyright (C) 2012-2014 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://www.ojuba.org/wiki/doku.php/waqf/license

-

-

-from gi.repository import Gtk

-

-def show_message(parent, 

-                 message, 

-                 message_type, 

-                 button_type=Gtk.ButtonsType.CLOSE):

-    ''' Show custom message dialog'''

-    mess_dlg = Gtk.MessageDialog(parent,

-                             Gtk.DialogFlags.MODAL,

-                             message_type,

-                             button_type)

-    mess_dlg.set_markup(message)

-    if not parent:

-        mess_dlg.set_keep_above(True)

-    resp = mess_dlg.run()

-    mess_dlg.destroy()

-    return resp

-

-def get_format_size(size):

-    ''' formating file size '''

-    size_str = ''

-    if 0 <= size <= 1024:

-        size_str = '{:.2f}'.format(size) + _(' KB')

-    elif 1024 <= size < 1024 * 1024:

-        e_size = size / 1024.0

-        size_str = '{:.2f}'.format(e_size) + _(' MB')

-    elif size >= 1024 * 1024:

-        e_size = size / 1048576.0

-        size_str = '{:.2f}'.format(e_size) + _(' GB')

-    return size_str

-

-

-def duration_to_time(duration):

-    ''' Convert duration (sec) to time 0:00:00 '''

-    if duration < 0: duration = 0

-    return '{:.0f}:{:02.0f}:{:02.0f}'.format(

-                                             duration/3600,

-                                             (duration%3600)/60,

-                                             (duration%3600)%60

-                                             )

-def time_to_duration(time):

-    ''' Convert time like 0:00:00.00 to duration (sec)'''

-    times = time.split(':')

-    return int(times[0])*3600 + int(times[1])*60 + float(times[2])

​