Packman Build Service PMBS

selene.changes Changed

selene.spec Changed

@@ -16,24 +16,22 @@
 #
 
 
-%define _version 2.5.2~185~ubuntu15.04.1
+%define _version 2.5.8~198~ubuntu15.10.1
 Name:           selene
-Version:        2.5.2
+Version:        2.5.8
 Release:        0
 Summary:        GUI audio-video converter for GNU/Linux
 License:        GPL-3.0+
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 Url:            https://launchpad.net/selene
 Source:         http://ppa.launchpad.net/teejee2008/ppa/ubuntu/pool/main/s/%{name}/%{name}_%{_version}.tar.xz
-# PATCH-FIX-UPSTREAM selene-fix-makefile.patch sor.alexei@meowr.ru -- Various fixes to Makefile.
+# PATCH-FIX-OPENSUSE selene-fix-makefile.patch sor.alexei@meowr.ru -- Various Makefile fixes.
 Patch0:         %{name}-fix-makefile.patch
-# PATCH-FIX-UPSTREAM selene-liststore.patch sor.alexei@meowr.ru -- error: `ListStore' is an ambiguous reference between `GLib.ListStore' and `Gtk.ListStore'.
-Patch1:         %{name}-liststore.patch
 BuildRequires:  fdupes
 BuildRequires:  gettext
 BuildRequires:  update-desktop-files
 BuildRequires:  vala
-BuildRequires:  pkgconfig(gee-1.0)
+BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(json-glib-1.0)
@@ -45,7 +43,7 @@
 Requires:       rsync
 Requires:       vorbis-tools
 Requires:       x264
-Recommends:     %{name}-lang = %{version}
+Recommends:     %{name}-lang
 Recommends:     ffmpeg2theora
 Recommends:     gpac
 Recommends:     opus-tools
@@ -63,7 +61,6 @@
 %prep
 %setup -q -n %{name}-%{_version}
 %patch0 -p1
-%patch1 -p1
 sed -i 's/^Caption=/Comment=/' src/%{name}.desktop
 # Use ffmpeg instead of libav.
 find src/ -type f | while read file; do

selene-fix-makefile.patch Changed

@@ -18,12 +18,12 @@
  
  all:
  	#build binaries
--	valac -X -D'GETTEXT_PACKAGE="${app_name}"' --Xcc="-lm" -X -Wl,-rpath,/usr/share/${app_name}/libs "Main.vala" "Utility.vala" "MainWindow.vala" "AppConfigWindow.vala" "EncoderConfigWindow.vala" "EncoderStatusWindow.vala" "FileInfoWindow.vala" "AboutWindow.vala" "DonationWindow.vala" -o ${app_name} --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix --pkg gtk+-3.0 --pkg gee-1.0 --pkg json-glib-1.0 
-+	valac -X -D'GETTEXT_PACKAGE="${app_name}"' --Xcc="-lm" -X -Wl,-rpath,$(libdir)/$(app_name) "Main.vala" "Utility.vala" "MainWindow.vala" "AppConfigWindow.vala" "EncoderConfigWindow.vala" "EncoderStatusWindow.vala" "FileInfoWindow.vala" "AboutWindow.vala" "DonationWindow.vala" -o $(app_name) --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix --pkg gtk+-3.0 --pkg gee-1.0 --pkg json-glib-1.0 
+-	valac -X -D'GETTEXT_PACKAGE="${app_name}"' --Xcc="-lm" -X -Wl,-rpath,/usr/share/${app_name}/libs "Main.vala" "Utility.vala" "MainWindow.vala" "AppConfigWindow.vala" "EncoderConfigWindow.vala" "EncoderStatusWindow.vala" "FileInfoWindow.vala" "AboutWindow.vala" "DonationWindow.vala" -o ${app_name} --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix --pkg gtk+-3.0 --pkg gee-0.8 --pkg json-glib-1.0
++	valac -X -D'GETTEXT_PACKAGE="${app_name}"' --Xcc="-lm" -X -Wl,-rpath,$(libdir)/$(app_name) "Main.vala" "Utility.vala" "MainWindow.vala" "AppConfigWindow.vala" "EncoderConfigWindow.vala" "EncoderStatusWindow.vala" "FileInfoWindow.vala" "AboutWindow.vala" "DonationWindow.vala" -o $(app_name) --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix --pkg gtk+-3.0 --pkg gee-0.8 --pkg json-glib-1.0
  
  	#update translation template
  	xgettext --language=C --keyword=_ --copyright-holder='Tony George (teejee2008@gmail.com)' --package-name='${app_name}' --package-version='2.2' --msgid-bugs-address='teejee2008@gmail.com' --escape --sort-output -o ../${app_name}.pot *.vala
-@@ -22,6 +25,7 @@
+@@ -22,6 +25,7 @@ clean:
  install:
  	mkdir -p "$(DESTDIR)$(bindir)"
  	mkdir -p "$(DESTDIR)$(sharedir)"
@@ -31,12 +31,12 @@
  	mkdir -p "$(DESTDIR)$(mandir)"
  	mkdir -p "$(DESTDIR)$(man1dir)"
  	mkdir -p "$(DESTDIR)$(launcherdir)"
