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

Now allows to add subtitles to the list

Browse source 
Added the new pictures for scaling
This commit is contained in:
Sergio Costas 2014-07-18 00:44:57 +02:00
parent 581cf07458
commit 0d6d0bd152
17 changed files with 1262 additions and 692 deletions
Download patch file Download diff file Expand all files Collapse all files

65
data/codepages.lst Normal file
View file

@ -0,0 +1,65 @@
ASCII
UTF-8
ARMSCII-8
BIG5
BIG5-HKSCS
CP850
CP862
CP866
CP874
CP932
CP949
CP950
CP1133
CP1250
CP1251
CP1252
CP1253
CP1254
CP1255
CP1256
CP1257
CP1258
EUC-CN
EUC-JP
EUC-KR
EUC-TW
GBK
GB18030
Georgian-Academy
Georgian-PS
HZ
ISO-2022-CN
ISO-2022-CN-EXT
ISO-2022-JP
ISO-2022-JP-2
ISO-2022-JP-1
ISO-2022-KR
ISO-8859-1
ISO-8859-2
ISO-8859-3
ISO-8859-4
ISO-8859-5
ISO-8859-6
ISO-8859-7
ISO-8859-8
ISO-8859-9
ISO-8859-10
ISO-8859-13
ISO-8859-14
ISO-8859-15
ISO-8859-16
JOHAB
KOI8-R
KOI8-T
KOI8-U
KOI8-RU
MuleLao-1
SHIFT_JIS
TCVN
TIS-620
UTF-8
UTF-16
UTF-16BE
UTF-16LE
VISCII

230
data/interface/wask_subtitles.ui Normal file
View file

@ -0,0 +1,230 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
<interface>
<requires lib="gtk+" version="3.10"/>
<object class="GtkListStore" id="list_encodings">
<columns>
<!-- column-name encoding -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkListStore" id="list_languages">
<columns>
<!-- column-name language -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkDialog" id="ask_subtitles">
<property name="width_request">480</property>
<property name="can_focus">False</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="window_position">center</property>
<property name="type_hint">dialog</property>
<property name="deletable">False</property>
<property name="has_resize_grip">False</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="accept">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xpad">4</property>
<property name="label" translatable="yes">File:</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFileChooserButton" id="subtitle_file">
<property name="visible">True</property>
<property name="can_focus">False</property>
<signal name="file-set" handler="on_subtitle_file_set" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xpad">4</property>
<property name="label" translatable="yes">Encoding:</property>
<property name="ellipsize">end</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="encoding_l">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="model">list_encodings</property>
<property name="active">0</property>
<property name="id_column">0</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext1"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xpad">4</property>
<property name="label" translatable="yes">Language:</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="language_l">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="model">list_languages</property>
<property name="active">0</property>
<property name="id_column">0</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext2"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="put_subtitles_upper">
<property name="label" translatable="yes">Put subtitles upper</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<action-widgets>
<action-widget response="1">cancel</action-widget>
<action-widget response="2">accept</action-widget>
</action-widgets>
</object>
</interface>

1381
data/interface/wfile_properties.ui
View file

File diff suppressed because it is too large Load diff

136
data/languages.lst Normal file
View file

