diff --git a/data/interface/wfile_properties.ui b/data/interface/wfile_properties.ui new file mode 100644 index 0000000..7cb4cbd --- /dev/null +++ b/data/interface/wfile_properties.ui @@ -0,0 +1,2318 @@ + + + + + + 128 + 448 + 224 + 32 + 64 + + + 1 + 100 + 5 + 1 + 10 + + + True + False + 0 + none + + + True + False + 12 + + + True + False + + + Split the file in chapters (for easy seeking) + True + True + False + 0 + True + True + + + 0 + 0 + 2 + 1 + + + + + True + False + Size (in minutes) for each chapter: + 0.029999999999999999 + + + 0 + 1 + 1 + 1 + + + + + True + True + adjustment_chapter_size + 1 + 5 + + + 1 + 1 + 1 + 1 + + + + + + + + + True + False + <b>Division in chapters</b> + True + + + + + -30 + 30 + 1 + 10 + + + 10 + 50 + 28 + 1 + 10 + + + 400 + 8500 + 5000 + 1 + 100 + + + 300 + 100 + 1 + 10 + + + True + False + vertical + 4 + + + True + False + 4 + + + True + False + 0 + none + + + True + False + 12 + + + True + False + vertical + + + PAL/SECAM + True + True + False + 0 + True + True + + + False + True + 0 + + + + + NTSC + True + True + False + 0 + True + True + radiobutton_pal + + + False + True + 1 + + + + + + + + + True + False + <b>Video format</b> + True + + + + + False + True + 0 + + + + + True + False + 0 + none + + + True + False + 12 + + + True + False + + + True + True + vertical + adjustment_volume + True + 1 + False + + + 0 + 0 + 1 + 2 + + + + + True + True + number + adjustment_volume + + + 1 + 0 + 1 + 1 + + + + + Reset + True + True + True + + + 1 + 1 + 1 + 1 + + + + + + + + + True + False + <b>Volume (%)</b> + True + + + + + False + True + 1 + + + + + False + True + 0 + + + + + True + False + 4 + + + True + False + 0 + none + + + True + False + 12 + + + True + True + + + + + + + True + False + <b>Video rate (KBits/sec)</b> + True + + + + + False + True + 0 + + + + + True + False + 0 + none + + + True + False + 12 + + + True + True + + + + + + + True + False + <b>Audio rate (KBits/sec)</b> + True + + + + + False + True + 1 + + + + + False + True + 1 + + + + + + False + True + devede.svg + True + False + + + True + False + vertical + 4 + + + True + False + 0 + none + + + True + False + 12 + + + True + False + end + + + + + + + True + False + <b>File</b> + True + + + + + False + True + 0 + + + + + True + False + 0 + none + + + True + False + 12 + + + True + False + 4 + 4 + + + True + False + 0 + Original size (pixels): + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + + + 1 + 0 + 1 + 1 + + + + + True + False + 0 + Original video rate (Kbits/sec): + + + 2 + 0 + 1 + 1 + + + + + True + False + 0 + Original length (seconds): + + + 0 + 1 + 1 + 1 + + + + + True + False + 0 + + + 1 + 1 + 1 + 1 + + + + + True + False + 0 + Original audio rate (Kbits/sec): + + + 2 + 1 + 1 + 1 + + + + + True + False + 0 + Original aspect ratio: + + + 0 + 2 + 1 + 1 + + + + + True + False + 0 + + + 1 + 2 + 1 + 1 + + + + + True + False + 0 + Frames per second: + + + 2 + 2 + 1 + 1 + + + + + True + False + 0 + + + 3 + 0 + 1 + 1 + + + + + True + False + 0 + end + + + 3 + 1 + 1 + 1 + + + + + True + False + 0 + + + 3 + 2 + 1 + 1 + + + + + True + False + 0 + Final size (pixels): + + + 4 + 0 + 1 + 1 + + + + + True + False + 0 + Estimated final length (MBytes): + + + 4 + 1 + 1 + 1 + + + + + True + False + 0 + + + 4 + 2 + 1 + 1 + + + + + True + False + 0 + + + 5 + 0 + 1 + 1 + + + + + True + False + 0 + + + 5 + 1 + 1 + 1 + + + + + True + False + 0 + + + 5 + 2 + 1 + 1 + + + + + + + + + True + False + <b>File info</b> + True + + + + + False + True + 1 + + + + + True + False + 0 + none + + + True + False + 12 + + + True + True + + + True + False + True + + + True + False + 2 + 2 + 2 + 2 + 0 + none + + + True + False + 12 + + + True + False + vertical + + + PAL/SECAM + True + True + False + 0 + True + True + + + False + True + 0 + + + + + NTSC + True + True + False + 0 + True + radiobutton_pal + + + False + True + 1 + + + + + + + + + True + False + <b>Video format</b> + True + + + + + 0 + 0 + 1 + 1 + + + + + True + False + 2 + 2 + 2 + 2 + 0 + none + + + True + False + 12 + + + True + False + + + True + True + vertical + adjustment_volume + True + False + + + 0 + 0 + 1 + 2 + + + + + True + True + 300 + number + adjustment_volume + 300 + + + 1 + 0 + 1 + 1 + + + + + Reset + True + True + True + + + 1 + 1 + 1 + 1 + + + + + + + + + True + False + <b>Volume (%)</b> + True + + + + + 1 + 0 + 1 + 1 + + + + + True + False + 2 + 2 + 2 + 2 + 0 + none + + + True + False + 12 + + + True + True + adjustment_video + + + + + + + True + False + <b>Video rate (KBits/sec)</b> + True + + + + + 0 + 1 + 1 + 1 + + + + + True + False + 2 + 2 + 2 + 2 + 0 + none + + + True + False + 12 + + + True + True + adjustment_audio + + + + + + + True + False + <b>Audio rate (KBits/sec)</b> + True + + + + + 1 + 1 + 1 + 1 + + + + + True + False + 2 + 2 + 2 + 2 + 0 + none + + + True + False + 12 + + + True + False + + + Split the file in chapters (for easy seeking) + True + True + False + 0 + True + True + + + 0 + 0 + 2 + 1 + + + + + True + False + Size (in minutes) for each chapter: + 0.029999999999999999 + + + 0 + 1 + 1 + 1 + + + + + True + True + 5 + adjustment_chapter_size + 1 + 5 + + + 1 + 1 + 1 + 1 + + + + + + + + + True + False + <b>Division in chapters</b> + True + + + + + 0 + 2 + 2 + 1 + + + + + + + True + False + General + + + False + + + + + True + False + vertical + + + True + True + always + in + + + True + True + liststore_subs + + + + + + + + True + True + 0 + + + + + True + False + + + True + False + Font size: + + + False + True + 0 + + + + + True + True + adjustment_font + + + False + True + 1 + + + + + Force subtitles + True + True + False + 0 + True + + + False + True + 2 + + + + + True + False + end + + + gtk-add + True + True + True + True + + + False + True + 0 + + + + + gtk-delete + True + True + True + True + + + False + True + 1 + + + + + True + True + 3 + + + + + False + True + 1 + + + + + 1 + + + + + True + False + Subtitles + + + 1 + False + + + + + True + False + + + True + False + 0 + none + + + True + False + 12 + + + True + False + + + Automatic + True + True + False + 0 + True + True + + + 0 + 0 + 1 + 1 + + + + + 1920x1080 + True + True + False + 0 + True + True + size_auto + + + 1 + 0 + 1 + 1 + + + + + 1280x720 + True + True + False + 0 + True + True + size_auto + + + 2 + 0 + 1 + 1 + + + + + 720x576 + True + True + False + 0 + True + True + size_auto + + + 0 + 1 + 1 + 1 + + + + + 704x576 + True + True + False + 0 + True + True + size_auto + + + 1 + 1 + 1 + 1 + + + + + 480x576 + True + True + False + 0 + True + True + size_auto + + + 2 + 1 + 1 + 1 + + + + + 352x576 + True + True + False + 0 + True + True + size_auto + + + 0 + 2 + 1 + 1 + + + + + 352x288 + True + True + False + 0 + True + True + size_auto + + + 1 + 2 + 1 + 1 + + + + + 160x128 + True + True + False + 0 + 0.52999997138977051 + True + True + size_auto + + + 2 + 2 + 1 + 1 + + + + + + + + + True + False + <b>Final size</b> + True + + + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + none + + + True + False + 12 + + + True + False + vertical + + + Automatic + True + True + False + 0 + True + True + + + False + True + 0 + + + + + 4:3 + True + True + False + 0 + True + True + aspect_auto + + + False + True + 1 + + + + + 16:9 + True + True + False + 0 + 0.52999997138977051 + True + True + aspect_auto + + + False + True + 2 + + + + + + + + + True + False + <b>Aspect ratio</b> + True + + + + + 1 + 0 + 1 + 1 + + + + + True + False + 0 + none + + + True + False + 12 + + + True + False + + + No rotation + True + True + False + 0 + True + True + + + 0 + 0 + 1 + 1 + + + + + Rotate 90 degrees clockwise + True + True + False + 0 + True + True + rotation_0 + + + 1 + 0 + 1 + 1 + + + + + Rotate 180 degrees + True + True + False + 0 + True + True + rotation_0 + + + 0 + 1 + 1 + 1 + + + + + Rotate 90 degrees counter-clockwise + True + True + False + 0 + True + True + rotation_0 + + + 1 + 1 + 1 + 1 + + + + + + + + + True + False + <b>Rotation</b> + True + + + + + 0 + 1 + 1 + 1 + + + + + True + False + 0 + none + + + True + False + 12 + + + True + False + vertical + + + Horizontal mirror + True + True + False + 0 + True + + + False + True + 0 + + + + + Vertical mirror + True + True + False + 0 + True + + + False + True + 1 + + + + + + + + + True + False + <b>Mirror</b> + True + + + + + 1 + 1 + 1 + 1 + + + + + True + False + 0 + none + + + True + False + 12 + + + True + False + + + Add black bars + True + True + False + 0 + True + True + + + 0 + 0 + 1 + 1 + + + + + Scale picture + True + True + False + 0 + True + True + add_black_bars + + + 1 + 0 + 1 + 1 + + + + + Cut picture + True + True + False + 0 + True + True + add_black_bars + + + 2 + 0 + 1 + 1 + + + + + True + False + gtk-missing-image + + + 0 + 1 + 1 + 1 + + + + + True + False + gtk-missing-image + + + 1 + 1 + 1 + 1 + + + + + True + False + gtk-missing-image + + + 2 + 1 + 1 + 1 + + + + + + + + + True + False + <b>Scaling mode</b> + True + + + + + 0 + 2 + 2 + 1 + + + + + 2 + + + + + True + False + Video options + + + 2 + False + + + + + True + False + vertical + + + True + False + 0 + none + + + True + False + 12 + + + Use dual pass encoding (better quality, much slower conversion) + True + True + False + 0 + True + + + + + + + True + False + <b>Two pass encoding</b> + True + + + + + False + True + 0 + + + + + True + False + 0 + none + + + True + False + 12 + + + True + False + vertical + + + Don't deinterlace + True + True + False + 0 + True + True + + + False + True + 0 + + + + + FFMpeg deinterlacing filter + True + True + False + 0 + True + True + deinterlace_none + + + False + True + 1 + + + + + TADIF deinterlacing filter + True + True + False + 0 + True + True + deinterlace_none + + + False + True + 2 + + + + + + + + + True + False + <b>Deinterlacing</b> + True + + + + + False + True + 1 + + + + + 3 + + + + + True + False + Quality + + + 3 + False + + + + + True + False + 0 + none + + + True + False + 12 + + + True + False + vertical + + + True + False + + + True + False + Audio delay (in seconds): + + + False + True + 0 + + + + + True + True + adjustment_delay + 1 + + + False + True + 1 + + + + + False + True + 0 + + + + + Create DVD with 5.1 channel sound + True + True + False + 0 + True + + + False + True + 1 + + + + + This file already has AC3 sound (copy audio data instead of recompress it) + True + True + False + 0 + True + + + False + True + 2 + + + + + + + + + True + False + <b>Audio</b> + True + + + + + 4 + + + + + True + False + Audio + + + 4 + False + + + + + True + False + vertical + + + True + False + 0 + none + + + True + False + 12 + + + True + False + vertical + + + This file is already a DVD/xCD-suitable MPEG-PS file + True + True + False + 0 + True + + + False + True + 0 + + + + + Repack audio and video without reencoding (useful for VOB files) + True + True + False + 0 + True + + + False + True + 1 + + + + + Use a GOP of 12 frames (improves compatibility) + True + True + False + 0 + True + + + False + True + 2 + + + + + + + + + True + False + <b>Special</b> + True + + + + + False + True + 0 + + + + + True + False + 0 + none + + + True + False + 12 + + + True + False + + + True + False + 0 + Main (-X -Y) + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + -VF (X,Y) + + + 0 + 1 + 1 + 1 + + + + + True + True + + + 1 + 0 + 1 + 1 + + + + + True + True + + + 1 + 1 + 1 + 1 + + + + + + + + + True + False + <b>Extra parameters for coder</b> + True + + + + + False + True + 1 + + + + + 5 + + + + + True + False + Misc + + + 5 + False + + + + + + + + + True + False + <b>Options</b> + True + + + + + False + True + 2 + + + + + Preview + True + True + True + + + False + True + 3 + + + + + True + False + end + + + gtk-help + True + True + True + True + + + False + True + 0 + True + + + + + gtk-cancel + True + True + True + True + + + False + True + 1 + + + + + gtk-ok + True + True + True + True + + + False + True + 2 + + + + + False + True + 4 + + + + + + + + + + + diff --git a/data/interface/wmain.ui~ b/data/interface/wmain.ui~ deleted file mode 100644 index b0f2d32..0000000 --- a/data/interface/wmain.ui~ +++ /dev/null @@ -1,943 +0,0 @@ - - - - - - - - - - - - 8.5 GB DVD - - - 4.7 GB DVD - - - 1.4 GB DVD - - - 700 MB CD - - - 659 MB CD - - - 185 MB CD - - - - - - - - - - - - - - - - - - - - - 750 - 440 - False - Devede - center - devede.svg - - - - True - False - vertical - - - True - False - - - True - False - _Archivo - True - - - True - False - - - gtk-new - True - False - True - True - - - - - gtk-open - True - False - True - True - - - - - gtk-save - True - False - True - True - - - - - gtk-save-as - True - False - True - True - - - - - True - False - - - - - gtk-quit - True - False - True - True - - - - - - - - - True - False - _Editar - True - - - True - False - - - gtk-cut - True - False - True - True - - - - - gtk-copy - True - False - True - True - - - - - gtk-paste - True - False - True - True - - - - - gtk-delete - True - False - True - True - - - - - - - - - True - False - _Ver - True - - - - - True - False - Ay_uda - True - - - True - False - - - gtk-about - True - False - True - True - - - - - - - - - False - True - 0 - - - - - True - False - - - True - False - 0 - none - - - True - False - 12 - - - True - False - vertical - - - True - True - in - - - True - True - liststore_titles - False - True - False - False - - - - - - - Titles - - - - 0 - - - - - - - - - True - True - 0 - - - - - True - False - - - gtk-add - True - True - True - True - top - True - - - - False - True - 0 - - - - - gtk-remove - True - True - True - True - top - True - - - - False - True - 1 - - - - - gtk-go-down - True - True - True - True - top - True - - - - False - True - 2 - - - - - gtk-go-up - True - True - True - True - top - True - - - - False - True - 3 - - - - - gtk-properties - True - True - True - True - top - True - - - False - True - 4 - - - - - False - True - 1 - - - - - - - - - True - False - <b>Titles</b> - True - - - - - True - True - 0 - - - - - True - False - 0 - none - - - True - False - 12 - - - True - False - vertical - - - True - True - in - - - True - True - liststore_files - False - True - False - False - - - - - - - column - - - - 0 - - - - - - - - - True - True - 0 - - - - - True - False - - - gtk-add - True - True - True - True - top - True - - - - False - True - 0 - - - - - gtk-remove - True - True - True - True - top - True - - - - False - True - 1 - - - - - gtk-go-down - True - True - True - True - top - True - - - - False - True - 2 - - - - - gtk-go-up - True - True - True - True - top - True - - - - False - True - 3 - - - - - gtk-properties - True - True - True - True - top - True - - - False - True - 4 - - - - - True - True - True - 0.4699999988079071 - top - - - True - False - vertical - - - True - False - video-display - - - False - True - 0 - - - - - True - False - Preview - - - False - True - 1 - - - - - - - False - True - 5 - - - - - False - True - 1 - - - - - - - - - True - False - <b>Files</b> - True - - - - - True - True - 1 - - - - - True - True - 1 - - - - - True - False - 0 - none - - - True - False - 12 - - - True - False - vertical - - - True - False - 0 - Media size: - middle - - - False - True - 0 - - - - - True - False - - - True - False - disc_size_list - 1 - 0 - - - - 0 - - - - - False - True - 0 - - - - - True - False - - - True - True - 1 - - - - - Adjust disc usage - True - True - True - - - - False - True - 2 - - - - - False - True - 1 - - - - - - - - - True - False - <b>Disc usage</b> - True - - - - - False - True - 2 - - - - - True - False - True - - - True - False - 0 - none - - - True - False - 12 - - - True - False - - - PAL - True - True - False - 0 - True - True - use_ntsc - - - False - True - 4 - 0 - - - - - NTSC - True - True - False - 0 - True - - - False - True - 4 - 1 - - - - - - - - - True - False - <b>Default format</b> - True - - - - - False - True - 0 - - - - - True - False - 0 - none - - - True - False - 12 - - - True - False - - - Create a menu with the titles - True - True - False - 0 - True - - - 0 - 0 - 2 - 1 - - - - - Menu options - True - True - True - - - 0 - 1 - 1 - 1 - - - - - Preview menu - True - True - True - - - 1 - 1 - 1 - 1 - - - - - - - - - True - False - <b>Menus</b> - True - - - - - False - True - 1 - - - - - False - True - 3 - - - - - True - False - - - False - True - 7 - 4 - - - - - True - False - end - - - gtk-help - True - True - True - True - - - False - True - 0 - True - - - - - gtk-quit - True - True - True - True - - - - False - True - 1 - - - - - gtk-go-forward - True - True - True - True - - - False - True - 2 - - - - - False - True - 5 - - - - - - diff --git a/data/interface/wselect_disk.ui~ b/data/interface/wselect_disk.ui~ deleted file mode 100644 index 13fa7f6..0000000 --- a/data/interface/wselect_disk.ui~ +++ /dev/null @@ -1,267 +0,0 @@ - - - - - - False - center - devede.svg - - - - True - False - vertical - - - True - False - <b>Choose the disc type you want to create with DeVeDe</b> - True - - - True - True - 15 - 0 - - - - - True - True - True - - - - True - False - - - True - False - icon_dvd.png - - - False - True - 0 - - - - - True - False - 0 - <b>Video DVD</b> -Creates a video DVD suitable for all DVD home players - True - - - True - True - 4 - 1 - - - - - - - True - True - 1 - - - - - True - True - True - - - - True - False - - - True - False - icon_vcd.png - - - False - True - 0 - - - - - True - False - 0 - <b>VideoCD</b> -Creates a VideoCD, with a picture quality equivalent to VHS - True - - - True - True - 4 - 1 - - - - - - - True - True - 2 - - - - - True - True - True - - - - True - False - - - True - False - icon_svcd.png - - - False - True - 0 - - - - - True - False - 0 - <b>Super VideoCD</b> -Creates a VideoCD with better picture quality - True - - - True - True - 4 - 1 - - - - - - - True - True - 3 - - - - - True - True - True - - - - True - False - - - True - False - icon_cvd.png - - - False - True - 0 - - - - - True - False - 0 - <b>China VideoDisc</b> -Another kind of Super VideoCD - True - - - True - True - 4 - 1 - - - - - - - True - True - 4 - - - - - True - True - True - - - - True - False - - - True - False - icon_divx.png - - - False - True - 0 - - - - - True - False - 0 - <b>DivX / MPEG-4</b> -Creates files compliant with DivX home players - True - - - True - True - 4 - 1 - - - - - - - True - True - 5 - - - - - - diff --git a/src/devede/add_files.py b/src/devede/add_files.py index 0b65088..4af4ef4 100644 --- a/src/devede/add_files.py +++ b/src/devede/add_files.py @@ -22,9 +22,9 @@ class add_files: last_path = None - def __init__(self,paths): + def __init__(self,config): - self.paths = paths + self.config = config self.show_title_options = True def set_type(self,disc_type): @@ -37,9 +37,9 @@ class add_files: def run(self): builder = Gtk.Builder() - builder.set_translation_domain("devede_ng") + builder.set_translation_domain(self.config.gettext_domain) - builder.add_from_file(os.path.join(self.paths.glade,"wadd_files.ui")) + builder.add_from_file(os.path.join(self.config.glade,"wadd_files.ui")) builder.connect_signals(self) wadd_files = builder.get_object("add_files") self.wfile_chooser = builder.get_object("filechooserwidget1") diff --git a/src/devede/ask.py b/src/devede/ask.py index e56aabe..e482393 100644 --- a/src/devede/ask.py +++ b/src/devede/ask.py @@ -20,16 +20,16 @@ import os class ask_window: - def __init__(self,paths): + def __init__(self,config): - self.paths = paths + self.config = config def run(self,text,title): builder = Gtk.Builder() - builder.set_translation_domain("devede_ng") + builder.set_translation_domain(self.config.gettext_domain) - builder.add_from_file(os.path.join(self.paths.glade,"wask.ui")) + builder.add_from_file(os.path.join(self.config.glade,"wask.ui")) builder.connect_signals(self) wask_window = builder.get_object("dialog_ask") wask_window.set_title(title) diff --git a/src/devede/configuration_data.py b/src/devede/configuration_data.py new file mode 100644 index 0000000..7189d5f --- /dev/null +++ b/src/devede/configuration_data.py @@ -0,0 +1,61 @@ +#!/usr/bin/env python3 + +# 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 + +import os + +class configuration: + + def __init__(self): + + self.error = False + is_local = None + + try: + os.stat("/usr/share/devede_ng/wselect_disk.ui") + is_local = False + except: + pass + + if is_local == None: + try: + os.stat("/usr/local/share/devede_ng/wselect_disk.ui") + is_local = True + except: + pass + + if is_local == None: + self.error = True + else: + if (is_local): + # locales must be always at /usr/share/locale because Gtk.Builder always search there + self.share_locale="/usr/share/locale" + self.glade="/usr/local/share/devede_ng" + self.font_path="/usr/local/share/devede_ng" + self.pic_path="/usr/local/share/devede_ng" + self.other_path="/usr/local/share/devede_ng" + self.help_path="/usr/local/share/doc/devede_ng" + else: + self.share_locale="/usr/share/locale" + self.glade="/usr/share/devede_ng" + self.font_path="/usr/share/devede_ng" + self.pic_path="/usr/share/devede_ng" + self.other_path="/usr/share/devede_ng" + self.help_path="/usr/share/doc/devede_ng" + + self.gettext_domain = "devede_ng" diff --git a/src/devede/file_movie.py b/src/devede/file_movie.py index fea1c72..bdc763f 100644 --- a/src/devede/file_movie.py +++ b/src/devede/file_movie.py @@ -21,10 +21,10 @@ class file_movie(GObject.GObject): counter2 = 0 - def __init__(self,paths,file_name): + def __init__(self,config,file_name): GObject.GObject.__init__(self) - self.paths = paths + self.config = config self.file_name = file_name def set_type(self,disc_type): diff --git a/src/devede/project.py b/src/devede/project.py index 7f598a8..df9cf75 100644 --- a/src/devede/project.py +++ b/src/devede/project.py @@ -25,9 +25,9 @@ import devede.add_files class devede_project: - def __init__(self,paths): + def __init__(self,config): - self.paths = paths + self.config = config self.destroy_all() @@ -68,9 +68,9 @@ class devede_project: return builder = Gtk.Builder() - builder.set_translation_domain("devede_ng") + builder.set_translation_domain(self.config.gettext_domain) - builder.add_from_file(os.path.join(self.paths.glade,"wselect_disk.ui")) + builder.add_from_file(os.path.join(self.config.glade,"wselect_disk.ui")) builder.connect_signals(self) self.wask_window = builder.get_object("wselect_disk") self.wask_window.show_all() @@ -239,9 +239,9 @@ class devede_project: self.current_title = None builder = Gtk.Builder() - builder.set_translation_domain("devede_ng") + builder.set_translation_domain(self.config.gettext_domain) - builder.add_from_file(os.path.join(self.paths.glade,"wmain.ui")) + builder.add_from_file(os.path.join(self.config.glade,"wmain.ui")) builder.connect_signals(self) # Interface widgets @@ -280,7 +280,7 @@ class devede_project: def on_wmain_window_delete_event(self,b,e=None): - ask = devede.ask.ask_window(self.paths) + ask = devede.ask.ask_window(self.config) if (ask.run(_("Abort the current DVD and exit?"),_("Exit DeVeDe"))): Gtk.main_quit() return True @@ -290,7 +290,7 @@ class devede_project: self.get_current_title() - new_title = devede.title.title(self.paths,self.wfiles,self.wliststore_files) + new_title = devede.title.title(self.config,self.wfiles,self.wliststore_files) new_title.set_type(self.disc_type) self.wliststore_titles.append([new_title.title_name, new_title]) self.set_interface_status(None) @@ -301,20 +301,20 @@ class devede_project: if (element == None): return - ask_files = devede.add_files.add_files(self.paths) + ask_files = devede.add_files.add_files(self.config) ask_files.set_type(self.disc_type) if (ask_files.run()): for efile in ask_files.files: - new_file = devede.file_movie.file_movie(self.paths,efile) + new_file = devede.file_movie.file_movie(self.config,efile) new_file.set_type(self.disc_type) if (ask_files.add_to_current_title): element.add_file(new_file) else: if (ask_files.use_filename_as_title): filename = os.path.splitext(os.path.basename(efile))[0] - new_title = devede.title.title(self.paths,self.wfiles,self.wliststore_files,filename) + new_title = devede.title.title(self.config,self.wfiles,self.wliststore_files,filename) else: - new_title = devede.title.title(self.paths,self.wfiles,self.wliststore_files) + new_title = devede.title.title(self.config,self.wfiles,self.wliststore_files) new_title.set_type(self.disc_type) self.wliststore_titles.append([new_title.title_name, new_title]) new_title.add_file(new_file) @@ -327,7 +327,7 @@ class devede_project: if (element == None): return - ask_w = devede.ask.ask_window(self.paths) + ask_w = devede.ask.ask_window(self.config) if (ask_w.run(_("The title %(X)s will be removed.") % {"X":element.title_name},_("Delete title"))): element.delete_title() model.remove(treeiter) @@ -339,7 +339,7 @@ class devede_project: if (element == None): return - ask_w = devede.ask.ask_window(self.paths) + ask_w = devede.ask.ask_window(self.config) if (ask_w.run(_("The file %(X)s will be removed.") % {"X":element.file_name},_("Delete file"))): element.delete_file() model.remove(treeiter) diff --git a/src/devede/title.py b/src/devede/title.py index a3c1f09..bbe90f8 100644 --- a/src/devede/title.py +++ b/src/devede/title.py @@ -22,10 +22,10 @@ class title(GObject.GObject): counter = 0 - def __init__(self,paths,file_treeview,original_liststore,title_name = None): + def __init__(self,config,file_treeview,original_liststore,title_name = None): GObject.GObject.__init__(self) - self.paths = paths + self.config = config self.file_treeview = file_treeview if (title_name == None): title.counter += 1 @@ -46,9 +46,9 @@ class title(GObject.GObject): def properties(self): builder = Gtk.Builder() - builder.set_translation_domain("devede_ng") + builder.set_translation_domain(self.config.gettext_domain) - builder.add_from_file(os.path.join(self.paths.glade,"wtitle_properties.ui")) + builder.add_from_file(os.path.join(self.config.glade,"wtitle_properties.ui")) builder.connect_signals(self) # Interface widgets diff --git a/src/devede_ng.py b/src/devede_ng.py index a6d52eb..1ddf056 100755 --- a/src/devede_ng.py +++ b/src/devede_ng.py @@ -18,66 +18,31 @@ # along with this program. If not, see import sys -import os import gettext import locale from gi.repository import Gtk import devede.project +import devede.configuration_data -class config_paths: +config_data = devede.configuration_data.configuration() - def __init__(self,is_local): - - if (is_local): - # locales must be always at /usr/share/locale because Gtk.Builder always search there - self.share_locale="/usr/share/locale" - self.glade="/usr/local/share/devede_ng" - self.font_path="/usr/local/share/devede_ng" - self.pic_path="/usr/local/share/devede_ng" - self.other_path="/usr/local/share/devede_ng" - self.help_path="/usr/local/share/doc/devede_ng" - else: - self.share_locale="/usr/share/locale" - self.glade="/usr/share/devede_ng" - self.font_path="/usr/share/devede_ng" - self.pic_path="/usr/share/devede_ng" - self.other_path="/usr/share/devede_ng" - self.help_path="/usr/share/doc/devede_ng" - - - -paths = None - -try: - os.stat("/usr/share/devede_ng/wselect_disk.ui") - paths = config_paths(False) -except: - pass - -if paths == None: - try: - os.stat("/usr/local/share/devede_ng/wselect_disk.ui") - paths = config_paths(True) - except: - pass - -if paths == None: +if config_data.error: print ("Can't locate extra files. Aborting.") sys.exit(1) -gettext.bindtextdomain('devede_ng',paths.share_locale) +gettext.bindtextdomain(config_data.gettext_domain,config_data.share_locale) try: locale.setlocale(locale.LC_ALL,"") except locale.Error: pass -gettext.textdomain('devede_ng') -gettext.install("devede_ng",localedir=paths.share_locale) +gettext.textdomain(config_data.gettext_domain) +gettext.install(config_data.gettext_domain,localedir=config_data.share_locale) _ = gettext.gettext Gtk.init(sys.argv) -mwindow = devede.project.devede_project(paths) +mwindow = devede.project.devede_project(config_data) mwindow.ask_type() Gtk.main()