-@@ -35,7 +39,7 @@
- 	
+@@ -35,7 +39,7 @@ install:
+ 
  	#shared files
  	cp -dpr --no-preserve=ownership -t "$(DESTDIR)$(sharedir)/${app_name}" ./share/${app_name}/*
 -	chmod --recursive 0755 $(DESTDIR)$(sharedir)/${app_name}/*
 +	chmod -R a-rwx,u+rwX,g+rwX,o+rX $(DESTDIR)$(sharedir)/${app_name}/*
- 	
+ 
  	#launcher
  	install -m 0755 ${app_name}.desktop "$(DESTDIR)$(launcherdir)"

selene-liststore.patch Deleted

@@ -1,115 +0,0 @@
-diff -aur a/src/EncoderConfigWindow.vala b/src/EncoderConfigWindow.vala
---- a/src/EncoderConfigWindow.vala
-+++ b/src/EncoderConfigWindow.vala
-@@ -1200,12 +1200,12 @@
- 	}
- 	
- 	private void cmbFileFormat_changed(){
--		ListStore model;
-+		Gtk.ListStore model;
- 		TreeIter iter;
- 		
- 		//populate file extensions ---------------------------
- 		
--		model = new ListStore(2, typeof(string), typeof(string));
-+		model = new Gtk.ListStore(2, typeof(string), typeof(string));
- 		cmbFileExtension.set_model(model);
- 
- 		switch (format) {
-@@ -1470,7 +1470,7 @@
- 	}
- 	
- 	private void cmbACodec_changed(){
--		ListStore model;
-+		Gtk.ListStore model;
- 		TreeIter iter;
- 
- 		//show & hide options
-@@ -1891,7 +1891,7 @@
- 	}
- 
- 	private void cmbVCodec_changed(){
--		ListStore model;
-+		Gtk.ListStore model;
- 		TreeIter iter;
- 		
- 		//show x264 options
-diff -aur a/src/MainWindow.vala b/src/MainWindow.vala
---- a/src/MainWindow.vala
-+++ b/src/MainWindow.vala
-@@ -632,7 +632,7 @@
- 	
- 	private void cmbScriptFolder_changed(){
- 		//create empty model
--		ListStore model = new ListStore(2, typeof(ScriptFile), typeof(string));
-+		Gtk.ListStore model = new Gtk.ListStore(2, typeof(ScriptFile), typeof(string));
- 		cmbScriptFile.set_model(model);
- 		
- 		string path = gtk_combobox_get_value(cmbScriptFolder,0,"");
-@@ -721,7 +721,7 @@
- 			cmbScriptFolder.set_active(-1); 
- 			
- 			//add the selected file
--			ListStore model1 = new ListStore(2, typeof(ScriptFile), typeof(string));
-+			Gtk.ListStore model1 = new Gtk.ListStore(2, typeof(ScriptFile), typeof(string));
- 			cmbScriptFile.set_model(model1);
- 			ScriptFile sh = new ScriptFile(filePath);
- 			model1.append(out iter);
-@@ -732,7 +732,7 @@
- 		}
- 
- 		//select file
--		ListStore model1 = (ListStore) cmbScriptFile.model;
-+		Gtk.ListStore model1 = (Gtk.ListStore) cmbScriptFile.model;
- 		for (bool next = model1.get_iter_first (out iter); next; next = model1.iter_next (ref iter)) {
- 			ScriptFile sh = new ScriptFile(filePath);
- 			model1.get (iter, 0, out sh);
-@@ -1213,10 +1213,10 @@
- 			MediaFile file = App.InputFiles[index];
- 			
- 			if (file.crop_detect()){
--				((ListStore)tvFiles.model).set (iter, InputField.FILE_CROPVAL, file.crop_values_info());
-+				((Gtk.ListStore)tvFiles.model).set (iter, InputField.FILE_CROPVAL, file.crop_values_info());
- 			}
- 			else{
--				((ListStore)tvFiles.model).set (iter, InputField.FILE_CROPVAL, _("N/A"));
-+				((Gtk.ListStore)tvFiles.model).set (iter, InputField.FILE_CROPVAL, _("N/A"));
- 			}	
- 			
- 			do_events();
-@@ -1341,7 +1341,7 @@
-     }
- 
- 	private void refresh_file_list (bool refresh_model){
--		ListStore inputStore = new ListStore (9, typeof(MediaFile), typeof (string), typeof (string), typeof (string), typeof (string), typeof (string), typeof (string), typeof (int), typeof (string));
-+		Gtk.ListStore inputStore = new Gtk.ListStore (9, typeof(MediaFile), typeof (string), typeof (string), typeof (string), typeof (string), typeof (string), typeof (string), typeof (int), typeof (string));
- 		
- 		TreeIter iter;
- 		foreach(MediaFile mFile in App.InputFiles) {
-@@ -1381,7 +1381,7 @@
- 			}
- 		}
- 		
--		ListStore model = (ListStore) tvFiles.model;
-+		Gtk.ListStore model = (Gtk.ListStore) tvFiles.model;
- 		TreeIter iter;
- 		model.get_iter (out iter, new TreePath.from_string (path));
- 		model.set (iter, InputField.FILE_CROPVAL, mf.crop_values_info());
-@@ -1651,7 +1651,7 @@
- 
- 	public bool update_status(){
- 		TreeIter iter;
--		ListStore model = (ListStore)tvFiles.model;
-+		Gtk.ListStore model = (Gtk.ListStore)tvFiles.model;
- 
- 		switch (App.Status) {
- 			case AppStatus.PAUSED:
-@@ -1747,7 +1747,7 @@
- 	}
- 	
- 	public void update_status_all(){
--		ListStore model = (ListStore)tvFiles.model;
-+		Gtk.ListStore model = (Gtk.ListStore)tvFiles.model;
- 		MediaFile mf;
- 		int index = -1;
- 		TreeIter iter;

selene_2.5.2~185~ubuntu15.04.1.tar.xz/doc/README Deleted

selene_2.5.2~185~ubuntu15.04.1.tar.xz/doc/README-Scripts Deleted

selene_2.5.2~185~ubuntu15.04.1.tar.xz/doc/changelog Deleted

selene_2.5.2~185~ubuntu15.04.1.tar.xz/build-release.sh -> selene_2.5.8~198~ubuntu15.10.1.tar.xz/build-release.sh Changed

selene_2.5.8~198~ubuntu15.10.1.tar.xz/build.sh Added

selene_2.5.2~185~ubuntu15.04.1.tar.xz/debian/bzr-builder.manifest -> selene_2.5.8~198~ubuntu15.10.1.tar.xz/debian/bzr-builder.manifest Changed

selene_2.5.2~185~ubuntu15.04.1.tar.xz/debian/changelog -> selene_2.5.8~198~ubuntu15.10.1.tar.xz/debian/changelog Changed

selene_2.5.2~185~ubuntu15.04.1.tar.xz/debian/control -> selene_2.5.8~198~ubuntu15.10.1.tar.xz/debian/control Changed

selene_2.5.2~185~ubuntu15.04.1.tar.xz/selene.geany -> selene_2.5.8~198~ubuntu15.10.1.tar.xz/selene.geany Changed

@@ -17,19 +17,13 @@
 long_line_column=80
 
 [files]
-current_page=9
-FILE_NAME_0=39672;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FUtility.vala;0;4
-FILE_NAME_1=906;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMain.vala;0;4
-FILE_NAME_2=52504;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMainWindow.vala;0;4
-FILE_NAME_3=459;Make;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2Fmakefile;0;4
-FILE_NAME_4=882;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FFileInfoWindow.vala;0;4
-FILE_NAME_5=925;Sh;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Finstaller%2Finstall.sh;0;4
-FILE_NAME_6=346;None;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fdebian%2Fchangelog;0;4
-FILE_NAME_7=8355;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FAboutWindow.vala;0;4
-FILE_NAME_8=380;Conf;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fdebian%2Fcontrol;0;4
-FILE_NAME_9=13551;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FEncoderConfigWindow.vala;0;4
-FILE_NAME_10=1353;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FAppConfigWindow.vala;0;4
-FILE_NAME_11=1248;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FEncoderStatusWindow.vala;0;4
+current_page=2
+FILE_NAME_0=9149;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FUtility.vala;0;4
+FILE_NAME_1=1189;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMain.vala;0;4
+FILE_NAME_2=26275;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMainWindow.vala;0;4
+FILE_NAME_3=618;Make;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2Fmakefile;0;4
+FILE_NAME_4=160;None;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fdebian%2Fchangelog;0;4
+FILE_NAME_5=186;Conf;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fdebian%2Fcontrol;0;4
 
 [VTE]
 last_dir=/home/teejee

selene_2.5.2~185~ubuntu15.04.1.tar.xz/selene.pot -> selene_2.5.8~198~ubuntu15.10.1.tar.xz/selene.pot Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: selene 2.2\n"
 "Report-Msgid-Bugs-To: teejee2008@gmail.com\n"
-"POT-Creation-Date: 2015-01-26 15:51+0530\n"
+"POT-Creation-Date: 2015-09-07 20:26-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: EncoderConfigWindow.vala:2304
+#: EncoderConfigWindow.vala:2361
 msgid ""
 "\n"
 "\n"
@@ -25,7 +25,7 @@
 "and should start with same name."
 msgstr ""
 
-#: EncoderConfigWindow.vala:490
+#: EncoderConfigWindow.vala:514
 msgid ""
 "Additional Options\n"
 "These options will be passed to the encoder\n"
@@ -33,19 +33,19 @@
 "any options that are already provided by the GUI."
 msgstr ""
 
-#: EncoderConfigWindow.vala:899
+#: EncoderConfigWindow.vala:923
 msgid "Adjustments:"
 msgstr ""
 
-#: AppConfigWindow.vala:88
+#: AppConfigWindow.vala:127
 msgid "Backup Folder"
 msgstr ""
 
-#: EncoderConfigWindow.vala:818
+#: EncoderConfigWindow.vala:842
 msgid "Channels &amp; Sampling:"
 msgstr ""
 
-#: EncoderConfigWindow.vala:458
+#: EncoderConfigWindow.vala:461
 msgid ""
 "Compression Vs Device Compatibility\n"
 "'High' profile gives the best compression.\n"
@@ -54,115 +54,136 @@
 "support the 'High' profile"
 msgstr ""
 
-#: EncoderConfigWindow.vala:426
+#: EncoderConfigWindow.vala:429
 msgid ""
 "Compression Vs Encoding Speed\n"
 "Slower presets give better compression and smaller files\n"
 "but take more time to encode."
 msgstr ""
 
-#: EncoderConfigWindow.vala:411
+#: EncoderConfigWindow.vala:414
 msgid ""
 "Compression Vs Quality\n"
 "Smaller values give better quality video and larger files"
 msgstr ""
 
-#: EncoderConfigWindow.vala:1141
+#: EncoderConfigWindow.vala:1165
 msgid ""
 "Embed - Subtitle files will be combined with the output file.\n"
 "These subtitles can be switched off since they are added as a separate track"
 msgstr ""
 
-#: EncoderConfigWindow.vala:1012
+#: EncoderConfigWindow.vala:1036
 msgid "Fade:"
 msgstr ""
 
-#: EncoderConfigWindow.vala:241
+#: EncoderConfigWindow.vala:244
 msgid "File Format:"
 msgstr ""
 
-#: EncoderConfigWindow.vala:1077
+#: AppConfigWindow.vala:65
+msgid "General"
+msgstr ""
+
+#: EncoderConfigWindow.vala:1101
 msgid "Other Effects:"
 msgstr ""
 
-#: AppConfigWindow.vala:63
+#: AppConfigWindow.vala:102
 msgid "Output Folder"
 msgstr ""
 
-#: EncoderConfigWindow.vala:298
+#: EncoderConfigWindow.vala:301
 msgid "Preset:"
 msgstr ""
 
-#: EncoderConfigWindow.vala:474
+#: EncoderConfigWindow.vala:1981
+msgid ""
+"Quality Vs Encoding Speed\n"
+"\n"
+"Best: Best quality, slower\n"
+"Good: Good quality, faster\n"
+"Realtime: Fastest"
+msgstr ""
+
+#: EncoderConfigWindow.vala:1983
+msgid ""
+"Quality Vs Encoding Speed\n"
+"\n"
+"Smaller values = Better quality, slower\n"
+"Larger value = Lower quality, faster\n"
+msgstr ""
+
+#: EncoderConfigWindow.vala:1992
 msgid ""
 "Quality Vs Encoding Speed\n"
 "Higher values speed-up encoding at the expense of quality.\n"
 "Lower values improve quality at the expense of encoding speed."
 msgstr ""
 
-#: EncoderConfigWindow.vala:1143
+#: EncoderConfigWindow.vala:1167
 msgid ""
 "Render - Subtitles are rendered/burned on the video.\n"
 "These subtitles cannot be switched off since they become a part of the video"
 msgstr ""
 
-#: EncoderConfigWindow.vala:639
+#: EncoderConfigWindow.vala:663
 msgid "Resample:"
 msgstr ""
 
-#: EncoderConfigWindow.vala:538
+#: EncoderConfigWindow.vala:562
 msgid "Resize:"
 msgstr ""
 
-#: EncoderConfigWindow.vala:868
+#: EncoderConfigWindow.vala:892
 msgid "SOX Audio Processing:"
 msgstr ""
 
-#: EncoderConfigWindow.vala:265
+#: EncoderConfigWindow.vala:268
 msgid "AC3 Audio (*.ac3)"
 msgstr ""
 
-#: MainWindow.vala:189
+#: MainWindow.vala:208
 msgid "Abort"
 msgstr ""
 
-#: MainWindow.vala:237
+#: MainWindow.vala:256
 msgid "About"
 msgstr ""
 
-#: MainWindow.vala:1393
+#: MainWindow.vala:1474
 msgid "Add File(s)"
 msgstr ""
 
-#: MainWindow.vala:144
+#: MainWindow.vala:163
 msgid "Add Files"
 msgstr ""
 
-#: MainWindow.vala:365
+#: MainWindow.vala:564
 msgid "Add New Preset"
 msgstr ""
 
-#: MainWindow.vala:363
+#: MainWindow.vala:562
 msgid "Add Preset"
 msgstr ""
 
-#: MainWindow.vala:147
+#: MainWindow.vala:166
 msgid "Add file(s)"
 msgstr ""
 
-#: EncoderConfigWindow.vala:1108
+#: EncoderConfigWindow.vala:1132
 msgid "Adjust Stereo for Headphones"
 msgstr ""
 
-#: Main.vala:592
+#: Main.vala:596

selene_2.5.2~185~ubuntu15.04.1.tar.xz/src/AboutWindow.vala -> selene_2.5.8~198~ubuntu15.10.1.tar.xz/src/AboutWindow.vala Changed

@@ -1,26 +1,26 @@
 /*
 * AboutWindow.vala
- * 
+ *
 * Copyright 2012 Tony George <teejee2008@gmail.com>
 * 
 * This program 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 2 of the License, or
 * (at your option) any later version.
- * 
+ *
 * 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. 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, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 * MA 02110-1301, USA.
- * 
- * 
+ *
+ *
 */