@ -0,0 +1,136 @@
AA (AFAR)
AB (ABKHAZIAN)
AF (AFRIKAANS)
AM (AMHARIC)
AR (ARABIC)
AS (ASSAMESE)
AY (AYMARA)
AZ (AZERBAIJANI)
BA (BASHKIR)
BE (BYELORUSSIAN)
BG (BULGARIAN)
BH (BIHARI)
BI (BISLAMA)
BN (BENGALI;BANGLA)
BO (TIBETAN)
BR (BRETON)
CA (CATALAN)
CO (CORSICAN)
CS (CZECH)
CY (WELSH)
DA (DANISH)
DE (GERMAN)
DZ (BHUTANI)
EL (GREEK)
EN (ENGLISH)
EO (ESPERANTO)
ES (SPANISH)
ET (ESTONIAN)
EU (BASQUE)
FA (PERSIAN (farsi))
FI (FINNISH)
FJ (FIJI)
FO (FAROESE)
FR (FRENCH)
FY (FRISIAN)
GA (IRISH)
GD (SCOTS GAELIC)
GL (GALICIAN)
GN (GUARANI)
GU (GUJARATI)
HA (HAUSA)
HI (HINDI)
HR (CROATIAN)
HU (HUNGARIAN)
HY (ARMENIAN)
IA (INTERLINGUA)
IE (INTERLINGUE)
IK (INUPIAK)
IN (INDONESIAN)
IS (ICELANDIC)
IT (ITALIAN)
IW (HEBREW)
JA (JAPANESE)
JI (YIDDISH)
JV (JAVANESE)
KA (GEORGIAN)
KK (KAZAKH)
KL (GREENLANDIC)
KM (CAMBODIAN)
KN (KANNADA)
KO (KOREAN)
KS (KASHMIRI)
KU (KURDISH)
KY (KIRGHIZ)
LA (LATIN)
LN (LINGALA)
LO (LAOTHIAN)
LT (LITHUANIAN)
LV (LATVIAN;LETTISH)
MG (MALAGASY)
MI (MAORI)
MK (MACEDONIAN)
ML (MALAYALAM)
MN (MONGOLIAN)
MO (MOLDAVIAN)
MR (MARATHI)
MS (MALAY)
MT (MALTESE)
MY (BURMESE)
NA (NAURU)
NE (NEPALI)
NL (DUTCH)
NO (NORWEGIAN)
OC (OCCITAN)
OM (AFAN (OROMO))
OR (ORIYA)
PA (PUNJABI)
PL (POLISH)
PS (PASHTO;PUSHTO)
PT (PORTUGUESE)
QU (QUECHUA)
RM (RHAETO-ROMANCE)
RN (KURUNDI)
RO (ROMANIAN)
RU (RUSSIAN)
RW (KINYARWANDA)
SA (SANSKRIT)
SD (SINDHI)
SG (SANGHO)
SH (SERBO-CROATIAN)
SI (SINGHALESE)
SK (SLOVAK)
SL (SLOVENIAN)
SM (SAMOAN)
SN (SHONA)
SO (SOMALI)
SQ (ALBANIAN)
SR (SERBIAN)
SS (SISWATI)
ST (SESOTHO)
SU (SUNDANESE)
SV (SWEDISH)
SW (SWAHILI)
TA (TAMIL)
TE (TELUGU)
TG (TAJIK)
TH (THAI)
TI (TIGRINYA)
TK (TURKMEN)
TL (TAGALOG)
TN (SETSWANA)
TO (TONGA)
TR (TURKISH)
TS (TSONGA)
TT (TATAR)
TW (TWI)
UK (UKRAINIAN)
UR (URDU)
UZ (UZBEK)
VI (VIETNAMESE)
VO (VOLAPUK)
WO (WOLOF)
XH (XHOSA)
YO (YORUBA)
ZH (CHINESE)
ZU (ZULU)

BIN
data/pixmaps/barras.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.3 KiB

BIN
data/pixmaps/estira.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 21 KiB

BIN
data/pixmaps/to_classic_blackbars.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 29 KiB

BIN
data/pixmaps/to_classic_cut.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 32 KiB

BIN
data/pixmaps/to_classic_scale.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 33 KiB

BIN
data/pixmaps/to_wide_blackbars.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
data/pixmaps/to_wide_cut.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
data/pixmaps/to_wide_scale.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 26 KiB

2
setup.py
View file

@ -19,6 +19,8 @@ def get_data_files():
(os.path.join('share', 'devede_ng'), glob("data/interface/*")),
(os.path.join('share', 'devede_ng'), glob('data/pixmaps/*g')),
(os.path.join('share', 'devede_ng'), ['data/devede.svg']),
(os.path.join('share', 'devede_ng'), ['data/codepages.lst']),
(os.path.join('share', 'devede_ng'), ['data/languages.lst']),
(os.path.join('share', 'devede_ng'), ['data/devedesans.ttf']),
(os.path.join('share', 'devede_ng', 'backgrounds'), glob('data/pixmaps/backgrounds/*')),
(os.path.join('share', 'doc', 'devede_ng', 'html'), glob('docs/html/*'))

99
src/devede/ask_subtitles.py Normal file
View file

@ -0,0 +1,99 @@
# Copyright 2014 (C) Raster Software Vigo (Sergio Costas)
#
# This file is part of DeVeDe-NG
#
# DeVeDe-NG is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# DeVeDe-NG 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. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>
from gi.repository import Gtk
import os
import devede.configuration_data
class ask_subtitles:
def __init__(self):
self.config = devede.configuration_data.configuration.get_config()
def run(self):
builder = Gtk.Builder()
builder.set_translation_domain(self.config.gettext_domain)
builder.add_from_file(os.path.join(self.config.glade,"wask_subtitles.ui"))
builder.connect_signals(self)
wask_window = builder.get_object("ask_subtitles")
self.wfilename = builder.get_object("subtitle_file")
self.waccept = builder.get_object("accept")
wlist_encodings = builder.get_object("list_encodings")
wlist_languages = builder.get_object("list_languages")
wencoding = builder.get_object("encoding_l")
wlanguage = builder.get_object("language_l")
lang_selection = 0
enc_selection = 0
self.language = None
self.encoding = None
self.put_upper = False
self.filename = None
counter = 0
encodings = open(os.path.join(self.config.other_path,"codepages.lst"))
for element in encodings:
element = element.strip()
if (element == self.config.sub_codepage):
enc_selection = counter
wlist_encodings.append([element])
counter += 1
encodings.close()
counter = 0
languages = open(os.path.join(self.config.other_path,"languages.lst"))
for element in languages:
element = element.strip()
if (element == self.config.sub_language):
lang_selection = counter
wlist_languages.append([element])
counter += 1
languages.close()
wencoding.set_active(enc_selection)
wlanguage.set_active(lang_selection)
wask_window.show_all()
self.on_subtitle_file_set(None)
retval = wask_window.run()
if (retval == 2): # accept
self.put_upper = builder.get_object("put_subtitles_upper").get_active()
self.config.sub_codepage = wencoding.get_active_id()
self.config.sub_language = wlanguage.get_active_id()
self.encoding = wencoding.get_active_id()
self.language = wlanguage.get_active_id()[:2]
self.filename = self.wfilename.get_filename()
wask_window.destroy()
if (retval == 2):
return True
else:
return False
def on_subtitle_file_set(self,b):
f = self.wfilename.get_filename()
if (f == None) or (f == ""):
self.waccept.set_sensitive(False)
else:
self.waccept.set_sensitive(True)

