luna/devedeng-extended
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed module from devede to devedeng

Browse source 
Now it uses the 'locale' folder to create the locales list names.
This commit is contained in:
Sergio Costas 2015-01-29 00:34:47 +01:00
parent cfb9238a73
commit bc6fa87b3c
43 changed files with 241 additions and 245 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/interface/wabout.ui
View file

@ -12,7 +12,7 @@
<property name="program_name">Devede NG</property>
<property name="copyright" translatable="yes">2014 Raster Software Vigo</property>
<property name="authors">Sergio Costas Rodríguez</property>
<property name="logo">devede.png</property>
<property name="logo">devedeng.png</property>
<property name="logo_icon_name"/>
<property name="license_type">gpl-3-0</property>
<child internal-child="vbox">

0
data/pixmaps/devede.png → data/pixmaps/devedeng.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Before After
Before After

18
setup.py
View file

@ -25,15 +25,11 @@ def get_data_files():
(os.path.join('share', 'doc', 'devede_ng', 'html'), glob('docs/html/*'))
]
try:
for pofile in [f for f in os.listdir('po') if f.endswith('.po')]:
pofile = os.path.join('po', pofile) # po/fr.po
modir, mofile = get_mopath(pofile)
# translations must be always in /usr/share because Gtk.builder only search there. If someone knows how to fix this...
target = os.path.join('/usr','share', modir) # share/locale/fr/LC_MESSAGES/
data_files.append((target, [mofile]))
except:
pass
for lang_name in [f for f in os.listdir('locale')]:
mofile = os.path.join('locale', lang_name,'LC_MESSAGES','devede_ng.mo')
# translations must be always in /usr/share because Gtk.builder only search there. If someone knows how to fix this...
target = os.path.join('/usr','share', 'locale', lang_name, 'LC_MESSAGES') # share/locale/fr/LC_MESSAGES/
data_files.append((target, [mofile]))
return data_files
@ -97,9 +93,9 @@ setup(
keywords='dvd video',
packages=['devede'],
packages=['devedeng'],
package_dir={"devede" : "src/devede"},
package_dir={"devedeng" : "src/devedeng"},
#package_data={'devede': ['data/*.ui']},

12
src/devede_ng.py
View file

@ -22,11 +22,11 @@ import gettext
import locale
from gi.repository import Gtk
import devede.project
import devede.configuration_data
import devede.choose_disc_type
import devedeng.project
import devedeng.configuration_data
import devedeng.choose_disc_type
config_data = devede.configuration_data.configuration.get_config()
config_data = devedeng.configuration_data.configuration.get_config()
if config_data == None:
print ("Can't locate extra files. Aborting.")
@ -44,8 +44,8 @@ _ = gettext.gettext
Gtk.init(sys.argv)
mwindow = devede.project.devede_project()
ask_type = devede.choose_disc_type.choose_disc_type()
mwindow = devedeng.project.devede_project()
ask_type = devedeng.choose_disc_type.choose_disc_type()
Gtk.main()
config_data.save_config()

0
src/devede/__init__.py → src/devedeng/__init__.py
View file

4
src/devede/about.py → src/devedeng/about.py
View file

@ -17,13 +17,13 @@
from gi.repository import Gtk
import os
import devede.configuration_data
import devedeng.configuration_data
class about_window:
def __init__(self):
self.config = devede.configuration_data.configuration.get_config()
self.config = devedeng.configuration_data.configuration.get_config()
builder = Gtk.Builder()
builder.set_translation_domain(self.config.gettext_domain)

4
src/devede/add_files.py → src/devedeng/add_files.py
View file

@ -17,7 +17,7 @@
from gi.repository import Gtk
import os
import devede.configuration_data
import devedeng.configuration_data
class add_files:
@ -25,7 +25,7 @@ class add_files:
def __init__(self):
self.config = devede.configuration_data.configuration.get_config()
self.config = devedeng.configuration_data.configuration.get_config()
def run(self):

4
src/devede/ask.py → src/devedeng/ask.py
View file

@ -17,13 +17,13 @@
from gi.repository import Gtk
import os
import devede.configuration_data
import devedeng.configuration_data
class ask_window:
def __init__(self):
self.config = devede.configuration_data.configuration.get_config()
self.config = devedeng.configuration_data.configuration.get_config()
def run(self,text,title):

10
src/devede/ask_subtitles.py → src/devedeng/ask_subtitles.py
View file

@ -17,14 +17,14 @@
from gi.repository import Gtk
import os
import devede.configuration_data
import devede.add_files
import devedeng.configuration_data
import devedeng.add_files
class ask_subtitles:
def __init__(self):
self.config = devede.configuration_data.configuration.get_config()
self.config = devedeng.configuration_data.configuration.get_config()
def run(self):
@ -41,8 +41,8 @@ class ask_subtitles:
wencoding = builder.get_object("encoding_l")
wlanguage = builder.get_object("language_l")
if (devede.add_files.add_files.last_path != None):
self.wfilename.set_current_folder(devede.add_files.add_files.last_path)
if (devedeng.add_files.add_files.last_path != None):
self.wfilename.set_current_folder(devedeng.add_files.add_files.last_path)
lang_selection = 0
enc_selection = 0

28
src/devede/avconv.py → src/devedeng/avconv.py
View file

@ -19,11 +19,11 @@
import subprocess
import os
import devede.configuration_data
import devede.executor
import devede.mux_dvd_menu
import devedeng.configuration_data
import devedeng.executor
import devedeng.mux_dvd_menu
class avconv(devede.executor.executor):
class avconv(devedeng.executor.executor):
supports_analize = False
supports_play = False
@ -82,16 +82,16 @@ class avconv(devede.executor.executor):
continue
if (mpeg1 and mp2):
devede.avconv.avconv.disc_types.append("vcd")
devedeng.avconv.avconv.disc_types.append("vcd")
if (mpeg2 and mp2):
devede.avconv.avconv.disc_types.append("svcd")
devede.avconv.avconv.disc_types.append("cvd")
devedeng.avconv.avconv.disc_types.append("svcd")
devedeng.avconv.avconv.disc_types.append("cvd")
if (mpeg2 and mp2 and ac3):
devede.avconv.avconv.disc_types.append("dvd")
devedeng.avconv.avconv.disc_types.append("dvd")
if (divx and mp3):
devede.avconv.avconv.disc_types.append("divx")
devedeng.avconv.avconv.disc_types.append("divx")
if (h264 and mp3):
devede.avconv.avconv.disc_types.append("mkv")
devedeng.avconv.avconv.disc_types.append("mkv")
return True
else:
@ -101,8 +101,8 @@ class avconv(devede.executor.executor):
def __init__(self):
devede.executor.executor.__init__(self)
self.config = devede.configuration_data.configuration.get_config()
devedeng.executor.executor.__init__(self)
self.config = devedeng.configuration_data.configuration.get_config()
def convert_file(self,file_project,output_file,video_length,pass2 = False):
@ -112,7 +112,7 @@ class avconv(devede.executor.executor):
else:
self.text = _("Converting %(X)s (pass 1)") % {"X" : file_project.title_name}
# Prepare the converting process for the second pass
tmp = devede.avconv.avconv()
tmp = devedeng.avconv.avconv()
tmp.convert_file(file_project, output_file, video_length, True)
# it deppends of this process
tmp.add_dependency(self)
@ -398,7 +398,7 @@ class avconv(devede.executor.executor):
movie_path = os.path.join(output_path,"menu_"+str(n_page)+".mpg")
self.command_var.append(movie_path)
muxer = devede.mux_dvd_menu.mux_dvd_menu()
muxer = devedeng.mux_dvd_menu.mux_dvd_menu()
final_path = muxer.create_mpg(n_page,output_path,movie_path)
# the muxer process depends of the converter process
muxer.add_dependency(self)

10
src/devede/avprobe.py → src/devedeng/avprobe.py
View file

@ -18,12 +18,12 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>
import subprocess
import devede.configuration_data
import devede.executor
import devedeng.configuration_data
import devedeng.executor
import os
import json
class avprobe(devede.executor.executor):
class avprobe(devedeng.executor.executor):
supports_analize = True
supports_play = False
@ -47,8 +47,8 @@ class avprobe(devede.executor.executor):
def __init__(self):
devede.executor.executor.__init__(self)
self.config = devede.configuration_data.configuration.get_config()
devedeng.executor.executor.__init__(self)
self.config = devedeng.configuration_data.configuration.get_config()
def process_stdout(self,data):
return

10
src/devede/brasero.py → src/devedeng/brasero.py
View file

@ -16,10 +16,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>
import subprocess
import devede.configuration_data
import devede.executor
import devedeng.configuration_data
import devedeng.executor
class brasero(devede.executor.executor):
class brasero(devedeng.executor.executor):
supports_analize = False
supports_play = False
@ -43,8 +43,8 @@ class brasero(devede.executor.executor):
def __init__(self):
devede.executor.executor.__init__(self)
self.config = devede.configuration_data.configuration.get_config()
devedeng.executor.executor.__init__(self)
self.config = devedeng.configuration_data.configuration.get_config()
def burn(self,file_name):

6
src/devede/choose_disc_type.py → src/devedeng/choose_disc_type.py
View file

@ -19,13 +19,13 @@ from gi.repository import Gtk,GObject
import os
import subprocess
import devede.configuration_data
import devedeng.configuration_data
class choose_disc_type(GObject.GObject):
def __init__(self):
self.config = devede.configuration_data.configuration.get_config()
self.config = devedeng.configuration_data.configuration.get_config()
builder = Gtk.Builder()
builder.set_translation_domain(self.config.gettext_domain)
@ -34,7 +34,7 @@ class choose_disc_type(GObject.GObject):
builder.connect_signals(self)
self.wask_window = builder.get_object("wselect_disk")
self.cv = devede.converter.converter.get_converter()
self.cv = devedeng.converter.converter.get_converter()
dvd = True
vcd = True
cvd = True

0
src/devede/configuration_data.py → src/devedeng/configuration_data.py
View file

30
src/devede/converter.py → src/devedeng/converter.py
View file

@ -15,18 +15,18 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>
import devede.configuration_data
import devede.mplayer
import devede.avconv
import devede.avprobe
import devede.ffmpeg
import devede.ffprobe
import devede.vlc
import devede.brasero
import devede.k3b
import devede.mkisofs
import devede.genisoimage
import devede.mpv
import devedeng.configuration_data
import devedeng.mplayer
import devedeng.avconv
import devedeng.avprobe
import devedeng.ffmpeg
import devedeng.ffprobe
import devedeng.vlc
import devedeng.brasero
import devedeng.k3b
import devedeng.mkisofs
import devedeng.genisoimage
import devedeng.mpv
class converter:
@ -41,10 +41,10 @@ class converter:
def __init__(self):
self.config = devede.configuration_data.configuration.get_config()
self.config = devedeng.configuration_data.configuration.get_config()
# List of classes with conversion capabilities, in order of preference
self.c = [devede.vlc.vlc, devede.mpv.mpv, devede.mplayer.mplayer, devede.ffmpeg.ffmpeg, devede.ffprobe.ffprobe, devede.avconv.avconv, devede.avprobe.avprobe,
devede.brasero.brasero, devede.k3b.k3b, devede.mkisofs.mkisofs, devede.genisoimage.genisoimage]
self.c = [devedeng.vlc.vlc, devedeng.mpv.mpv, devedeng.mplayer.mplayer, devedeng.ffmpeg.ffmpeg, devedeng.ffprobe.ffprobe, devedeng.avconv.avconv, devedeng.avprobe.avprobe,
devedeng.brasero.brasero, devedeng.k3b.k3b, devedeng.mkisofs.mkisofs, devedeng.genisoimage.genisoimage]
self.analizers = {}
self.default_analizer = None

4
src/devede/create_disk_window.py → src/devedeng/create_disk_window.py
View file

@ -17,13 +17,13 @@
from gi.repository import Gtk
import os
import devede.configuration_data
import devedeng.configuration_data
class create_disk_window:
def __init__(self):
self.config = devede.configuration_data.configuration.get_config()
self.config = devedeng.configuration_data.configuration.get_config()
def run(self):

22
src/devede/dvd_menu.py → src/devedeng/dvd_menu.py
View file

@ -18,20 +18,20 @@
import cairo
from gi.repository import Gtk,Gdk,GdkPixbuf
import os
import devede.configuration_data
import devede.interface_manager
import devede.message
import devede.mux_dvd_menu
import devedeng.configuration_data
import devedeng.interface_manager
import devedeng.message
import devedeng.mux_dvd_menu
class dvd_menu(devede.interface_manager.interface_manager):
class dvd_menu(devedeng.interface_manager.interface_manager):
def __init__(self):
self.entry_vertical_margin = 2.0
self.entry_separation = 2.0
devede.interface_manager.interface_manager.__init__(self)
self.config = devede.configuration_data.configuration.get_config()
devedeng.interface_manager.interface_manager.__init__(self)
self.config = devedeng.configuration_data.configuration.get_config()
self.default_background = os.path.join(self.config.pic_path,"backgrounds","default_bg.png")
self.default_sound = os.path.join(self.config.pic_path,"silence.ogg")
@ -80,14 +80,14 @@ class dvd_menu(devede.interface_manager.interface_manager):
def update_music(self,b=None):
self.store_ui(self.builder)
cv = devede.converter.converter.get_converter()
cv = devedeng.converter.converter.get_converter()
film_analizer = (cv.get_film_analizer())()
(video, audio, length) = film_analizer.analize_film_data(self.background_music,True)
if (video != 0):
devede.message.message_window(_("The selected file is a video, not an audio file"),_("Error"))
devedeng.message.message_window(_("The selected file is a video, not an audio file"),_("Error"))
self.on_no_sound_clicked(None)
elif (audio == 0):
devede.message.message_window(_("The selected file is not an audio file"),_("Error"))
devedeng.message.message_window(_("The selected file is not an audio file"),_("Error"))
self.on_no_sound_clicked(None)
else:
self.sound_length = length
@ -577,7 +577,7 @@ class dvd_menu(devede.interface_manager.interface_manager):
self.file_list = file_list
self.refresh_static_data()
cv = devede.converter.converter.get_converter()
cv = devedeng.converter.converter.get_converter()
menu_folder = os.path.join(base_path,"menu")
try:
os.makedirs(menu_folder)

10
src/devede/dvdauthor_converter.py → src/devedeng/dvdauthor_converter.py
View file

@ -18,15 +18,15 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>
import os
import devede.configuration_data
import devede.executor
import devedeng.configuration_data
import devedeng.executor
class dvdauthor_converter(devede.executor.executor):
class dvdauthor_converter(devedeng.executor.executor):
def __init__(self):
devede.executor.executor.__init__(self)
self.config = devede.configuration_data.configuration.get_config()
devedeng.executor.executor.__init__(self)
self.config = devedeng.configuration_data.configuration.get_config()
def create_dvd_project (self, path, name, file_movies, menu_entries, start_with_menu):

4
src/devede/end_job.py → src/devedeng/end_job.py
View file

@ -17,13 +17,13 @@
from gi.repository import Gtk,Gdk
import os
import devede.configuration_data
import devedeng.configuration_data
class end_window:
def __init__(self):
self.config = devede.configuration_data.configuration.get_config()
self.config = devedeng.configuration_data.configuration.get_config()
def run(self,time_used, do_burn):

4
src/devede/error.py → src/devedeng/error.py
View file

@ -17,13 +17,13 @@
from gi.repository import Gtk,Gdk
import os
import devede.configuration_data
import devedeng.configuration_data
class error_window:
def __init__(self):
self.config = devede.configuration_data.configuration.get_config()
self.config = devedeng.configuration_data.configuration.get_config()
builder = Gtk.Builder()
builder.set_translation_domain(self.config.gettext_domain)

4
src/devede/executor.py → src/devedeng/executor.py
View file

@ -21,7 +21,7 @@ from gi.repository import GLib,GObject
import subprocess
import os
import signal
import devede.configuration_data
import devedeng.configuration_data
class executor(GObject.GObject):
""" This class encapsulates everything needed for launching processes """
@ -32,7 +32,7 @@ class executor(GObject.GObject):
GObject.GObject.__init__(self)
self.config = devede.configuration_data.configuration.get_config()
self.config = devedeng.configuration_data.configuration.get_config()
self.channel_stdin = None
self.channel_stdout = None
self.channel_stderr = None

28
src/devede/ffmpeg.py → src/devedeng/ffmpeg.py
View file

@ -19,11 +19,11 @@
import subprocess
import os
import devede.configuration_data
import devede.executor
import devede.mux_dvd_menu
import devedeng.configuration_data
import devedeng.executor
import devedeng.mux_dvd_menu
class ffmpeg(devede.executor.executor):
class ffmpeg(devedeng.executor.executor):
supports_analize = False
supports_play = False
@ -82,16 +82,16 @@ class ffmpeg(devede.executor.executor):
continue
if (mpeg1 and mp2):
devede.ffmpeg.ffmpeg.disc_types.append("vcd")
devedeng.ffmpeg.ffmpeg.disc_types.append("vcd")
if (mpeg2 and mp2):
devede.ffmpeg.ffmpeg.disc_types.append("svcd")
devede.ffmpeg.ffmpeg.disc_types.append("cvd")
devedeng.ffmpeg.ffmpeg.disc_types.append("svcd")
devedeng.ffmpeg.ffmpeg.disc_types.append("cvd")
if (mpeg2 and mp2 and ac3):
devede.ffmpeg.ffmpeg.disc_types.append("dvd")
devedeng.ffmpeg.ffmpeg.disc_types.append("dvd")
if (divx and mp3):
devede.ffmpeg.ffmpeg.disc_types.append("divx")
devedeng.ffmpeg.ffmpeg.disc_types.append("divx")
if (h264 and mp3):
devede.ffmpeg.ffmpeg.disc_types.append("mkv")
devedeng.ffmpeg.ffmpeg.disc_types.append("mkv")
return True
else:
@ -101,8 +101,8 @@ class ffmpeg(devede.executor.executor):
def __init__(self):
devede.executor.executor.__init__(self)
self.config = devede.configuration_data.configuration.get_config()
devedeng.executor.executor.__init__(self)
self.config = devedeng.configuration_data.configuration.get_config()
def convert_file(self,file_project,output_file,video_length,pass2 = False):
@ -112,7 +112,7 @@ class ffmpeg(devede.executor.executor):
else:
self.text = _("Converting %(X)s (pass 1)") % {"X" : file_project.title_name}
# Prepare the converting process for the second pass
tmp = devede.ffmpeg.ffmpeg()
tmp = devedeng.ffmpeg.ffmpeg()
tmp.convert_file(file_project, output_file, video_length, True)
# it deppends of this process
tmp.add_dependency(self)
@ -398,7 +398,7 @@ class ffmpeg(devede.executor.executor):
movie_path = os.path.join(output_path,"menu_"+str(n_page)+".mpg")
self.command_var.append(movie_path)
muxer = devede.mux_dvd_menu.mux_dvd_menu()
muxer = devedeng.mux_dvd_menu.mux_dvd_menu()
final_path = muxer.create_mpg(n_page,output_path,movie_path)
# the muxer process depends of the converter process
muxer.add_dependency(self)

10
src/devede/ffprobe.py → src/devedeng/ffprobe.py
View file

@ -18,12 +18,12 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>
import subprocess
import devede.configuration_data
import devede.executor
import devedeng.configuration_data
import devedeng.executor
import os
import json
class ffprobe(devede.executor.executor):
class ffprobe(devedeng.executor.executor):
supports_analize = True
supports_play = False
@ -47,8 +47,8 @@ class ffprobe(devede.executor.executor):
def __init__(self):
devede.executor.executor.__init__(self)
self.config = devede.configuration_data.configuration.get_config()
devedeng.executor.executor.__init__(self)
self.config = devedeng.configuration_data.configuration.get_config()
def process_stdout(self,data):
return

10
src/devede/file_copy.py → src/devedeng/file_copy.py
View file

@ -18,15 +18,15 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>
import os
import devede.configuration_data
import devede.executor
import devedeng.configuration_data
import devedeng.executor
class file_copy(devede.executor.executor):
class file_copy(devedeng.executor.executor):
def __init__(self,input_path, output_path):
devede.executor.executor.__init__(self)
self.config = devede.configuration_data.configuration.get_config()
devedeng.executor.executor.__init__(self)
self.config = devedeng.configuration_data.configuration.get_config()
self.text = _("Copying file %(X)s") % {"X": os.path.basename(input_path)}

36
src/devede/file_movie.py → src/devedeng/file_movie.py
View file

@ -18,15 +18,15 @@
from gi.repository import Gtk,GObject
import os
import devede.configuration_data
import devede.interface_manager
import devede.converter
import devede.ask_subtitles
import devede.preview
import devede.file_copy
import devede.subtitles_mux
import devedeng.configuration_data
import devedeng.interface_manager
import devedeng.converter
import devedeng.ask_subtitles
import devedeng.preview
import devedeng.file_copy
import devedeng.subtitles_mux
class file_movie(devede.interface_manager.interface_manager):
class file_movie(devedeng.interface_manager.interface_manager):
__gsignals__ = {'title_changed': (GObject.SIGNAL_RUN_FIRST, None,(str,))}
@ -34,12 +34,12 @@ class file_movie(devede.interface_manager.interface_manager):
self.list_files = list_files
devede.interface_manager.interface_manager.__init__(self)
devedeng.interface_manager.interface_manager.__init__(self)
self.wfile_properties = None
self.builder = None
self.config = devede.configuration_data.configuration.get_config()
self.config = devedeng.configuration_data.configuration.get_config()
self.set_type(None, self.config.disc_type)
self.config.connect('disc_type',self.set_type)
@ -137,7 +137,7 @@ class file_movie(devede.interface_manager.interface_manager):
self.add_enable_disable("no_reencode_audio_video", [], no_reencode_audio_video_list)
if list_files == None:
cv = devede.converter.converter.get_converter()
cv = devedeng.converter.converter.get_converter()
film_analizer = (cv.get_film_analizer())()
if (film_analizer.get_film_data(self.file_name)):
self.error = True
@ -605,7 +605,7 @@ class file_movie(devede.interface_manager.interface_manager):
def on_add_subtitles_clicked(self,b):
subt = devede.ask_subtitles.ask_subtitles()
subt = devedeng.ask_subtitles.ask_subtitles()
if (subt.run()):
self.wsubtitles_list.append([subt.filename, subt.encoding, subt.language, subt.put_upper])
@ -641,12 +641,12 @@ class file_movie(devede.interface_manager.interface_manager):
self.converted_filename = output_path
if self.is_mpeg_ps:
converter = devede.file_copy.file_copy(self.file_name,output_path)
converter = devedeng.file_copy.file_copy(self.file_name,output_path)
else:
self.set_final_size_aspect()
self.set_final_rates()
cv = devede.converter.converter.get_converter()
cv = devedeng.converter.converter.get_converter()
disc_converter = cv.get_disc_converter()
converter = disc_converter()
converter.convert_file(self,output_path,duration)
@ -668,7 +668,7 @@ class file_movie(devede.interface_manager.interface_manager):
final_aspect = "16:9"
else:
final_aspect = "4:3"
subt_mux = devede.subtitles_mux.subtitles_mux()
subt_mux = devedeng.subtitles_mux.subtitles_mux()
subt_mux.multiplex_subtitles( output_path, subt_file, subt_codepage, subt_lang, subt_upper,
self.subt_font_size,self.format_pal,self.force_subtitles,
final_aspect, duration2, stream_id,
@ -688,11 +688,11 @@ class file_movie(devede.interface_manager.interface_manager):
def do_preview(self):
wpreview = devede.preview.preview_window()
wpreview = devedeng.preview.preview_window()
if (wpreview.run() == False):
return
run_window = devede.runner.runner()
run_window = devedeng.runner.runner()
p = self.do_conversion(os.path.join(self.config.tmp_folder,"movie_preview.mpg"),wpreview.lvalue)
run_window.add_process(p)
run_window.connect("done",self.preview_done)
@ -702,7 +702,7 @@ class file_movie(devede.interface_manager.interface_manager):
def preview_done(self,o,retval):
if (retval == 0):
cv = devede.converter.converter.get_converter()
cv = devedeng.converter.converter.get_converter()
disc_player = (cv.get_film_player())()
disc_player.play_film(os.path.join(self.config.tmp_folder,"movie_preview.mpg"))

10
src/devede/genisoimage.py → src/devedeng/genisoimage.py
View file

@ -18,11 +18,11 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>
import os
import devede.configuration_data
import devedeng.configuration_data
import subprocess
import devede.executor
import devedeng.executor
class genisoimage(devede.executor.executor):
class genisoimage(devedeng.executor.executor):
supports_analize = False
supports_play = False
@ -46,8 +46,8 @@ class genisoimage(devede.executor.executor):
def __init__(self):
devede.executor.executor.__init__(self)
self.config = devede.configuration_data.configuration.get_config()
devedeng.executor.executor.__init__(self)
self.config = devedeng.configuration_data.configuration.get_config()
def create_iso (self, path, name):

0
src/devede/interface_manager.py → src/devedeng/interface_manager.py
View file

10
src/devede/k3b.py → src/devedeng/k3b.py
View file

@ -16,10 +16,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>
import subprocess
import devede.configuration_data
import devede.executor
import devedeng.configuration_data
import devedeng.executor
class k3b(devede.executor.executor):
class k3b(devedeng.executor.executor):
supports_analize = False
supports_play = False
@ -43,8 +43,8 @@ class k3b(devede.executor.executor):
def __init__(self):
devede.executor.executor.__init__(self)
self.config = devede.configuration_data.configuration.get_config()
devedeng.executor.executor.__init__(self)
self.config = devedeng.configuration_data.configuration.get_config()
def burn(self,file_name):

4
src/devede/message.py → src/devedeng/message.py
View file

@ -17,13 +17,13 @@
from gi.repository import Gtk
import os
import devede.configuration_data
import devedeng.configuration_data
class message_window:
def __init__(self,text,title,list_data = None):
self.config = devede.configuration_data.configuration.get_config()
self.config = devedeng.configuration_data.configuration.get_config()
builder = Gtk.Builder()
builder.set_translation_domain(self.config.gettext_domain)

10
src/devede/mkisofs.py → src/devedeng/mkisofs.py
View file

@ -18,11 +18,11 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>
import os
import devede.configuration_data
import devedeng.configuration_data
import subprocess
import devede.executor
import devedeng.executor
class mkisofs(devede.executor.executor):
class mkisofs(devedeng.executor.executor):
supports_analize = False
supports_play = False
@ -46,8 +46,8 @@ class mkisofs(devede.executor.executor):
def __init__(self):
devede.executor.executor.__init__(self)
self.config = devede.configuration_data.configuration.get_config()
devedeng.executor.executor.__init__(self)
self.config = devedeng.configuration_data.configuration.get_config()
def create_iso (self, path, name):

10
src/devede/mplayer.py → src/devedeng/mplayer.py
View file

@ -18,11 +18,11 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>
import subprocess
import devede.configuration_data
import devede.executor
import devedeng.configuration_data
import devedeng.executor
import os
class mplayer(devede.executor.executor):
class mplayer(devedeng.executor.executor):
supports_analize = True
supports_play = True
@ -46,8 +46,8 @@ class mplayer(devede.executor.executor):
def __init__(self):
devede.executor.executor.__init__(self)
self.config = devede.configuration_data.configuration.get_config()
devedeng.executor.executor.__init__(self)
self.config = devedeng.configuration_data.configuration.get_config()
def play_film(self,file_name):

10
src/devede/mpv.py → src/devedeng/mpv.py
View file

@ -18,10 +18,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>
import subprocess
import devede.configuration_data
import devede.executor
import devedeng.configuration_data
import devedeng.executor
class mpv(devede.executor.executor):
class mpv(devedeng.executor.executor):
supports_analize = False
supports_play = True
@ -45,8 +45,8 @@ class mpv(devede.executor.executor):
def __init__(self):
devede.executor.executor.__init__(self)
self.config = devede.configuration_data.configuration.get_config()
devedeng.executor.executor.__init__(self)
self.config = devedeng.configuration_data.configuration.get_config()
def play_film(self,file_name):

10
src/devede/mux_dvd_menu.py → src/devedeng/mux_dvd_menu.py
View file

@ -18,15 +18,15 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>
import os
import devede.configuration_data
import devede.executor
import devedeng.configuration_data
import devedeng.executor
class mux_dvd_menu(devede.executor.executor):
class mux_dvd_menu(devedeng.executor.executor):
def __init__(self):
devede.executor.executor.__init__(self)
self.config = devede.configuration_data.configuration.get_config()
devedeng.executor.executor.__init__(self)
self.config = devedeng.configuration_data.configuration.get_config()
def create_mpg(self,n_page,output_path,movie_path):

4
src/devede/opensave.py → src/devedeng/opensave.py
View file

@ -17,13 +17,13 @@
from gi.repository import Gtk
import os
import devede.configuration_data
import devedeng.configuration_data
class opensave_window:
def __init__(self, save):
self.config = devede.configuration_data.configuration.get_config()
self.config = devedeng.configuration_data.configuration.get_config()
self.save = save

4
src/devede/preview.py → src/devedeng/preview.py
View file

@ -17,13 +17,13 @@
from gi.repository import Gtk
import os
import devede.configuration_data
import devedeng.configuration_data
class preview_window:
def __init__(self):
self.config = devede.configuration_data.configuration.get_config()
self.config = devedeng.configuration_data.configuration.get_config()
def run(self):

86
src/devede/project.py → src/devedeng/project.py
View file

@ -23,30 +23,30 @@ import urllib.parse
import pickle
import math
import devede.file_movie
import devede.ask
import devede.add_files
import devede.message
import devede.dvd_menu
import devede.create_disk_window
import devede.runner
import devede.settings
import devede.dvdauthor_converter
import devede.mkisofs
import devede.end_job
import devede.vcdimager_converter
import devede.shutdown
import devede.about
import devede.opensave
import devedeng.file_movie
import devedeng.ask
import devedeng.add_files
import devedeng.message
import devedeng.dvd_menu
import devedeng.create_disk_window
import devedeng.runner
import devedeng.settings
import devedeng.dvdauthor_converter
import devedeng.mkisofs
import devedeng.end_job
import devedeng.vcdimager_converter
import devedeng.shutdown
import devedeng.about
import devedeng.opensave
class devede_project:
def __init__(self):
self.config = devede.configuration_data.configuration.get_config()
self.config = devedeng.configuration_data.configuration.get_config()
self.disc_type = self.config.disc_type
self.menu = devede.dvd_menu.dvd_menu()
self.menu = devedeng.dvd_menu.dvd_menu()
self.current_title = None
self.project_file = None
@ -199,7 +199,7 @@ class devede_project:
def on_wmain_window_delete_event(self,b,e=None):
ask = devede.ask.ask_window()
ask = devedeng.ask.ask_window()
if (ask.run(_("Abort the current DVD and exit?"),_("Exit DeVeDe"))):
Gtk.main_quit()
return True
@ -215,7 +215,7 @@ class devede_project:
def on_add_file_clicked(self,b):
ask_files = devede.add_files.add_files()
ask_files = devedeng.add_files.add_files()
if (ask_files.run()):
self.add_several_files(ask_files.files)
@ -239,14 +239,14 @@ class devede_project:
for efile in file_list:
if efile.startswith("file://"):
efile = urllib.parse.unquote(efile[7:])
new_file = devede.file_movie.file_movie(efile)
new_file = devedeng.file_movie.file_movie(efile)
if (new_file.error):
error_list.append(os.path.basename(efile))
else:
new_file.connect('title_changed',self.title_changed)
self.wliststore_files.append([new_file, new_file.title_name,True,self.duration_to_string(new_file.get_duration())])
if (len(error_list)!=0):
devede.message.message_window(_("The following files could not be added:"),_("Error while adding files"),error_list)
devedeng.message.message_window(_("The following files could not be added:"),_("Error while adding files"),error_list)
self.set_interface_status(None)
self.refresh_disc_usage()
@ -257,7 +257,7 @@ class devede_project:
if (element == None):
return
ask_w = devede.ask.ask_window()
ask_w = devedeng.ask.ask_window()
if (ask_w.run(_("The file <b>%(X)s</b> <i>(%(Y)s)</i> will be removed.") % {"X":element.title_name, "Y":element.file_name},_("Delete file"))):
element.delete_file()
model.remove(treeiter)
@ -461,15 +461,15 @@ class devede_project:
file_movies = self.get_all_files()
t = len(file_movies)
if (max_files != -1) and (t > max_files):
devede.message.message_window(_("The limit for this format is %(l)d files, but your project has %(h)d.") % {"l": max_files, "h" : t}, _("Too many files in the project"))
devedeng.message.message_window(_("The limit for this format is %(l)d files, but your project has %(h)d.") % {"l": max_files, "h" : t}, _("Too many files in the project"))
return
data = devede.create_disk_window.create_disk_window()
data = devedeng.create_disk_window.create_disk_window()
if (not data.run()):
return
if os.path.exists(data.path):
ask_w = devede.ask.ask_window()
ask_w = devedeng.ask.ask_window()
retval = ask_w.run(_("The selected folder already exists. To create the project, Devede must delete it.\nIf you continue, the folder\n\n <b>%s</b>\n\n and all its contents <b>will be deleted</b>. Continue?") % data.path,_("Delete folder"))
if retval:
# delete only the bare minimun needed
@ -496,7 +496,7 @@ class devede_project:
self.shutdown = data.shutdown
run_window = devede.runner.runner()
run_window = devedeng.runner.runner()
final_dependencies = []
@ -525,21 +525,21 @@ class devede_project:
start_with_menu = True
else:
start_with_menu = False
dvdauthor = devede.dvdauthor_converter.dvdauthor_converter()
dvdauthor = devedeng.dvdauthor_converter.dvdauthor_converter()
dvdauthor.create_dvd_project(data.path, data.name, file_movies, menu_entries, start_with_menu)
# dvdauthor must wait until all the files have been converted
for element in final_dependencies:
dvdauthor.add_dependency(element)
run_window.add_process(dvdauthor)
cv = devede.converter.converter.get_converter()
cv = devedeng.converter.converter.get_converter()
isocreator = cv.get_mkiso()()
isocreator.create_iso(data.path, data.name)
isocreator.add_dependency(dvdauthor)
run_window.add_process(isocreator)
self.disc_image_name = os.path.join(data.path,data.name+".iso")
elif (self.disc_type == "vcd") or (self.disc_type == "svcd") or (self.disc_type == "cvd"):
vcdcreator = devede.vcdimager_converter.vcdimager_converter()
vcdcreator = devedeng.vcdimager_converter.vcdimager_converter()
vcdcreator.create_cd_project(data.path, data.name, file_movies)
for element in final_dependencies:
vcdcreator.add_dependency(element)
@ -558,19 +558,19 @@ class devede_project:
if self.shutdown:
Gtk.main_quit()
devede.shutdown.shutdown()
devedeng.shutdown.shutdown()
if value == 0:
ended = devede.end_job.end_window()
ended = devedeng.end_job.end_window()
if self.disc_image_name == None:
do_burn = False
else:
do_burn = True
if (ended.run(time.time() - self.time_start, do_burn)):
cv = devede.converter.converter.get_converter()
cv = devedeng.converter.converter.get_converter()
burner = cv.get_burner()()
burner.burn(self.disc_image_name)
run_window = devede.runner.runner(False)
run_window = devedeng.runner.runner(False)
run_window.add_process(burner)
run_window.connect("done", self.disc_done2)
run_window.run()
@ -594,22 +594,22 @@ class devede_project:
def on_settings_activate(self,b):
w = devede.settings.settings_window()
w = devedeng.settings.settings_window()
def on_about_activate(self,b):
w = devede.about.about_window()
w = devedeng.about.about_window()
def on_new_activate(self,b):
w = devede.ask.ask_window()
w = devedeng.ask.ask_window()
if w.run(_("Close current project and start a fresh one?"), _("New project")):
self.wliststore_files.clear()
self.project_file = None
self.wmain_window.hide()
devede.choose_disc_type.choose_disc_type()
devedeng.choose_disc_type.choose_disc_type()
def on_wmain_window_drag_motion(self,wid, context, x, y, time):
@ -638,14 +638,14 @@ class devede_project:
def on_save_as_activate(self,b):
while True:
w = devede.opensave.opensave_window(True)
w = devedeng.opensave.opensave_window(True)
retval = w.run(self.project_file)
if retval == None:
return
if not retval.endswith(".devedeng"):
retval += ".devedeng"
if os.path.isfile(retval):
w = devede.ask.ask_window()
w = devedeng.ask.ask_window()
if not w.run(_("The file already exists. Overwrite it?"), _("The file already exists")):
continue
self.project_file = retval
@ -654,7 +654,7 @@ class devede_project:
def on_load_activate(self,b):
w = devede.opensave.opensave_window(False)
w = devedeng.opensave.opensave_window(False)
retval = w.run()
if retval != None:
self.load_project(retval)
@ -698,7 +698,7 @@ class devede_project:
if "files" in project:
error_list = []
for efile in project["files"]:
new_file = devede.file_movie.file_movie(efile["file_name"])
new_file = devedeng.file_movie.file_movie(efile["file_name"])
if (new_file.error):
error_list.append(os.path.basename(efile["file_name"]))
else:
@ -706,12 +706,12 @@ class devede_project:
new_file.connect('title_changed',self.title_changed)
self.wliststore_files.append([new_file, new_file.title_name,True,self.duration_to_string(new_file.get_duration())])
if (len(error_list)!=0):
devede.message.message_window(_("The following files in the project could not be added again:"),_("Error while adding files"),error_list)
devedeng.message.message_window(_("The following files in the project could not be added again:"),_("Error while adding files"),error_list)
self.set_interface_status(None)
self.refresh_disc_usage()
def on_multiproperties_activate(self,b):
e = devede.file_movie.file_movie(None,self.get_all_files())
e = devedeng.file_movie.file_movie(None,self.get_all_files())
e.properties()

12
src/devede/runner.py → src/devedeng/runner.py
View file

@ -17,9 +17,9 @@
from gi.repository import Gtk,GObject
import os
import devede.configuration_data
import devede.error
import devede.ask
import devedeng.configuration_data
import devedeng.error
import devedeng.ask
class runner(GObject.GObject):
@ -29,7 +29,7 @@ class runner(GObject.GObject):
GObject.GObject.__init__(self)
self.config = devede.configuration_data.configuration.get_config()
self.config = devedeng.configuration_data.configuration.get_config()
if (self.config.multicore > 0):
if self.config.cores < self.config.multicore:
@ -87,7 +87,7 @@ class runner(GObject.GObject):
def on_cancel_clicked(self,b):
ask_w = devede.ask.ask_window()
ask_w = devedeng.ask.ask_window()
retval = ask_w.run(_("Cancel the current job?"),_("Cancel the current job?"))
if retval:
self.error = True
@ -131,7 +131,7 @@ class runner(GObject.GObject):
for element in self.proc_list:
element.cancel()
self.wprogress.destroy()
devede.error.error_window()
devedeng.error.error_window()
self.emit("done",1) # there was an error
return

16
src/devede/settings.py → src/devedeng/settings.py
View file

@ -17,17 +17,17 @@
from gi.repository import Gtk
import os
import devede.configuration_data
import devede.interface_manager
import devedeng.configuration_data
import devedeng.interface_manager
import gettext
import devede.converter
import devedeng.converter
class settings_window(devede.interface_manager.interface_manager):
class settings_window(devedeng.interface_manager.interface_manager):
def __init__(self):
devede.interface_manager.interface_manager.__init__(self)
self.config = devede.configuration_data.configuration.get_config()
devedeng.interface_manager.interface_manager.__init__(self)
self.config = devedeng.configuration_data.configuration.get_config()
if (self.config.multicore > 0):
if self.config.cores < self.config.multicore:
@ -67,7 +67,7 @@ class settings_window(devede.interface_manager.interface_manager):
self.add_combobox("multicore",list_core_elements,default_value)
self.add_filebutton("tempo_path", self.config.tmp_folder)
c = devede.converter.converter.get_converter()
c = devedeng.converter.converter.get_converter()
(analizers, players, menuers, converters, burners, mkiso) = c.get_available_programs()
self.add_combobox("analizer", analizers,self.config.film_analizer)
@ -108,7 +108,7 @@ class settings_window(devede.interface_manager.interface_manager):
def set_data_converter(self,b):
self.store_ui(self.builder)
cv = devede.converter.converter.get_converter()
cv = devedeng.converter.converter.get_converter()
cv2 = cv.get_disc_converter_by_name(self.converter)
data = ""
for t in cv2.disc_types:

0
src/devede/shutdown.py → src/devedeng/shutdown.py
View file

10
src/devede/subtitles_mux.py → src/devedeng/subtitles_mux.py
View file

@ -20,15 +20,15 @@
import os
import subprocess
import devede.configuration_data
import devede.executor
import devedeng.configuration_data
import devedeng.executor
class subtitles_mux(devede.executor.executor):
class subtitles_mux(devedeng.executor.executor):
def __init__(self):
devede.executor.executor.__init__(self)
self.config = devede.configuration_data.configuration.get_config()
devedeng.executor.executor.__init__(self)
self.config = devedeng.configuration_data.configuration.get_config()
def multiplex_subtitles(self, file_path, subtitles_path, subt_codepage, subt_lang,
subt_upper, font_size, pal, force_subtitles, aspect, duration, stream_id, fill_color, outline_color, outline_thick):

0
src/devede/title.py → src/devedeng/title.py
View file

10
src/devede/vcdimager_converter.py → src/devedeng/vcdimager_converter.py
View file

@ -18,15 +18,15 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>
import os
import devede.configuration_data
import devede.executor
import devedeng.configuration_data
import devedeng.executor
class vcdimager_converter(devede.executor.executor):
class vcdimager_converter(devedeng.executor.executor):
def __init__(self):
devede.executor.executor.__init__(self)
self.config = devede.configuration_data.configuration.get_config()
devedeng.executor.executor.__init__(self)
self.config = devedeng.configuration_data.configuration.get_config()
def create_cd_project (self, path, name, file_movies):

10
src/devede/vlc.py → src/devedeng/vlc.py
View file

@ -16,10 +16,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>
import subprocess
import devede.configuration_data
import devede.executor
import devedeng.configuration_data
import devedeng.executor
class vlc(devede.executor.executor):
class vlc(devedeng.executor.executor):
supports_analize = False
supports_play = True
@ -43,8 +43,8 @@ class vlc(devede.executor.executor):
def __init__(self):
devede.executor.executor.__init__(self)
self.config = devede.configuration_data.configuration.get_config()
devedeng.executor.executor.__init__(self)
self.config = devedeng.configuration_data.configuration.get_config()
def play_film(self,file_name):