- 
+
 using Gtk;
 
 using TeeJee.Logging;
@@ -39,7 +39,7 @@
 	private Box hbox_action;
 	private Button btn_credits;
 	private Button btn_close;
-	
+
 	private Gtk.Image img_logo;
 	private Label lbl_program_name;
 	private Label lbl_version;
@@ -106,7 +106,7 @@
 			_donations = value;
 		}
 	}
-	
+
 	private string _license = "";
 	public string license{
 		get{
@@ -116,7 +116,7 @@
 			_license = value;
 		}
 	}
-	
+
 	private Gdk.Pixbuf _logo;
 	public Gdk.Pixbuf logo{
 		get{
@@ -146,7 +146,7 @@
 			_translators = value;
 		}
 	}
-	
+
 	private string[] _third_party;
 	public string[] third_party{
 		get{
@@ -156,7 +156,7 @@
 			_third_party = value;
 		}
 	}
-	
+
 	private string _version = "";
 	public string version{
 		get{
@@ -186,21 +186,21 @@
 			_website_label = value;
 		}
 	}
-	
+
 	public AboutWindow() {
 window_position = WindowPosition.CENTER_ON_PARENT;
 		set_destroy_with_parent (true);
 		set_modal (true);
 skip_taskbar_hint = false;
- set_default_size (450, 400);	
+ set_default_size (450, 400);
 
 	 vbox_main = get_content_area();
 		vbox_main.margin = 6;
 		vbox_main.spacing = 6;
-		
+
 		vbox_logo = new Box(Orientation.VERTICAL,0);
 		vbox_main.add(vbox_logo);
-		
+
 		vbox_credits = new Box(Orientation.VERTICAL,0);
 		vbox_credits.no_show_all = true;
 		vbox_main.add(vbox_credits);
@@ -213,7 +213,7 @@
 		img_logo.margin_top = 6;
 		img_logo.margin_bottom = 6;
 vbox_logo.add(img_logo);
-		
+
 		//program_name
 		lbl_program_name = new Label("");
 		lbl_program_name.set_use_markup(true);
@@ -230,7 +230,7 @@
 		lbl_comments.set_use_markup(true);
 		lbl_comments.margin_top = 10;
 		vbox_logo.add(lbl_comments);
-		
+
 		//website
 		lbtn_website = new LinkButton("");
 		lbtn_website.margin_top = 5;
@@ -238,13 +238,13 @@
 
 		lbtn_website.activate_link.connect(()=>{
 			try{
-				return Gtk.show_uri(null, lbtn_website.uri, Gdk.CURRENT_TIME); 
+				return Gtk.show_uri(null, lbtn_website.uri, Gdk.CURRENT_TIME);
 			}
 			catch(Error e){
 				return false;
 			}
 		});
-		
+
 		//copyright
 		lbl_copyright = new Label("");
 		lbl_copyright.set_use_markup(true);
@@ -260,27 +260,27 @@
 		var sw_credits = new ScrolledWindow(null, null);
 		sw_credits.set_shadow_type(ShadowType.ETCHED_IN);
 		sw_credits.expand = true;
-		
+
 		vbox_credits.add(sw_credits);
 		sw_credits.add(vbox_lines);
-		
+
 		//hbox_commands --------------------------------------------------
-		
+
 		hbox_action = (Box) get_action_area();
-		
+
 		//btn_credits
 		btn_credits = new Button.with_label(" " + _("Credits"));
 		btn_credits.set_image (new Image.from_stock ("gtk-about", IconSize.MENU));
-		hbox_action.add(btn_credits);	
-			
+		hbox_action.add(btn_credits);
+
 btn_credits.clicked.connect(()=>{
 			vbox_logo.visible = !(vbox_logo.visible);
 			vbox_credits.visible = !(vbox_credits.visible);
-			
+
 			if ((vbox_credits.visible)&&(!sw_credits.visible)){
 				sw_credits.show_all();
 			}
-			
+
 			if (vbox_credits.visible){
 				btn_credits.label = " " + _("Back");
 				btn_credits.set_image (new Image.from_stock ("gtk-go-back", IconSize.MENU));
@@ -295,10 +295,10 @@
 		btn_close = new Button.with_label(" " + _("Close"));
 		btn_close.set_image (new Image.from_stock ("gtk-close", IconSize.MENU));
 		hbox_action.add(btn_close);
-		
+
 		btn_close.clicked.connect(()=>{ this.destroy(); });
 	}
-	
+
 	public void initialize() {
 		title = program_name;
 		img_logo.pixbuf = logo;
@@ -309,7 +309,7 @@
 		lbtn_website.label = website_label;
 		//lbl_copyright.label = "%s".printf(copyright);
 		lbl_copyright.label = "%s".printf(copyright);
-		
+
 		if (authors.length > 0){
 			add_line("%s\n".printf(_("Authors")));
 			foreach(string name in authors){
@@ -317,7 +317,7 @@
 			}
 			add_line("\n");
 		}

selene_2.5.2~185~ubuntu15.04.1.tar.xz/src/AppConfigWindow.vala -> selene_2.5.8~198~ubuntu15.10.1.tar.xz/src/AppConfigWindow.vala Changed

@@ -1,26 +1,26 @@
 /*
 * PrefWindow.vala
- * 
+ *
 * Copyright 2012 Tony George <teejee2008@gmail.com>
 * 
 * This program 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 2 of the License, or
 * (at your option) any later version.
- * 
+ *
 * 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. 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, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 * MA 02110-1301, USA.
- * 
- * 
+ *
+ *
 */
- 
+
 using Gtk;
 
 using TeeJee.Logging;
@@ -35,6 +35,7 @@
 public class AppConfigWindow : Dialog {
 
 	private Box vboxMain;
+	private Label lblView;
 	private Label lblOutput;
 	private CheckButton chkOutput;
 	private FileChooserButton fcbOutput;
@@ -43,22 +44,60 @@
 	private FileChooserButton fcbBackup;
 	private Button btnSave;
 	private Button btnCancel;
-	
+	private ComboBox cmbFileView;
+
 	public AppConfigWindow() {
-		title = "Application Settings";
+		title = "Settings";
 		set_default_size (350, 400);
-			
+
 window_position = WindowPosition.CENTER_ON_PARENT;
 destroy_with_parent = true;
 skip_taskbar_hint = true;
 		modal = true;
 		deletable = false;
 		icon = get_app_icon(16);
-	 
+
 		// get content area
 		vboxMain = get_content_area();
 		vboxMain.margin = 6;
-		
+
+		// lblView
+		lblView = new Label (_("General"));
+		lblView.set_use_markup(true);
+		lblView.halign = Align.START;
+		lblView.margin_bottom = 12;
+		lblView.margin_top = 12;
+		vboxMain.pack_start (lblView, false, true, 0);
+
+		//hboxFileView
+		Box hboxFileView = new Box(Orientation.HORIZONTAL,6);
+ vboxMain.add(hboxFileView);
+
+		Label lblFileView = new Gtk.Label(_("File View"));
+		lblFileView.xalign = (float) 0.0;
+		hboxFileView.pack_start(lblFileView,false,false,0);
+
+		cmbFileView = new ComboBox();
+		var textCell = new CellRendererText();
+ cmbFileView.pack_start(textCell, false);
+ cmbFileView.set_attributes(textCell, "text", 0);
+		hboxFileView.pack_start(cmbFileView,false,false,0);
+
+		Gtk.TreeIter iter;
+		var model = new Gtk.ListStore (2, typeof (string), typeof (string));
+		model.append (out iter);
+		model.set (iter, 0, _("Simple"), 1, "list");
+		model.append (out iter);
+		model.set (iter, 0, _("Tiles"), 1, "tiles");
+		cmbFileView.set_model(model);
+
+		if (App.TileView){
+			cmbFileView.set_active(1);
+		}
+		else{
+			cmbFileView.set_active(0);
+		}
+
 		// lblOutput
 		lblOutput = new Label (_("Output Folder"));
 		lblOutput.set_use_markup(true);
@@ -66,7 +105,7 @@
 		lblOutput.margin_bottom = 12;
 		lblOutput.margin_top = 12;
 		vboxMain.pack_start (lblOutput, false, true, 0);
-		
+
 		// fcbOutput
 		fcbOutput = new FileChooserButton (_("Output Location"), FileChooserAction.SELECT_FOLDER);
 		fcbOutput.set_sensitive(App.OutputDirectory.length > 0);
@@ -76,14 +115,14 @@
 			fcbOutput.set_filename (App.OutputDirectory);
 		}
 		vboxMain.add (fcbOutput);
-		
+
 		// chkOutput
 		chkOutput = new CheckButton.with_label (_("Save in input file location"));
 		chkOutput.active = (App.OutputDirectory.length == 0);
 		chkOutput.margin_left = 6;
 		chkOutput.clicked.connect (chkOutput_clicked);
 		vboxMain.pack_start (chkOutput, false, true, 0);
-				
+
 		// lblBackup
 		lblBackup = new Label (_("Backup Folder"));
 		lblBackup.set_use_markup(true);
@@ -91,7 +130,7 @@
 		lblBackup.margin_bottom = 12;
 		lblBackup.margin_top = 12;
 		vboxMain.pack_start (lblBackup, false, true, 0);
-	
+
 		// fcbBackup
 		fcbBackup = new FileChooserButton (_("Backup Location"), FileChooserAction.SELECT_FOLDER);
 		fcbBackup.set_sensitive(App.BackupDirectory.length > 0);
@@ -101,31 +140,31 @@
 			fcbBackup.set_filename (App.BackupDirectory);
 		}
 		vboxMain.add (fcbBackup);
-		
+
 		// chkBackup
 		chkBackup = new CheckButton.with_label (_("Do not move input files"));
 		chkBackup.active = (App.BackupDirectory.length == 0);
 		chkBackup.margin_left = 6;
 		chkBackup.clicked.connect (chkBackup_clicked);
 		vboxMain.pack_start (chkBackup, false, true, 0);
-		
+
 // btnSave
 btnSave = (Button) add_button ("gtk-save", Gtk.ResponseType.ACCEPT);
 btnSave.clicked.connect (btnSave_clicked);
- 
+
 // btnCancel
 btnCancel = (Button) add_button ("gtk-cancel", Gtk.ResponseType.CANCEL);
 btnCancel.clicked.connect (btnCancel_clicked);
 	}
-	
+
 	private void chkOutput_clicked(){
 		fcbOutput.set_sensitive(!chkOutput.active);
 	}
-	
+
 	private void chkBackup_clicked(){
 		fcbBackup.set_sensitive(!chkBackup.active);
 	}
-	
+
 	private void btnSave_clicked(){
 		if (chkOutput.active){
 			App.OutputDirectory = "";
@@ -135,7 +174,7 @@
 				App.OutputDirectory = fcbOutput.get_filename();
 			}
 		}
-		
+
 		if (chkBackup.active){
 			App.BackupDirectory = "";
 		}
@@ -144,13 +183,15 @@
 				App.BackupDirectory = fcbBackup.get_filename();
 			}
 		}
-		
+
+		App.TileView = (cmbFileView.active == 1);
+
 		// Save settings
 		App.save_config();
-

selene_2.5.2~185~ubuntu15.04.1.tar.xz/src/DonationWindow.vala -> selene_2.5.8~198~ubuntu15.10.1.tar.xz/src/DonationWindow.vala Changed

@@ -1,26 +1,26 @@
 /*
 * DonationWindow.vala
- * 
+ *
 * Copyright 2012 Tony George <teejee2008@gmail.com>
 * 
 * This program 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 2 of the License, or
 * (at your option) any later version.
- * 
+ *
 * 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. 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, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 * MA 02110-1301, USA.
- * 
- * 
+ *
+ *
 */
- 
+
 using Gtk;
 
 using TeeJee.Logging;
@@ -38,23 +38,23 @@
 		set_destroy_with_parent (true);
 		set_modal (true);
 skip_taskbar_hint = false;
- set_default_size (400, 20);	
+ set_default_size (400, 20);
 		icon = get_app_icon(16);
-		
+
 		//vbox_main
 	 Box vbox_main = get_content_area();
 		vbox_main.margin = 6;
 		vbox_main.homogeneous = false;
-		
+
 		get_action_area().visible = false;
-		
+
 		//lbl_message
 		Label lbl_message = new Gtk.Label("");
 		string msg = _("Did you find this software useful?\n\nYou can buy me a coffee or make a donation via PayPal to show your support. Or just drop me an email and say Hi.\n\nThis application is completely free and will continue to remain that way. Your contributions will help in keeping this project alive and to develop it further.\n\nFeel free to drop me an email if you find any issues or if you have suggestions for improvement.\n\nRegards,\nTony George\nteejeetech@gmail.com");
 		lbl_message.label = msg;
 		lbl_message.wrap = true;
 		vbox_main.pack_start(lbl_message,true,true,0);
-		
+
 		//vbox_actions
 Box vbox_actions = new Box (Orientation.VERTICAL, 6);
 		vbox_actions.margin_left = 50;
@@ -75,7 +75,7 @@
 		btn_send_email.clicked.connect(()=>{
 			xdg_open("mailto:teejeetech@gmail.com");
 		});
-		
+
 		//btn_visit
 		Button btn_visit = new Button.with_label(" " + _("Visit Website") + " ");
 		vbox_actions.add(btn_visit);

selene_2.5.2~185~ubuntu15.04.1.tar.xz/src/EncoderConfigWindow.vala -> selene_2.5.8~198~ubuntu15.10.1.tar.xz/src/EncoderConfigWindow.vala Changed

@@ -1,26 +1,26 @@
 /*
 * ConfigWindow.vala
- * 
+ *
 * Copyright 2012 Tony George <teejee2008@gmail.com>
 * 
 * This program 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 2 of the License, or
 * (at your option) any later version.
- * 
+ *
 * 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. 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, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 * MA 02110-1301, USA.
- * 
- * 
+ *
+ *
 */
- 
+
 using Gtk;
 using Json;
 
@@ -34,50 +34,50 @@
 using TeeJee.Misc;
 
 public class EncoderConfigWindow : Dialog {
-	
+
 	public string Folder;
 	public string Name;
 	public bool CreateNew = false;
-	
+
 	private Notebook tabMain;
 	private Box vboxMain;
 
 	private Label lblGeneral;
 	private Grid gridGeneral;
-	
+
 	private Label lblVideo;
 	private Grid gridVideo;
-	
+
 	private Label lblAudio;
 	private Grid gridAudio;
-	
+
 	private Label lblSubtitle;
 	private Grid gridSubtitle;
-	
+
 	private Label lblVideoFilters;
 	private Grid gridVideoFilters;
-	
+
 	private Label lblAudioFilters;
 	private Grid gridAudioFilters;
-	
+
 	private Label lblPresetName;
 	private Entry txtPresetName;
 
 	private Label lblFileFormat;
 	private ComboBox cmbFileFormat;
-	
+
 	private Label lblFileExtension;
 	private ComboBox cmbFileExtension;
-	
+
 	private Label lblVCodec;
 	private ComboBox cmbVCodec;
-	
+
 	private Label lblVideoMode;
 	private ComboBox cmbVideoMode;
-	
+
 	private Label lblVideoBitrate;
 	private SpinButton spinVideoBitrate;
-	
+
 	private ComboBox cmbX264Preset;
 	private Label lblX264Preset;
 
@@ -86,10 +86,11 @@
 
 	private Label lblVideoQuality;
 	private SpinButton spinVideoQuality;
-	
+
+	private ComboBox cmbVpxSpeed;
 	private Label lblVpxSpeed;
 	private Scale scaleVpxSpeed;
-	
+
 	private Label lblHeaderFileFormat;
 	private Label lblHeaderPreset;
 	private Label lblHeaderFrameSize;
@@ -98,7 +99,7 @@
 	private Gtk.Image imgAudioCodec;
 	private Gtk.Image imgVideoCodec;
 	private Gtk.Image imgFileFormat;
-	
+
 	private Label lblFrameSize;
 	private ComboBox cmbFrameSize;
 	private Label lblFrameSizeCustom;
@@ -107,7 +108,7 @@
 	private Box hboxFrameSize;
 	private CheckButton chkNoUpScale;
 	private CheckButton chkFitToBox;
-	
+
 	private Label lblFPS;
 	private ComboBox cmbFPS;
 	private Label lblFPSCustom;
@@ -116,37 +117,37 @@
 	private Box hboxFPS;
 	private Label lblResizingMethod;
 	private ComboBox cmbResizingMethod;
-	
+
 	private Label lblVCodecOptions;
 	private Gtk.TextView txtVCodecOptions;
-	
+
 	private Label lblACodec;
 	private ComboBox cmbACodec;
-	
+
 	private Label lblAudioMode;
 	private ComboBox cmbAudioMode;
-	
+
 	private Label lblAudioBitrate;
 	private SpinButton spinAudioBitrate;
-	
+
 	private Label lblAudioQuality;
 	private SpinButton spinAudioQuality;
-	
+
 	private Label lblOpusOptimize;
 	private ComboBox cmbOpusOptimize;
-	
+
 	private Label lblAuthorName;
 	private Entry txtAuthorName;
-	
+
 	private Label lblAuthorEmail;
 	private Entry txtAuthorEmail;
-	
+
 	private Label lblPresetVersion;
 	private Entry txtPresetVersion;
-	
+
 	private Label lblAudioSampleRate;
 	private ComboBox cmbAudioSampleRate;
-	
+
 	private Label lblAudioChannels;
 	private ComboBox cmbAudioChannels;
 
@@ -172,30 +173,30 @@
 
 	private Label lblSubtitleMode;
 	private ComboBox cmbSubtitleMode;
-	
+
 	private Label lblSubFormatMessage;
-	
+
 	private Button btnSave;
 	private Button btnCancel;
-	
+
 	public EncoderConfigWindow() {
 		title = "Preset";
-		set_default_size (400, 550);	
-		
- window_position = WindowPosition.CENTER_ON_PARENT;
- destroy_with_parent = true;
- skip_taskbar_hint = true;
+		set_default_size (450, 550);
+

selene_2.5.2~185~ubuntu15.04.1.tar.xz/src/EncoderStatusWindow.vala -> selene_2.5.8~198~ubuntu15.10.1.tar.xz/src/EncoderStatusWindow.vala Changed

@@ -1,26 +1,26 @@
 /*
 * FileInfoWindow.vala
- * 
+ *
 * Copyright 2012 Tony George <teejee2008@gmail.com>
- * 
+ *
 * This program 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 2 of the License, or
 * (at your option) any later version.
- * 
+ *
 * 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. 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, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 * MA 02110-1301, USA.
- * 
- * 
+ *
+ *
 */
- 
+
 using Gtk;
 
 using TeeJee.Logging;
@@ -40,11 +40,11 @@
 	private Button btnRefesh;
 	private TreeView tv;
 	private ScrolledWindow sw;
-	
+
 	public EncoderStatusWindow () {
 		title = _("Encoders");
-		set_default_size (450, 400);
-		
+		set_default_size (500, 450);
+
 window_position = WindowPosition.CENTER_ON_PARENT;
 destroy_with_parent = true;
 skip_taskbar_hint = true;
@@ -63,7 +63,7 @@
 		tv.get_selection().mode = SelectionMode.NONE;
 		tv.headers_visible = true;
 		tv.set_rules_hint (true);
-		
+
 		sw = new ScrolledWindow(null, null);
 		sw.set_shadow_type (ShadowType.ETCHED_IN);
 		sw.add (tv);
@@ -74,11 +74,11 @@
 		//col_icon.title = _("");
 		col_icon.resizable = true;
 		tv.append_column(col_icon);
-		
+
 		CellRendererPixbuf cell_icon = new CellRendererPixbuf ();
 		col_icon.pack_start (cell_icon, false);
 		col_icon.set_attributes(cell_icon, "pixbuf", 3);
-		
+
 		TreeViewColumn col_cmd = new TreeViewColumn();
 		col_cmd.title = " " + _("Encoding Tool") + " ";
 		tv.append_column(col_cmd);
@@ -86,43 +86,43 @@
 		CellRendererText cell_cmd = new CellRendererText ();
 		col_cmd.pack_start (cell_cmd, false);
 		col_cmd.set_attributes(cell_cmd, "text", 0);
-		
+
 		TreeViewColumn col_desc = new TreeViewColumn();
 		col_desc.title = " " + _("Description") + " ";
 		tv.append_column(col_desc);
-		
+
 		CellRendererText cell_desc = new CellRendererText ();
 		col_desc.pack_start (cell_desc, false);
 		col_desc.set_attributes(cell_desc, "text", 1);
-		
+
 		TreeViewColumn col_status = new TreeViewColumn();
 		col_status.title = " " + _("Status") + " ";
 		tv.append_column(col_status);
-		
+
 		CellRendererText cell_status = new CellRendererText ();
 		col_status.pack_start (cell_status, false);
 		col_status.set_attributes(cell_status, "text", 2);
-		
+
 		tv_refresh();
-		
+
 		//btnRefesh
 btnRefesh = new Button.with_label(" " + _("Refresh") + " ");
 		vbox_actions.add(btnRefesh);
 		btnRefesh.clicked.connect(()=>{
 			gtk_set_busy(true,this);
-			App.check_all_encoders(); 
+			App.check_all_encoders();
 			tv_refresh();
 			gtk_set_busy(false,this);
 		});
-		
+
 //btnOk
 btnOk = (Button) add_button ("gtk-ok", Gtk.ResponseType.ACCEPT);
 btnOk.clicked.connect (() => { destroy(); });
 	}
-	
+
 	public void tv_refresh(){
 		TreeStore store = new TreeStore (4, typeof (string), typeof (string), typeof (string), typeof(Gdk.Pixbuf));
-		
+
 		//status icons
 		Gdk.Pixbuf pix_ok = null;
 		Gdk.Pixbuf pix_missing = null;
@@ -134,7 +134,7 @@
 catch(Error e){
 	 log_error (e.message);
 	 }
-	 
+
 		foreach (Encoder enc in App.Encoders.values){
 			TreeIter iter;
 			store.append(out iter, null);
@@ -143,7 +143,7 @@
 			store.set(iter, 2, enc.IsAvailable ? _("Found") : _("Missing"));
 			store.set(iter, 3, enc.IsAvailable ? pix_ok : pix_missing);
 		}
-		
+
 		tv.set_model (store);
 	}
 }

selene_2.5.2~185~ubuntu15.04.1.tar.xz/src/FileInfoWindow.vala -> selene_2.5.8~198~ubuntu15.10.1.tar.xz/src/FileInfoWindow.vala Changed

@@ -1,26 +1,26 @@
 /*
 * FileInfoWindow.vala
- * 
+ *
 * Copyright 2012 Tony George <teejee2008@gmail.com>
- * 
+ *
 * This program 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 2 of the License, or
 * (at your option) any later version.
- * 
+ *
 * 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. 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, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 * MA 02110-1301, USA.
- * 
- * 
+ *
+ *
 */
- 
+
 using Gtk;
 
 using TeeJee.Logging;
@@ -39,25 +39,25 @@
 	public MediaFile file;
 	private TreeView tvInfo;
 	private ScrolledWindow swInfo;
-	
+
 	public FileInfoWindow (MediaFile _file) {
 		title = _("Properties");
 		set_default_size (700, 500);
-		
+
 window_position = WindowPosition.CENTER_ON_PARENT;
 destroy_with_parent = true;
 skip_taskbar_hint = true;
 		modal = true;
 		deletable = false;
 		icon = get_app_icon(16);
-		
+
 		//save reference
 		file = _file;
-		
+
 		// get content area
 		vboxMain = get_content_area();
 		vboxMain.margin = 6;
-				
+
 		//tvInfo
 		tvInfo = new TreeView();
 		tvInfo.get_selection().mode = SelectionMode.MULTIPLE;
@@ -77,10 +77,10 @@
 		int index = -1;
 		infoStore.append (out iter0, null);
 		//infoStore.remove (ref iter0);
-		
+
 		foreach (string line in file.InfoText.split ("\n")){
 			if (line.strip() == "") { continue; }
-			
+
 			index = line.index_of (":");
 
 			if (index == -1){
@@ -95,7 +95,7 @@
 		}
 		tvInfo.set_model (infoStore);
 		tvInfo.expand_all();
-		
+
 // btnOk
 btnOk = (Button) add_button ("gtk-ok", Gtk.ResponseType.ACCEPT);
 btnOk.clicked.connect (() => { destroy(); });

selene_2.5.2~185~ubuntu15.04.1.tar.xz/src/Main.vala -> selene_2.5.8~198~ubuntu15.10.1.tar.xz/src/Main.vala Changed

@@ -1,24 +1,24 @@
 /*
 * Main.vala
- * 
+ *
 * Copyright 2012 Tony George <teejee2008@gmail.com>
- * 
+ *
 * This program 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 2 of the License, or
 * (at your option) any later version.
- * 
+ *
 * 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. 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, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 * MA 02110-1301, USA.
- * 
- * 
+ *
+ *
 */
 
 using GLib;
@@ -38,7 +38,7 @@
 public Main App;
 public const string AppName = "Selene";
 public const string AppShortName = "selene";
-public const string AppVersion = "2.5.2";
+public const string AppVersion = "2.5.8";
 public const string AppAuthor = "Tony George";
 public const string AppAuthorEmail = "teejeetech@gmail.com";
 
@@ -59,8 +59,8 @@
 
 public enum AppStatus{
 	NOTSTARTED, //initial state
-	RUNNING,	
-	PAUSED,	 
+	RUNNING,
+	PAUSED,
 	IDLE,		//batch completed
 	WAITFILE //waiting for files
 }
@@ -68,7 +68,7 @@
 public class Main : GLib.Object{
 	public Gee.ArrayList<MediaFile> InputFiles;
 	public Gee.HashMap<string,Encoder> Encoders;
-	
+
 	public string ScriptsFolder_Official = "";
 	public string ScriptsFolder_Custom = "";
 	public string PresetsFolder_Official = "";
@@ -78,18 +78,19 @@
 	public string SharedDataDirectory;
 	public string AppConfPath = "";
 	public string usr_share_dir;
-	
+
 	public string TempDirectory;
 	public string OutputDirectory = "";
 	public string BackupDirectory = "";
 	public string InputDirectory = "";
-	
+	public bool TileView = true;
+
 	public ScriptFile SelectedScript;
 	public MediaFile CurrentFile;
 	public string CurrentLine;
 	public string StatusLine;
 	public double Progress;
-	
+
 	public bool BatchStarted = false;
 	public bool BatchCompleted = false;
 	public bool Aborted;
@@ -103,7 +104,7 @@
 	public bool BackgroundMode = false;
 	public bool WaitingForShutdown = false;
 	public bool ShowNotificationPopups = false;
-	
+
 	private Regex regex_generic;
 	private Regex regex_mkvmerge;
 	private Regex regex_libav;
@@ -116,7 +117,7 @@
 	private Regex regex_opus;
 	private Regex regex_vpxenc;
 	private Regex regex_neroaacenc;
-	
+
 	private string tempLine;
 	private MatchInfo match;
 	private double dblVal;
@@ -126,8 +127,8 @@
 	private string outLine = "";
 	private DataInputStream disOut;
 	private DataInputStream disErr;
-	private DataOutputStream dsLog;	
-	
+	private DataOutputStream dsLog;
+
 	private string blankLine = "";
 
 	public static int main (string[] args) {
@@ -149,10 +150,10 @@
 
 		//init GTK
 		Gtk.init (ref args);
-		
+
 		//init TMP
 		init_tmp();
-		
+
 		//init app
 		App = new Main(args[0]);
 
@@ -161,7 +162,7 @@
 		LOG_COLORS = (term == "xterm");
 
 		//get command line arguments
-		for (int k = 1; k < args.length; k++) // Oth arg is app path 
+		for (int k = 1; k < args.length; k++) // Oth arg is app path
 		{
 			switch (args[k].down()){
 				case "--script":
@@ -170,7 +171,7 @@
 						App.SelectedScript = new ScriptFile(args[k]);
 					}
 					break;
-					
+
 				case "--output-dir":
 					k++;
 					if (k < args.length){
@@ -182,7 +183,7 @@
 						}
 					}
 					break;
-				
+
 				case "--backup-dir":
 					k++;
 					if (k < args.length){
@@ -194,15 +195,15 @@
 						}
 					}
 					break;
-					
+
 				case "--console":
 					App.ConsoleMode = true;
 					break;
-					
+
 				case "--debug":
 					App.DebugMode = true;
 					break;
-				
+
 				case "--shutdown":
 					if (App.AdminMode) {
 						App.Shutdown = true;
@@ -212,7 +213,7 @@
 						log_error (_("Warning: User does not have Admin priviledges. '--shutdown' will be ignored."));
 					}
 					break;
-				
+
 				case "--background":
 					App.BackgroundMode = true;
 					App.set_priority();
@@ -223,11 +224,11 @@
 					break;
 			}
 		}
-		
+
 		//check UI mode
 		if ((App.SelectedScript == null)||(App.InputFiles.size == 0))
 			App.ConsoleMode = false;
-		
+
 		//show window
 		if (App.ConsoleMode){
 			if (App.InputFiles.size == 0){
@@ -244,14 +245,14 @@
 		}
 
 	 Gtk.main();
-	 
+

selene_2.5.2~185~ubuntu15.04.1.tar.xz/src/MainWindow.vala -> selene_2.5.8~198~ubuntu15.10.1.tar.xz/src/MainWindow.vala Changed

@@ -1,24 +1,24 @@
 /*
 * MainWindow.vala
- * 
+ *
 * Copyright 2012 Tony George <teejee2008@gmail.com>
- * 
+ *
 * This program 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 2 of the License, or
 * (at your option) any later version.
- * 
+ *
 * 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. 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, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 * MA 02110-1301, USA.
- * 
- * 
+ *
+ *
 */
 
 using Gtk;
@@ -52,7 +52,7 @@
 private ToggleToolButton btnBackground;
 private SeparatorToolItem separator1;
 private SeparatorToolItem separator2;
- 
+
 //preset toolbar
 private Gtk.Toolbar toolbar2;
 private ToolButton btnAddPreset;
@@ -73,7 +73,7 @@
 	private Gtk.Menu menuFile;
 	private ImageMenuItem miFileInfo;
 	private ImageMenuItem miFileInfoOutput;
-	private ImageMenuItem miFileSkip;	
+	private ImageMenuItem miFileSkip;
 	private Gtk.MenuItem miFileCropAuto;
 	private Gtk.MenuItem miFileRemove;
 	private Gtk.MenuItem miFilePreview;
@@ -91,7 +91,7 @@
 	private TreeViewColumn colProgress;
 	private TreeViewColumn colSpacer;
 	private Grid gridConfig;
-	
+
 	private Regex regexGeneric;
 	private Regex regexMkvMerge;
 	private Regex regexFFmpeg;
@@ -99,40 +99,59 @@
 	private Regex regexLibAV_video;
 	private Regex regexLibAV_audio;
 	private Regex regexX264;
+
 	private string statusLine;
 	private uint timerID = 0;
 	private uint startupTimer = 0;
 	private uint statusTimer = 0;
 	private uint cpuUsageTimer = 0;
+
 	private bool paused = false;
 	private MediaFile lastFile;
 
 	private const Gtk.TargetEntry[] targets = {
 		{ "text/uri-list", 0, 0}
 	};
-	
+
+	// initialize window -----------------
+
 	public MainWindow() {
 		set_window_title();
 window_position = WindowPosition.CENTER;
 destroy.connect (Gtk.main_quit);
- set_default_size (550, 20);	
+ set_default_size (550, 20);
 icon = get_app_icon(16);
 
 		Gtk.drag_dest_set (this,Gtk.DestDefaults.ALL, targets, Gdk.DragAction.COPY);
 		drag_data_received.connect(on_drag_data_received);
-		
-		Gdk.RGBA gray = Gdk.RGBA();
-		gray.parse ("rgba(200,200,200,1)");
 
 //vboxMain
 vboxMain = new Box (Orientation.VERTICAL, 0);
 add (vboxMain);
- 
- //vboxMain2
- vboxMain2 = new Box (Orientation.VERTICAL, 0);
-		vboxMain2.margin_left = 6;
- vboxMain2.margin_right = 6;
- 
+
+ //main toolbar
+		init_main_toolbar();
+
+		//listview
+		init_list_view();
+		refresh_list_view();
+		init_list_view_context_menu();
+
+		//presets
+		init_preset_toolbar();
+		init_preset_dropdowns();
+ populate_script_folders();
+		select_script();
+
+		//statusbar
+		init_statusbar();
+		statusbar_default_message();
+
+		//regex
+		init_regular_expressions();
+	}
+
+	public void init_main_toolbar(){
 		//toolbar
 		toolbar = new Gtk.Toolbar();
 		toolbar.toolbar_style = ToolbarStyle.BOTH_HORIZ;
@@ -153,14 +172,14 @@
 		btnRemoveFiles.clicked.connect (btnRemoveFiles_clicked);
 		btnRemoveFiles.set_tooltip_text (_("Remove selected file(s)"));
 		toolbar.add (btnRemoveFiles);
-		
+
 		//btnClearFiles
 		btnClearFiles = new Gtk.ToolButton.from_stock ("gtk-clear");
 		btnClearFiles.is_important = true;
 		btnClearFiles.clicked.connect (btnClearFiles_clicked);
 		btnClearFiles.set_tooltip_text (_("Remove all file(s)"));
 		toolbar.add (btnClearFiles);
-		
+
 		//separator
 		separator1 = new Gtk.SeparatorToolItem();
 		toolbar.add(separator1);
@@ -172,7 +191,7 @@
 		btnStart.clicked.connect (start);
 		btnStart.set_tooltip_text (_("Start"));
 		toolbar.add (btnStart);
-		
+
 		//btnPause
 		btnPause = new Gtk.ToolButton.from_stock ("gtk-media-pause");
 		btnPause.is_important = true;
@@ -181,7 +200,7 @@
 		btnPause.visible = false;
 		btnPause.no_show_all = true;
 		toolbar.add (btnPause);
-		
+
 		//btnStop
 		btnStop = new Gtk.ToolButton.from_stock ("gtk-media-stop");
 		btnStop.is_important = true;
@@ -190,7 +209,7 @@
 		btnStop.visible = false;
 		btnStop.no_show_all = true;
 		toolbar.add (btnStop);
-		
+
 		//btnFinish
 		btnFinish = new Gtk.ToolButton.from_stock ("gtk-ok");
 		btnFinish.is_important = true;
@@ -200,13 +219,13 @@
 		btnFinish.visible = false;
 		btnFinish.no_show_all = true;
 		toolbar.add (btnFinish);
-		
+
 		//separator
 		separator2 = new Gtk.SeparatorToolItem();
 		separator2.set_draw (false);
 		separator2.set_expand (true);
 		toolbar.add (separator2);
-		
+
 		//btnAppSettings
 		btnAppSettings = new Gtk.ToolButton.from_stock ("gtk-preferences");
 		btnAppSettings.clicked.connect (btnAppSettings_clicked);
@@ -218,17 +237,17 @@
 		btnEncoders.clicked.connect (btnEncoders_clicked);
 		btnEncoders.set_tooltip_text (_("Encoders"));
 		toolbar.add (btnEncoders);
-		
+
 //btn_donate
 		btnDonate = new Gtk.ToolButton.from_stock ("gtk-dialog-info");
 		btnDonate.is_important = false;
 		btnDonate.icon_widget = get_shared_icon("donate","donate.svg",24);
 		btnDonate.label = _("Donate");

selene_2.5.2~185~ubuntu15.04.1.tar.xz/src/Utility.vala -> selene_2.5.8~198~ubuntu15.10.1.tar.xz/src/Utility.vala Changed

@@ -1,24 +1,24 @@
 /*
 * Utility.vala
- * 
+ *
 * Copyright 2012 Tony George <teejee2008@gmail.com>
- * 
+ *
 * This program 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 2 of the License, or
 * (at your option) any later version.
- * 
+ *
 * 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. 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, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 * MA 02110-1301, USA.
- * 
- * 
+ *
+ *
 */
 
 using Gtk;
@@ -46,13 +46,13 @@
 */
 
 namespace TeeJee.Logging{
-	
+
 	/* Functions for logging messages to console and log files */
 
 	using TeeJee.Misc;
-	
+
 	public DataOutputStream dos_log;
-	
+
 	public bool LOG_ENABLE = true;
 	public bool LOG_TIMESTAMP = true;
 	public bool LOG_COLORS = true;
@@ -61,32 +61,32 @@
 
 	public void log_msg (string message, bool highlight = false){
 		if (!LOG_ENABLE) { return; }
-		
+
 		string msg = "";
-		
+
 		if (highlight && LOG_COLORS){
 			msg += "\033[1;38;5;34m";
 		}
-		
+
 		if (LOG_TIMESTAMP){
 			msg += "[" + timestamp() + "] ";
 		}
-		
+
 		msg += message;
-		
+
 		if (highlight && LOG_COLORS){
 			msg += "\033[0m";
 		}
-		
+
 		msg += "\n";
-		
+
 		stdout.printf (msg);
-		
+
 		try {
 			if (dos_log != null){
 				dos_log.put_string ("[%s] %s\n".printf(timestamp(), message));
 			}
-		} 
+		}
 		catch (Error e) {
 			stdout.printf (e.message);
 		}
@@ -94,34 +94,34 @@
 
 	public void log_error (string message, bool highlight = false, bool is_warning = false){
 		if (!LOG_ENABLE) { return; }
-		
+
 		string msg = "";
-		
+
 		if (highlight && LOG_COLORS){
 			msg += "\033[1;38;5;160m";
 		}
-		
+
 		if (LOG_TIMESTAMP){
 			msg += "[" + timestamp() + "] ";
 		}
-		
+
 		string prefix = (is_warning) ? _("Warning") : _("Error");
-		
+
 		msg += prefix + ": " + message;
-		
+
 		if (highlight && LOG_COLORS){
 			msg += "\033[0m";
 		}
-		
+
 		msg += "\n";
-		
+
 		stdout.printf (msg);
-		
+
 		try {
 			if (dos_log != null){
 				dos_log.put_string ("[%s] %s: %s\n".printf(timestamp(), prefix, message));
 			}
-		} 
+		}
 		catch (Error e) {
 			stdout.printf (e.message);
 		}
@@ -129,7 +129,7 @@
 
 	public void log_debug (string message){
 		if (!LOG_ENABLE) { return; }
-			
+
 		if (LOG_DEBUG){
 			log_msg (message);
 		}
@@ -138,7 +138,7 @@
 				if (dos_log != null){
 					dos_log.put_string ("[%s] %s\n".printf(timestamp(), message));
 				}
-			} 
+			}
 			catch (Error e) {
 				stdout.printf (e.message);
 			}
@@ -147,39 +147,39 @@
 }
 
 namespace TeeJee.FileSystem{
-	
+
 	/* Convenience functions for handling files and directories */
-	
+
 	using TeeJee.Logging;
 	using TeeJee.FileSystem;
 	using TeeJee.ProcessManagement;
 	using TeeJee.Misc;
-	
+
 	public void file_delete(string filePath){
-		
+
 		/* Check and delete file */
-		
+
 		try {
 			var file = File.new_for_path (filePath);
-			if (file.query_exists ()) { 
-				file.delete (); 
+			if (file.query_exists ()) {
+				file.delete ();
 			}
 		} catch (Error e) {
 	 log_error (e.message);
 	 }
 	}
-	
+
 	public bool file_exists (string filePath){
-		
+
 		/* Check if file exists */
-		
+
 		return ( FileUtils.test(filePath, GLib.FileTest.EXISTS) && FileUtils.test(filePath, GLib.FileTest.IS_REGULAR));
 	}
 
 	public void file_copy (string src_file, string dest_file){
 		try{
 			var file_src = File.new_for_path (src_file);
-			if (file_src.query_exists()) {

selene_2.5.2~185~ubuntu15.04.1.tar.xz/src/makefile -> selene_2.5.8~198~ubuntu15.10.1.tar.xz/src/makefile Changed

@@ -11,7 +11,7 @@
 
 all:
 	#build binaries
-	valac -X -D'GETTEXT_PACKAGE="${app_name}"' --Xcc="-lm" -X -Wl,-rpath,/usr/share/${app_name}/libs "Main.vala" "Utility.vala" "MainWindow.vala" "AppConfigWindow.vala" "EncoderConfigWindow.vala" "EncoderStatusWindow.vala" "FileInfoWindow.vala" "AboutWindow.vala" "DonationWindow.vala" -o ${app_name} --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix --pkg gtk+-3.0 --pkg gee-1.0 --pkg json-glib-1.0 
+	valac -X -D'GETTEXT_PACKAGE="${app_name}"' --Xcc="-lm" -X -Wl,-rpath,/usr/share/${app_name}/libs "Main.vala" "Utility.vala" "MainWindow.vala" "AppConfigWindow.vala" "EncoderConfigWindow.vala" "EncoderStatusWindow.vala" "FileInfoWindow.vala" "AboutWindow.vala" "DonationWindow.vala" -o ${app_name} --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix --pkg gtk+-3.0 --pkg gee-0.8 --pkg json-glib-1.0
 
 	#update translation template
 	xgettext --language=C --keyword=_ --copyright-holder='Tony George (teejee2008@gmail.com)' --package-name='${app_name}' --package-version='2.2' --msgid-bugs-address='teejee2008@gmail.com' --escape --sort-output -o ../${app_name}.pot *.vala
@@ -28,21 +28,21 @@
 	mkdir -p "$(DESTDIR)$(sharedir)/glib-2.0/schemas/"
 	mkdir -p "$(DESTDIR)$(sharedir)/${app_name}"
 	mkdir -p "$(DESTDIR)$(sharedir)/pixmaps"
-	
+
 	#binary
 	install -m 0755 ${app_name} "$(DESTDIR)$(bindir)"
 	install -m 0755 ${app_name}-uninstall "$(DESTDIR)$(bindir)"
-	
+
 	#shared files
 	cp -dpr --no-preserve=ownership -t "$(DESTDIR)$(sharedir)/${app_name}" ./share/${app_name}/*
 	chmod --recursive 0755 $(DESTDIR)$(sharedir)/${app_name}/*
-	
+
 	#launcher
 	install -m 0755 ${app_name}.desktop "$(DESTDIR)$(launcherdir)"
-	
+
 	#app icon
 	install -m 0755 ./share/pixmaps/${app_name}.png "$(DESTDIR)$(sharedir)/pixmaps"
-	
+
 	#translations
 	mkdir -p "$(DESTDIR)$(localedir)/ms/LC_MESSAGES"
 	msgfmt --check --verbose -o "$(DESTDIR)$(localedir)/ms/LC_MESSAGES/${app_name}.mo" ../po/${app_name}-ms.po
@@ -50,20 +50,20 @@
 	msgfmt --check --verbose -o "$(DESTDIR)$(localedir)/ko/LC_MESSAGES/${app_name}.mo" ../po/${app_name}-ko.po
 	mkdir -p "$(DESTDIR)$(localedir)/es/LC_MESSAGES"
 	msgfmt --check --verbose -o "$(DESTDIR)$(localedir)/es/LC_MESSAGES/${app_name}.mo" ../po/${app_name}-es.po
-	
+
 uninstall:
 	#binary
 	rm -f "$(DESTDIR)$(bindir)/${app_name}"
 	rm -f "$(DESTDIR)$(bindir)/${app_name}-uninstall"
-	
+
 	#shared files
 	rm -rf "$(DESTDIR)$(sharedir)/${app_name}"
-	
+
 	#launcher
 	rm -f "$(DESTDIR)$(launcherdir)/${app_name}.desktop"
-	
+
 	#app icon
 	rm -f "$(DESTDIR)$(sharedir)/pixmaps/${app_name}.png"
-	
+
     #translations
 	rm -f $(DESTDIR)$(localedir)/*/LC_MESSAGES/${app_name}.mo

Changes of Revision 2