6
src/devede/configuration_data.py
View file

@ -86,6 +86,8 @@ class configuration(GObject.GObject):
self.film_converter = None
self.menu_converter = None
self.subtitles_font_size = 28
self.sub_language = None
self.sub_codepage = None
config_path = os.path.join(os.environ.get("HOME"),".devede")
try:
@ -176,6 +178,10 @@ class configuration(GObject.GObject):
config_data.write("film_converter:"+str(self.film_converter)+"\n")
if (self.menu_converter != None):
config_data.write("menu_converter:"+str(self.menu_converter)+"\n")
if (self.sub_codepage != None):
config_data.write("sub_codepage:"+str(self.sub_codepage)+"\n")
if (self.sub_language != None):
config_data.write("sub_language:"+str(self.sub_language)+"\n")
config_data.write("subtitle_font_size:"+str(self.subtitles_font_size)+"\n")
config_data.close()
except:

28
src/devede/file_movie.py
View file

@ -21,6 +21,7 @@ import os
import devede.configuration_data
import devede.interface_manager
import devede.converter
import devede.ask_subtitles
class file_movie(devede.interface_manager.interface_manager):
@ -180,6 +181,10 @@ class file_movie(devede.interface_manager.interface_manager):
self.wframe_audio_rate = self.builder.get_object("frame_audio_rate")
self.wframe_division_chapters = self.builder.get_object("frame_division_chapters")
# elements in page SUBTITLES
self.wsubtitles_list = self.builder.get_object("subtitles_list")
self.wdel_subtitles = self.builder.get_object("del_subtitles")
# elements in page VIDEO OPTIONS
self.wsize_1920x1080 = self.builder.get_object("size_1920x1080")
self.wsize_1280x720 = self.builder.get_object("size_1280x720")
@ -187,6 +192,10 @@ class file_movie(devede.interface_manager.interface_manager):
self.wsize_1280x720_ntsc = self.builder.get_object("size_1280x720_ntsc")
self.wframe_final_size = self.builder.get_object("frame_final_size")
self.wframe_aspect_ratio = self.builder.get_object("frame_aspect_ratio")
self.waspect_classic = self.builder.get_object("aspect_classic")
self.wadd_black_bars_pic = self.builder.get_object("add_black_bars_pic")
self.wscale_picture_pic = self.builder.get_object("scale_picture_pic")
self.wcut_picture_pic = self.builder.get_object("cut_picture_pic")
# elements in page AUDIO
self.wsound5_1 = self.builder.get_object("sound5_1")
@ -244,6 +253,19 @@ class file_movie(devede.interface_manager.interface_manager):
self.wnotebook.remove_page(5)
self.update_ui(self.builder)
self.on_aspect_classic_toggled(None)
def on_aspect_classic_toggled(self,b):
status = self.waspect_classic.get_active()
if (status):
self.wadd_black_bars_pic.set_from_file(os.path.join(self.config.pic_path,"to_classic_blackbars.png"))
self.wcut_picture_pic.set_from_file(os.path.join(self.config.pic_path,"to_classic_cut.png"))
self.wscale_picture_pic.set_from_file(os.path.join(self.config.pic_path,"to_classic_scale.png"))
else:
self.wadd_black_bars_pic.set_from_file(os.path.join(self.config.pic_path,"to_wide_blackbars.png"))
self.wcut_picture_pic.set_from_file(os.path.join(self.config.pic_path,"to_wide_cut.png"))
self.wscale_picture_pic.set_from_file(os.path.join(self.config.pic_path,"to_wide_scale.png"))
def on_button_accept_clicked(self,b):
@ -256,3 +278,9 @@ class file_movie(devede.interface_manager.interface_manager):
self.wfile_properties.destroy()
self.wfile_properties = None
self.builder = None
def on_add_subtitles_clicked(self,b):
subt = devede.ask_subtitles.ask_subtitles()
if (subt.run()):
self.wsubtitles_list.append([subt.filename, subt.encoding, subt.language, subt.put_upper])

7
src/devede/interface_manager.py
View file

@ -278,6 +278,11 @@ class interface_manager(GObject.GObject):
for element in self.interface_lists:
exec('self.'+element+' = []')
the_liststore = builder.get_object(element)
ncolumns = the_liststore.get_n_columns()
for row in the_liststore:
exec('self.'+element+'.append(row.model[row.iter])')
final_row = []
for c in range(0,ncolumns):
final_row.append(row.model[row.iter][c])
print (final_row)
exec('self.'+element+'.append(final_row)')