Packman Build Service PMBS

Changes of Revision 6

selene.changes Changed

@@ -1,4 +1,23 @@
 -------------------------------------------------------------------
+Mon Feb 22 13:43:54 UTC 2016 - sor.alexei@meowr.ru
+
+- Update to 16.2.4 (changes since 16.2.1):
+  * Playing the input file will run the media player independently
+    without grabbing focus from other windows.
+  * Show a progress dialog when files are added.
+  * Add additional columns to the file list view and allow column to
+    be re-ordered.
+  * Add dialog for selecting list view columns.
+  * Allow columns to be re-ordered from the column selection dialog.
+  * Add new window for cropping video files.
+  * Add option to run app in background in non-admin mode. This
+    option was available earlier only in admin mode
+  * Add new mplayer frontend for playing media files.
+  * Fix output file being overwritten if it already exists.
+    A number will be appended to the file name instead.
+- Rebase selene-fix-makefile.patch.
+
+-------------------------------------------------------------------
 Thu Feb 11 16:26:54 UTC 2016 - sor.alexei@meowr.ru
 
 - Update to 16.2.1 (changes since 2.6.1):

selene.spec Changed

selene-fix-makefile.patch Changed

@@ -1,6 +1,6 @@
 --- a/src/makefile
 +++ b/src/makefile
-@@ -1,19 +1,22 @@
+@@ -1,20 +1,23 @@
  prefix=/usr
  bindir=$(prefix)/bin
  sharedir=$(prefix)/share
@@ -18,15 +18,16 @@
  
  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" "CustomMessageDialog.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" "CustomMessageDialog.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,/usr/share/${app_name}/libs "Main.vala" "Utility.vala" "MainWindow.vala" "AppConfigWindow.vala" "EncoderConfigWindow.vala" "EncoderStatusWindow.vala" "FileInfoWindow.vala" "AboutWindow.vala" "DonationWindow.vala" "CustomMessageDialog.vala" "SimpleProgressWindow.vala" "ColumnSelectionDialog.vala" "CropVideoSingleWindow.vala" "CropVideoBatchWindow.vala" "MediaFile.vala" "MediaPlayer.vala" "ScriptFile.vala" "MediaPlayerWindow.vala" "XidHelper.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 --pkg gdk-x11-3.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" "CustomMessageDialog.vala" "SimpleProgressWindow.vala" "ColumnSelectionDialog.vala" "CropVideoSingleWindow.vala" "CropVideoBatchWindow.vala" "MediaFile.vala" "MediaPlayer.vala" "ScriptFile.vala" "MediaPlayerWindow.vala" "XidHelper.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 --pkg gdk-x11-3.0
+ 	#--pkg gdk-x11-3.0
  
 -	#valac -X -D'GETTEXT_PACKAGE=ffmpeg-builder' --Xcc="-lm" -X -Wl,-rpath,/usr/share/${app_name}/libs "Main.vala" "Utility.vala" "FFmpegBuilder.vala" "CustomMessageDialog.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 --pkg libvte
 +	#valac -X -D'GETTEXT_PACKAGE=ffmpeg-builder' --Xcc="-lm" -X -Wl,-rpath,$(libdir)/${app_name} "Main.vala" "Utility.vala" "FFmpegBuilder.vala" "CustomMessageDialog.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 --pkg libvte
  
  	#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
-@@ -24,6 +27,7 @@ clean:
+@@ -25,6 +28,7 @@ clean:
  install:
  	mkdir -p "$(DESTDIR)$(bindir)"
  	mkdir -p "$(DESTDIR)$(sharedir)"
@@ -34,7 +35,7 @@
  	mkdir -p "$(DESTDIR)$(mandir)"
  	mkdir -p "$(DESTDIR)$(man1dir)"
  	mkdir -p "$(DESTDIR)$(launcherdir)"
-@@ -37,7 +41,7 @@ install:
+@@ -38,7 +42,7 @@ install:
  
  	#shared files
  	cp -dpr --no-preserve=ownership -t "$(DESTDIR)$(sharedir)/${app_name}" ./share/${app_name}/*

selene_16.2.1~226~ubuntu16.04.1.tar.xz/debian/bzr-builder.manifest -> selene_16.2.4~246~ubuntu16.04.1.tar.xz/debian/bzr-builder.manifest Changed

selene_16.2.1~226~ubuntu16.04.1.tar.xz/debian/changelog -> selene_16.2.4~246~ubuntu16.04.1.tar.xz/debian/changelog Changed

@@ -1,35 +1,20 @@
-selene (16.2.1~226~ubuntu16.04.1) xenial; urgency=low
+selene (16.2.4~246~ubuntu16.04.1) xenial; urgency=low
 
   * Auto build.
 
- -- Tony George <teejee2008@gmail.com>  Wed, 10 Feb 2016 16:17:33 +0000
+ -- Tony George <teejee2008@gmail.com>  Sun, 21 Feb 2016 08:17:08 +0000
 
-selene (16.2.1) trusty; urgency=medium
+selene (16.2.4) trusty; urgency=medium
 
-  * App settings: Allow user to enter backup path and output path
+  * Added new window for cropping video files
 
-  * App settings: Updated checkboxes for selecting directories
-  
-  * App settings: Added option to choose between 'ffmpeg' and 'avconv'
+  * Added option to run app in background in non-admin mode
 
-  * App settings: Added option to select media player
-  
-  * Added thumbnail image for audio files
+  * Added new mplayer frontend for playing media files
 
-  * Added option to encode audio with FFmpeg's Native AAC encoder
-
-  * Added support for encoding with Fraunhofer FDK AAC encoder (aac-enc)
-
-  * Added option to change AAC profile
-
-  * Removed the 'Preview Output' right-click option in file list
-  
-  * Folders can be dragged and dropped on the main window to add files
-
-  * Updated toolbar items for adding and removing files
-
-  * Show icon beside file name in list view
+  * Fixed: Output file will not be overwritten if it already exists. A
+  number will be appended to the file name.
 
   * Various minor changes
 
- -- Tony George <tony.george.kol@gmail.com>  Wed, 10 Feb 2016 10:00:00 +0530
+ -- Tony George <tony.george.kol@gmail.com>  Sun, 21 Feb 2016 10:00:00 +0530

selene_16.2.1~226~ubuntu16.04.1.tar.xz/debian/control -> selene_16.2.4~246~ubuntu16.04.1.tar.xz/debian/control Changed

selene_16.2.1~226~ubuntu16.04.1.tar.xz/selene.geany -> selene_16.2.4~246~ubuntu16.04.1.tar.xz/selene.geany Changed

@@ -17,27 +17,29 @@
 long_line_column=80
 
 [files]
-current_page=2
-FILE_NAME_0=24527;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FUtility.vala;0;4
-FILE_NAME_1=78970;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMain.vala;0;4
-FILE_NAME_2=13294;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMainWindow.vala;0;4
-FILE_NAME_3=965;Make;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2Fmakefile;0;4
-FILE_NAME_4=330;None;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fdebian%2Fchangelog;0;4
-FILE_NAME_5=687;Conf;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fdebian%2Fcontrol;0;4
-FILE_NAME_6=342;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FDonationWindow.vala;0;4
-FILE_NAME_7=6818;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FEncoderConfigWindow.vala;0;4
-FILE_NAME_8=1500;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FFileInfoWindow.vala;0;4
-FILE_NAME_9=8000;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FAboutWindow.vala;0;4
-FILE_NAME_10=6781;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FAppConfigWindow.vala;0;4
-FILE_NAME_11=3464;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FEncoderStatusWindow.vala;0;4
-FILE_NAME_12=0;Sh;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2Finstall-images.sh;0;4
-FILE_NAME_13=0;Sh;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2Finstall-nero-aac.sh;0;4
-FILE_NAME_14=0;Sh;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2Finstall-scripts.sh;0;4
-FILE_NAME_15=0;None;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FNOTES;0;4
-FILE_NAME_16=0;None;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FPPA;0;4
-FILE_NAME_17=0;Sh;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2Fselene-uninstall;0;4
-FILE_NAME_18=25;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FCustomMessageDialog.vala;0;4
-FILE_NAME_19=3014;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FFFmpegBuilder.vala;0;4
+current_page=21
+FILE_NAME_0=28982;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FUtility.vala;0;4
+FILE_NAME_1=14174;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMain.vala;0;4
+FILE_NAME_2=1066;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FEncoderConfigWindow.vala;0;4
+FILE_NAME_3=1051;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FFileInfoWindow.vala;0;4
+FILE_NAME_4=1516;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FAboutWindow.vala;0;4
+FILE_NAME_5=8791;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FAppConfigWindow.vala;0;4
+FILE_NAME_6=1076;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FColumnSelectionDialog.vala;0;4
+FILE_NAME_7=1682;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FEncoderStatusWindow.vala;0;4
+FILE_NAME_8=2082;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FCustomMessageDialog.vala;0;4
+FILE_NAME_9=2677;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FFFmpegBuilder.vala;0;4
+FILE_NAME_10=3248;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FSimpleProgressWindow.vala;0;4
+FILE_NAME_11=764;Make;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2Fmakefile;0;4
+FILE_NAME_12=57497;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMainWindow.vala;0;4
+FILE_NAME_13=981;Conf;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fdebian%2Fcontrol;0;4
+FILE_NAME_14=309;None;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fdebian%2Fchangelog;0;4
+FILE_NAME_15=2941;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2FNew%20Folder%2Ftest.vala;0;4
+FILE_NAME_16=8359;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMediaPlayer.vala;0;4
+FILE_NAME_17=9490;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMediaFile.vala;0;4
+FILE_NAME_18=7928;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FCropVideoBatchWindow.vala;0;4
+FILE_NAME_19=2196;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FCropVideoSingleWindow.vala;0;4
+FILE_NAME_20=21187;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik-archive-manager%2Fsrc%2FProgressWindow.vala;0;4
+FILE_NAME_21=4853;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Fselene%2Fsrc%2FMediaPlayerWindow.vala;0;4
 
 [VTE]
 last_dir=/home/teejee
@@ -54,7 +56,7 @@
 NF_03_CM=make clean
 NF_03_WD=
 EX_00_LB=_Execute
-EX_00_CM=./selene
+EX_00_CM=./selene --debug
 EX_00_WD=
 EX_01_LB=Execute (sudo)
 EX_01_CM=sudo ./selene

selene_16.2.1~226~ubuntu16.04.1.tar.xz/selene.pot -> selene_16.2.4~246~ubuntu16.04.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: 2016-02-10 21:35+0530\n"
+"POT-Creation-Date: 2016-02-21 13:40+0530\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"
@@ -25,6 +25,26 @@
 "and should start with same name."
 msgstr ""
 
+#: CropVideoSingleWindow.vala:311
+msgid "100%"
+msgstr ""
+
+#: CropVideoSingleWindow.vala:313
+msgid "200%"
+msgstr ""
+
+#: CropVideoSingleWindow.vala:305
+msgid "25%"
+msgstr ""
+
+#: CropVideoSingleWindow.vala:307
+msgid "50%"
+msgstr ""
+
+#: CropVideoSingleWindow.vala:309
+msgid "75%"
+msgstr ""
+
 #: EncoderConfigWindow.vala:515 EncoderConfigWindow.vala:516
 msgid ""
 "<b>AAC-ELD</b>\n"
@@ -59,7 +79,7 @@
 msgid "<b>Adjustments:</b>"
 msgstr ""
 
-#: AppConfigWindow.vala:155
+#: AppConfigWindow.vala:149
 msgid "<b>Backup Directory</b>"
 msgstr ""
 
@@ -95,7 +115,7 @@
 "These subtitles can be switched off since they are added as a separate track"
 msgstr ""
 
-#: AppConfigWindow.vala:283
+#: AppConfigWindow.vala:273
 msgid ""
 "<b>Encoder</b>\n"
 "Use the 'ffmpeg' encoding tool from the FFmpeg project (Recommended)\n"
@@ -124,7 +144,7 @@
 "\n"
 msgstr ""
 
-#: AppConfigWindow.vala:205
+#: AppConfigWindow.vala:195
 msgid "<b>Main Window</b>"
 msgstr ""
 
@@ -141,7 +161,7 @@
 msgid "<b>Other Effects:</b>"
 msgstr ""
 
-#: AppConfigWindow.vala:105
+#: AppConfigWindow.vala:104
 msgid "<b>Output Directory</b>"
 msgstr ""
 
@@ -191,13 +211,29 @@
 msgid "<b>SOX Audio Processing:</b>"
 msgstr ""
 
-#: AppConfigWindow.vala:282
+#: AppConfigWindow.vala:272
 msgid ""
 "<b>avconv</b>\n"
 "Use the 'avconv' encoding tool from the Libav project\n"
 "\n"
 msgstr ""
 
+#: MainWindow.vala:629
+msgid "A-Bitrate"
+msgstr ""
+
+#: MainWindow.vala:574
+msgid "A-Ch"
+msgstr ""
+
+#: MainWindow.vala:550
+msgid "A-Fmt"
+msgstr ""
+
+#: MainWindow.vala:593
+msgid "A-Sampling"
+msgstr ""
+
 #: EncoderConfigWindow.vala:2556 EncoderConfigWindow.vala:2575
 msgid "AAC-ELD"
 msgstr ""
@@ -215,50 +251,75 @@
 msgid "AC3 Audio (*.ac3)"
 msgstr ""
 
-#: MainWindow.vala:216
+#: MainWindow.vala:248
 msgid "Abort"
 msgstr ""
 
-#: MainWindow.vala:264
+#: MainWindow.vala:306
 msgid "About"
 msgstr ""
 
-#: MainWindow.vala:326 MainWindow.vala:1559
+#: MainWindow.vala:358 MainWindow.vala:2003
 msgid "Add File(s)"
 msgstr ""
 
-#: MainWindow.vala:309
+#: MainWindow.vala:341
 msgid "Add File(s)..."
 msgstr ""
 
-#: MainWindow.vala:1563
+#: MainWindow.vala:2007
 msgid "Add Folder(s)"
 msgstr ""
 
-#: MainWindow.vala:319
+#: MainWindow.vala:351
 msgid "Add Folder(s)..."
 msgstr ""
 
-#: MainWindow.vala:664
+#: MainWindow.vala:1131
 msgid "Add New Preset"
 msgstr ""
 
+#: MainWindow.vala:2416 MainWindow.vala:2442
+msgid "Add some files to the file list"
+msgstr ""
+
+#: MainWindow.vala:2430
+msgid "Add some videos to the file list"
+msgstr ""
+
+#: MainWindow.vala:2049
+#, c-format
+msgid "Adding (%d/%d): '%s'"
+msgstr ""
+
+#: MainWindow.vala:2039
+msgid "Adding..."
+msgstr ""
+
 #: EncoderConfigWindow.vala:847
 msgid "Adjust Stereo for Headphones"
 msgstr ""
 
-#: Main.vala:687
+#: MainWindow.vala:749
+msgid "Album"
+msgstr ""
+
+#: Main.vala:655
 msgid "All files removed"
 msgstr ""
 
-#: MainWindow.vala:1704
+#: MainWindow.vala:2326
 msgid "An audio-video converter for Linux"
 msgstr ""
 
-#: MainWindow.vala:240
+#: MainWindow.vala:282
 msgid "Application Settings"
 msgstr ""
 
+#: MainWindow.vala:737
+msgid "Artist"
+msgstr ""
+
 #: AboutWindow.vala:322
 #, c-format
 msgid "Artists"
@@ -281,10 +342,6 @@
 msgid "Auto"
 msgstr ""
 
-#: MainWindow.vala:536
-msgid "AutoCrop Video"
-msgstr ""
-
 #: EncoderConfigWindow.vala:1661 EncoderConfigWindow.vala:1686
 #: EncoderConfigWindow.vala:1704 EncoderConfigWindow.vala:1730
 #: EncoderConfigWindow.vala:1761 EncoderConfigWindow.vala:1778
@@ -302,7 +359,7 @@
 msgid "Back"
 msgstr ""
 
-#: MainWindow.vala:279
+#: MainWindow.vala:255
 msgid "Background"
 msgstr ""
 
@@ -314,6 +371,10 @@
 msgid "Best"
 msgstr ""
 
+#: MainWindow.vala:611
+msgid "Bitrate"
+msgstr ""
+
 #: EncoderConfigWindow.vala:449 EncoderConfigWindow.vala:912
 msgid "Bitrate (kbps)"
 msgstr ""
@@ -326,15 +387,23 @@
 msgid "Boost or cut the treble (upper) frequencies of the audio."
 msgstr ""
 
-#: MainWindow.vala:684
+#: CropVideoBatchWindow.vala:173
+msgid "Bottom"
+msgstr ""
+
+#: CropVideoSingleWindow.vala:163
+msgid "Bottom:"
+msgstr ""
+
+#: MainWindow.vala:1151
 msgid "Browse"
 msgstr ""
 
-#: MainWindow.vala:1973
+#: MainWindow.vala:2633
 msgid "CPU: "
 msgstr ""
 
-#: Main.vala:1242 Main.vala:1256
+#: Main.vala:1210 Main.vala:1224
 msgid "Cancelled"
 msgstr ""
 
@@ -353,7 +422,7 @@
 msgid "Channels"
 msgstr ""
 
-#: MainWindow.vala:361
+#: MainWindow.vala:393
 msgid "Clear List"
 msgstr ""
 
@@ -361,7 +430,15 @@
 msgid "Close"
 msgstr ""
 
-#: Main.vala:1081 Main.vala:1091 Main.vala:1099
+#: MainWindow.vala:963
+msgid "Columns..."
+msgstr ""
+
+#: MainWindow.vala:798
+msgid "Comments"
+msgstr ""
+
+#: Main.vala:1049 Main.vala:1059 Main.vala:1067
 msgid "Completed"
 msgstr ""
 
@@ -374,16 +451,16 @@
 msgid "Constant Bitrate (Strict)"
 msgstr ""
 
-#: Main.vala:997 Main.vala:1290
+#: Main.vala:965 Main.vala:1258
 msgid "Converting..."
 msgstr ""
 
-#: MainWindow.vala:1213
+#: MainWindow.vala:1680
 #, c-format
 msgid "Converting: '%s'"
 msgstr ""
 
-#: Main.vala:995 Main.vala:1288
+#: Main.vala:963 Main.vala:1256
 msgid "Converting: Enter (q) to quit or (p) to pause..."
 msgstr ""
 
@@ -391,15 +468,31 @@
 msgid "Credits"
 msgstr ""
 
-#: MainWindow.vala:483
-msgid "CropVideo (L:T:R:B)"
+#: MainWindow.vala:222
+msgid "Crop"
+msgstr ""
+
+#: CropVideoBatchWindow.vala:122
+msgid "Crop Left"
+msgstr ""
+
+#: MainWindow.vala:882
+msgid "Crop Video..."
+msgstr ""
+
+#: MainWindow.vala:224
+msgid "Crop Videos"
+msgstr ""
+
+#: CropVideoSingleWindow.vala:182
+msgid "Cropped:"
 msgstr ""
 
 #: EncoderConfigWindow.vala:1090 EncoderConfigWindow.vala:1193
 msgid "Custom"
 msgstr ""
 
-#: MainWindow.vala:671
+#: MainWindow.vala:1138
 msgid "Delete Preset"
 msgstr ""
 
@@ -411,6 +504,23 @@
 msgid "Description"
 msgstr ""
 
+#: CropVideoSingleWindow.vala:195
+msgid "Detect Borders"
+msgstr ""
+
+#: CropVideoSingleWindow.vala:197
+msgid "Detect black borders in the video and set cropping parameters"
+msgstr ""
+
+#: CropVideoSingleWindow.vala:394
+#, c-format
+msgid "Detected Parameters: %d, %d, %d, %d"
+msgstr ""
+
+#: CropVideoSingleWindow.vala:370
+msgid "Detecting borders..."
+msgstr ""
+
 #: DonationWindow.vala:54
 msgid ""
 "Did you find this software useful?\n"
@@ -446,7 +556,7 @@
 msgid "Documenters"
 msgstr ""
 
-#: DonationWindow.vala:36 MainWindow.vala:253 MainWindow.vala:254
+#: DonationWindow.vala:36 MainWindow.vala:295 MainWindow.vala:296
 msgid "Donate"
 msgstr ""
 
@@ -463,19 +573,23 @@
 msgid "Donations"
 msgstr ""
 
-#: Main.vala:1076
+#: Main.vala:1044
 msgid "Done"
 msgstr ""
 
-#: MainWindow.vala:1201
+#: ColumnSelectionDialog.vala:62
+msgid "Drag and drop to re-order"
+msgstr ""
+
+#: MainWindow.vala:1668
 msgid "Drag files on this window or click the 'Add' button"
 msgstr ""
 
-#: MainWindow.vala:475
+#: MainWindow.vala:526
 msgid "Duration"
 msgstr ""
 
-#: MainWindow.vala:757
+#: MainWindow.vala:1224
 msgid "Edit Preset"
 msgstr ""
 
@@ -491,7 +605,7 @@
 msgid "Empty Preset Name"
 msgstr ""
 
-#: EncoderStatusWindow.vala:45 MainWindow.vala:246
+#: EncoderStatusWindow.vala:45 MainWindow.vala:288
 msgid "Encoders"
 msgstr ""
 
@@ -499,23 +613,23 @@
 msgid "Encoding Mode"
 msgstr ""
 
-#: MainWindow.vala:747
+#: MainWindow.vala:1214
 msgid "Encoding Script or Preset File"
 msgstr ""
 
-#: Main.vala:768
+#: Main.vala:736
 msgid "Enter any key to Cancel..."
 msgstr ""
 
-#: AppConfigWindow.vala:123 AppConfigWindow.vala:173
+#: AppConfigWindow.vala:119 AppConfigWindow.vala:165
 msgid "Enter path or browse for directory"
 msgstr ""
 
-#: Main.vala:1086 Utility.vala:108
+#: Main.vala:1054 Utility.vala:108
 msgid "Error"
 msgstr ""
 
-#: Main.vala:803
+#: Main.vala:771
 msgid "Error: File missing"
 msgstr ""
 
@@ -551,11 +665,11 @@
 msgid "Fade Type"
 msgstr ""
 
-#: Main.vala:1102
+#: Main.vala:1070
 msgid "Failed"
 msgstr ""
 
-#: Utility.vala:1416
+#: Utility.vala:1423
 msgid "Failed to set ownership"
 msgstr ""
 
@@ -563,36 +677,37 @@
 msgid "Fast"
 msgstr ""
 
-#: MainWindow.vala:396
+#: ColumnSelectionDialog.vala:76 CropVideoBatchWindow.vala:103
+#: MainWindow.vala:432
 msgid "File"
 msgstr ""
 
-#: MainWindow.vala:598
+#: MainWindow.vala:952
 msgid "File Info (Output)"
 msgstr ""
 
-#: MainWindow.vala:592
+#: MainWindow.vala:946
 msgid "File Info (Source)"
 msgstr ""
 
-#: AppConfigWindow.vala:216
+#: AppConfigWindow.vala:206
 msgid "File View"
 msgstr ""
 
-#: Main.vala:667
+#: Main.vala:635
 msgid "File added:"
 msgstr ""
 
-#: Main.vala:681
+#: Main.vala:649
 msgid "File removed:"
 msgstr ""
 
-#: Main.vala:704
+#: Main.vala:672
 #, c-format
 msgid "Files will be saved in '%s'"
 msgstr ""
 
-#: Main.vala:707
+#: Main.vala:675
 msgid "Files will be saved in source directory"
 msgstr ""
 
@@ -600,7 +715,7 @@
 msgid "Filters"
 msgstr ""
 
-#: MainWindow.vala:224 MainWindow.vala:226
+#: MainWindow.vala:266 MainWindow.vala:268
 msgid "Finish"
 msgstr ""
 
@@ -612,19 +727,19 @@
 msgid "Fixed Bitrate"
 msgstr ""
 
-#: MainWindow.vala:722 MainWindow.vala:732
+#: MainWindow.vala:1189 MainWindow.vala:1199
 msgid "Folder"
 msgstr ""
 
-#: MainWindow.vala:1813
+#: MainWindow.vala:2457
 msgid "Following encoders were not found on your system:"
 msgstr ""
 
-#: Main.vala:324
+#: Main.vala:330
 msgid "Following utilities are not installed on your system:"
 msgstr ""
 
-#: EncoderConfigWindow.vala:295
+#: EncoderConfigWindow.vala:295 MainWindow.vala:538
 msgid "Format"
 msgstr ""
 
@@ -644,10 +759,14 @@
 msgid "Frames/sec"
 msgstr ""
 
-#: AppConfigWindow.vala:97 EncoderConfigWindow.vala:271
+#: AppConfigWindow.vala:96 EncoderConfigWindow.vala:271
 msgid "General"
 msgstr ""
 
+#: MainWindow.vala:761
+msgid "Genre"
+msgstr ""
+
 #: EncoderConfigWindow.vala:1001
 msgid "Good"
 msgstr ""
@@ -670,21 +789,15 @@
 msgid "Height"
 msgstr ""
 
-#: MainWindow.vala:699 MainWindow.vala:701 MainWindow.vala:1157
+#: MainWindow.vala:1166 MainWindow.vala:1168 MainWindow.vala:1624
 msgid "Info"
 msgstr ""
 
-#: MainWindow.vala:1792
-msgid ""
-"Input queue is empty!\n"
-"Please add some files.\n"
-msgstr ""
-
-#: Main.vala:695
+#: Main.vala:663
 msgid "Input queue is empty! Please add some files."
 msgstr ""
 
-#: Main.vala:239
+#: Main.vala:246
 msgid "Input queue is empty! Please select files to convert."
 msgstr ""
 
@@ -696,19 +809,23 @@
 msgid "Key"
 msgstr ""
 
+#: CropVideoSingleWindow.vala:115
+msgid "Left:"
+msgstr ""
+
 #: EncoderConfigWindow.vala:808
 msgid "Linear"
 msgstr ""
 
-#: AppConfigWindow.vala:229
+#: AppConfigWindow.vala:219
 msgid "List"
 msgstr ""
 
-#: Main.vala:372
+#: Main.vala:378
 msgid "Loading presets from:"
 msgstr ""
 
-#: Main.vala:371
+#: Main.vala:377
 msgid "Loading scripts from:"
 msgstr ""
 
@@ -720,7 +837,7 @@
 msgid "Lossless"
 msgstr ""
 
-#: Main.vala:817 Main.vala:820
+#: Main.vala:785 Main.vala:788
 msgid "Lyrics:"
 msgstr ""
 
@@ -776,19 +893,19 @@
 msgid "Missing"
 msgstr ""
 
-#: MainWindow.vala:1813
+#: MainWindow.vala:2457
 msgid "Missing Encoders"
 msgstr ""
 
-#: Utility.vala:1032
+#: Utility.vala:1036
 msgid "Missing Icon"
 msgstr ""
 
-#: Main.vala:325
+#: Main.vala:331
 msgid "Missing Utilities"
 msgstr ""
 
-#: AppConfigWindow.vala:163
+#: AppConfigWindow.vala:156
 msgid "Move source files after encoding is complete"
 msgstr ""
 
@@ -796,7 +913,11 @@
 msgid "Music"
 msgstr ""
 
-#: Main.vala:3202 MainWindow.vala:1404
+#: MediaPlayerWindow.vala:186
+msgid "Mute"
+msgstr ""
+
+#: MediaFile.vala:338
 msgid "N/A"
 msgstr ""
 
@@ -804,7 +925,7 @@
 msgid "Name"
 msgstr ""
 
-#: EncoderConfigWindow.vala:359 MainWindow.vala:662
+#: EncoderConfigWindow.vala:359 MainWindow.vala:1129
 msgid "New Preset"
 msgstr ""
 
@@ -816,6 +937,10 @@
 msgid "No Change"
 msgstr ""
 
+#: MainWindow.vala:2415 MainWindow.vala:2441
+msgid "No Files"
+msgstr ""
+
 #: EncoderConfigWindow.vala:1524
 msgid "No Subtitles"
 msgstr ""
@@ -824,11 +949,15 @@
 msgid "No Up-Scaling"
 msgstr ""
 
+#: MainWindow.vala:2429
+msgid "No Videos"
+msgstr ""
+
 #: EncoderConfigWindow.vala:488
 msgid "None"
 msgstr ""
 
-#: Main.vala:324
+#: Main.vala:330
 msgid "Not possible to continue!"
 msgstr ""
 
@@ -844,27 +973,27 @@
 msgid "OGG Vorbis Audio (*.ogg)"
 msgstr ""
 
-#: DonationWindow.vala:95
+#: CropVideoSingleWindow.vala:202 DonationWindow.vala:95
 msgid "OK"
 msgstr ""
 
-#: MainWindow.vala:686
+#: MainWindow.vala:1153
 msgid "Open Folder"
 msgstr ""
 
-#: MainWindow.vala:569
+#: MainWindow.vala:923
 msgid "Open Log File"
 msgstr ""
 
-#: MainWindow.vala:563
+#: MainWindow.vala:917
 msgid "Open Output Folder"
 msgstr ""
 
-#: MainWindow.vala:557
+#: MainWindow.vala:911
 msgid "Open Temp Folder"
 msgstr ""
 
-#: MainWindow.vala:292
+#: MainWindow.vala:324
 msgid "Open output folder"
 msgstr ""
 
@@ -876,19 +1005,20 @@
 msgid "Opus Audio (*.opus)"
 msgstr ""
 
-#: MainWindow.vala:290
+#: MainWindow.vala:322
 msgid "Output"
 msgstr ""
 
-#: MainWindow.vala:207 MainWindow.vala:1773 MainWindow.vala:1775
+#: MainWindow.vala:239 MainWindow.vala:2396 MainWindow.vala:2398
+#: MediaPlayerWindow.vala:174
 msgid "Pause"
 msgstr ""
 
-#: Main.vala:1269 Main.vala:1274
+#: Main.vala:1237 Main.vala:1242
 msgid "Paused"
 msgstr ""
 
-#: Main.vala:1272
+#: Main.vala:1240
 msgid "Paused: Enter (r) to resume..."
 msgstr ""
 
@@ -896,19 +1026,27 @@
 msgid "Pitch (shrillness)"
 msgstr ""
 
-#: MainWindow.vala:586
+#: MediaPlayerWindow.vala:170
+msgid "Play"
+msgstr ""
+
+#: MainWindow.vala:940
 msgid "Play File (Output)"
 msgstr ""
 
-#: MainWindow.vala:580
+#: MainWindow.vala:934
 msgid "Play File (Source)"
 msgstr ""
 
+#: CropVideoSingleWindow.vala:372
+msgid "Please Wait..."
+msgstr ""
+
 #: EncoderConfigWindow.vala:2594
 msgid "Please enter a name for this preset"
 msgstr ""
 
-#: MainWindow.vala:1813
+#: MainWindow.vala:2457
 msgid "Please install required packages or select another preset"
 msgstr ""
 
@@ -916,22 +1054,18 @@
 msgid "Please install the 'sox' package on your system to use this feature"
 msgstr ""
 
-#: EncoderConfigWindow.vala:941 MainWindow.vala:737
+#: EncoderConfigWindow.vala:941 MainWindow.vala:1204
 msgid "Preset"
 msgstr ""
 
-#: MainWindow.vala:1095
+#: MainWindow.vala:1562
 msgid "Preset deleted"
 msgstr ""
 
-#: MainWindow.vala:1905
+#: MainWindow.vala:2563
 msgid "Press 'Cancel' to abort shutdown"
 msgstr ""
 
-#: MainWindow.vala:541
-msgid "Preview File"
-msgstr ""
-
 #: EncoderConfigWindow.vala:496 EncoderConfigWindow.vala:973
 msgid "Profile"
 msgstr ""
@@ -948,27 +1082,31 @@
 msgid "Quarter Sine"
 msgstr ""
 
-#: MainWindow.vala:1794
-msgid "Queue is Empty"
+#: Main.vala:693 Main.vala:752 MediaFile.vala:44
+msgid "Queued"
 msgstr ""
 
-#: Main.vala:725 Main.vala:784 Main.vala:2923
-msgid "Queued"
+#: MainWindow.vala:2037
+msgid "Reading file properties..."
 msgstr ""
 
 #: EncoderConfigWindow.vala:1003
 msgid "Realtime"
 msgstr ""
 
+#: MainWindow.vala:810
+msgid "Recorded Date"
+msgstr ""
+
 #: EncoderStatusWindow.vala:108
 msgid "Refresh"
 msgstr ""
 
-#: MainWindow.vala:368
+#: MainWindow.vala:400
 msgid "Remove File(s)"
 msgstr ""
 
-#: MainWindow.vala:349
+#: MainWindow.vala:381
 msgid "Remove Selected Items"
 msgstr ""
 
@@ -985,16 +1123,24 @@
 msgid "Resolution"
 msgstr ""
 
-#: MainWindow.vala:1767 MainWindow.vala:1769
+#: MainWindow.vala:2390 MainWindow.vala:2392
 msgid "Resume"
 msgstr ""
 
-#: MainWindow.vala:383
+#: CropVideoBatchWindow.vala:139
+msgid "Right"
+msgstr ""
+
+#: CropVideoBatchWindow.vala:86 MainWindow.vala:417
 msgid "Right-click for more options"
 msgstr ""
 
-#: MainWindow.vala:284
-msgid "Run processes with lower priority"
+#: CropVideoSingleWindow.vala:131
+msgid "Right:"
+msgstr ""
+
+#: MainWindow.vala:260
+msgid "Run in background with lower priority"
 msgstr ""
 
 #: EncoderConfigWindow.vala:594
@@ -1005,20 +1151,24 @@
 msgid "Sampling Rate (Hz)"
 msgstr ""
 
-#: AppConfigWindow.vala:113
+#: AppConfigWindow.vala:110
 msgid "Save files in following location"
 msgstr ""
 
-#: AppConfigWindow.vala:135 AppConfigWindow.vala:185
-msgid "Select Path"
+#: CropVideoSingleWindow.vala:112
+msgid "Scroll mouse wheel to adjust"
 msgstr ""
 
-#: MainWindow.vala:1199
-msgid "Select a script from the dropdown and click 'Start' to begin"
+#: ColumnSelectionDialog.vala:42
+msgid "Select Columns"
+msgstr ""
+
+#: AppConfigWindow.vala:129 AppConfigWindow.vala:175
+msgid "Select Path"
 msgstr ""
 
-#: AppConfigWindow.vala:334
-msgid "Select the media player to be used for playing audio and video files"
+#: MainWindow.vala:1666
+msgid "Select a script from the dropdown and click 'Start' to begin"
 msgstr ""
 
 #: DonationWindow.vala:81
@@ -1036,27 +1186,27 @@
 "Enable the 'Fit-To-Box' option to avoid changes to aspect ratio."
 msgstr ""
 
-#: MainWindow.vala:269
+#: MainWindow.vala:311
 msgid "Shutdown"
 msgstr ""
 
-#: MainWindow.vala:1746
+#: MainWindow.vala:2368
 msgid "Shutdown Disabled"
 msgstr ""
 
-#: MainWindow.vala:1743
+#: MainWindow.vala:2365
 msgid "Shutdown Enabled"
 msgstr ""
 
-#: MainWindow.vala:274
+#: MainWindow.vala:316
 msgid "Shutdown system after completion"
 msgstr ""
 
-#: MainWindow.vala:467
+#: MainWindow.vala:508
 msgid "Size"
 msgstr ""
 
-#: MainWindow.vala:531
+#: MainWindow.vala:877
 msgid "Skip File"
 msgstr ""
 
@@ -1068,16 +1218,16 @@
 msgid "Slower"
 msgstr ""
 
-#: MainWindow.vala:1595
+#: MainWindow.vala:2075
 msgid "Some files could not be opened:"
 msgstr ""
 
-#: Main.vala:713
+#: Main.vala:681
 #, c-format
 msgid "Source files will be moved to '%s'"
 msgstr ""
 
-#: Main.vala:815
+#: CropVideoSingleWindow.vala:177 Main.vala:783
 msgid "Source:"
 msgstr ""
 
@@ -1093,24 +1243,24 @@
 msgid "Speed"
 msgstr ""
 
-#: MainWindow.vala:198 MainWindow.vala:200
+#: MainWindow.vala:230 MainWindow.vala:232
 msgid "Start"
 msgstr ""
 
-#: Main.vala:699
+#: Main.vala:667
 #, c-format
 msgid "Starting batch of %d file(s):"
 msgstr ""
 
-#: EncoderStatusWindow.vala:98 MainWindow.vala:494
+#: EncoderStatusWindow.vala:98 MainWindow.vala:837
 msgid "Status"
 msgstr ""
 
-#: Utility.vala:757
+#: Utility.vala:761
 msgid "Stopped"
 msgstr ""
 
-#: Main.vala:1096
+#: Main.vala:1064
 msgid "Stopped!"
 msgstr ""
 
@@ -1126,7 +1276,7 @@
 msgid "Subtitles"
 msgstr ""
 
-#: Main.vala:817 Main.vala:820
+#: Main.vala:785 Main.vala:788
 msgid "Subtitles:"
 msgstr ""
 
@@ -1139,20 +1289,20 @@
 msgid "Supported Formats:"
 msgstr ""
 
-#: MainWindow.vala:1907
+#: MainWindow.vala:2565
 msgid "System shutdown"
 msgstr ""
 
-#: MainWindow.vala:1914
+#: MainWindow.vala:2572
 #, c-format
 msgid "System shutdown was cancelled by user!"
 msgstr ""
 
-#: Main.vala:214
+#: Main.vala:221
 msgid "System will be shutdown after completion"
 msgstr ""
 
-#: Main.vala:767 MainWindow.vala:1904
+#: Main.vala:735 MainWindow.vala:2562
 msgid "System will shutdown in one minute!"
 msgstr ""
 
@@ -1178,18 +1328,34 @@
 msgid "Third Party Tools &amp; Software"
 msgstr ""
 
-#: AppConfigWindow.vala:231
+#: AppConfigWindow.vala:221
 msgid "Tiles"
 msgstr ""
 
+#: MainWindow.vala:773
+msgid "Title"
+msgstr ""
+
 #: EncoderStatusWindow.vala:76
 msgid "Tool"
 msgstr ""
 
-#: AppConfigWindow.vala:245
+#: AppConfigWindow.vala:235
 msgid "Tools"
 msgstr ""
 
+#: CropVideoBatchWindow.vala:156
+msgid "Top"
+msgstr ""
+
+#: CropVideoSingleWindow.vala:147
+msgid "Top:"
+msgstr ""
+
+#: MainWindow.vala:785
+msgid "Track #"
+msgstr ""
+
 #: AboutWindow.vala:330
 #, c-format
 msgid "Translators"
@@ -1203,14 +1369,38 @@
 msgid "UltraFast"
 msgstr ""
 
-#: Main.vala:672
+#: Main.vala:640
 msgid "Unknown format:"
 msgstr ""
 
-#: Main.vala:373
+#: MediaPlayerWindow.vala:182
+msgid "Unmute"
+msgstr ""
+
+#: Main.vala:379
 msgid "Using temp folder:"
 msgstr ""
 
+#: MainWindow.vala:662
+msgid "V-Bitrate"
+msgstr ""
+
+#: MainWindow.vala:562
+msgid "V-Fmt"
+msgstr ""
+
+#: MainWindow.vala:718
+msgid "V-Fps"
+msgstr ""
+
+#: MainWindow.vala:699
+msgid "V-Height"
+msgstr ""
+
+#: MainWindow.vala:680
+msgid "V-Width"
+msgstr ""
+
 #: FileInfoWindow.vala:70
 msgid "Value"
 msgstr ""
@@ -1259,7 +1449,7 @@
 msgid "Warning"
 msgstr ""
 
-#: Main.vala:217
+#: Main.vala:224
 msgid ""
 "Warning: User does not have Admin priviledges. '--shutdown' will be ignored."
 msgstr ""
@@ -1276,51 +1466,27 @@
 msgid "Width x Height"
 msgstr ""
 
-#: MainWindow.vala:1205
+#: MainWindow.vala:1672
 msgid ""
 "[Batch completed] Right-click for options or click 'Finish' to continue."
 msgstr ""
 
-#: MainWindow.vala:1209
+#: MainWindow.vala:1676
 msgid "[Paused] Click 'Resume' to continue or 'Stop' to abort."
 msgstr ""
 
-#: AppConfigWindow.vala:272
+#: AppConfigWindow.vala:262
 msgid "avconv / Libav"
 msgstr ""
 
-#: AppConfigWindow.vala:316
-msgid "avplay"
-msgstr ""
-
-#: AppConfigWindow.vala:270
+#: AppConfigWindow.vala:260
 msgid "ffmpeg"
 msgstr ""
 
-#: AppConfigWindow.vala:314
-msgid "ffplay"
-msgstr ""
-
-#: AppConfigWindow.vala:320
-msgid "mplayer"
-msgstr ""
-
-#: AppConfigWindow.vala:318
-msgid "mpv"
-msgstr ""
-
-#: MainWindow.vala:808
+#: MainWindow.vala:1275
 msgid "presets"
 msgstr ""
 
-#: MainWindow.vala:804
+#: MainWindow.vala:1271
 msgid "scripts"
 msgstr ""
-
-#: AppConfigWindow.vala:322
-msgid "smplayer"
-msgstr ""
-
-#: AppConfigWindow.vala:324
-msgid "vlc"
-msgstr ""

selene_16.2.1~226~ubuntu16.04.1.tar.xz/src/AboutWindow.vala -> selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/AboutWindow.vala Changed

selene_16.2.1~226~ubuntu16.04.1.tar.xz/src/AppConfigWindow.vala -> selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/AppConfigWindow.vala Changed

@@ -32,7 +32,7 @@
 using TeeJee.System;
 using TeeJee.Misc;
 
-public class AppConfigWindow : Dialog {
+public class AppConfigWindow : Gtk.Dialog {
 	private Box vboxMain;
 	private Gtk.Notebook notebook;
 	private Label lblView;
@@ -46,7 +46,6 @@
 	private Button btnCancel;
 	private ComboBox cmbFileView;
 	private ComboBox cmbSelectEncoder;
-	private ComboBox cmbSelectPlayer;
 	
 	public AppConfigWindow(Gtk.Window parent) {
 		title = "Settings";
@@ -105,14 +104,11 @@
 		lblOutput = new Label (_("<b>Output Directory</b>"));
 		lblOutput.set_use_markup(true);
 		lblOutput.halign = Align.START;
-		//lblOutput.margin_bottom = 12;
-		//lblOutput.margin_top = 12;
 		vboxTabGeneral.pack_start (lblOutput, false, true, 0);
 
 		// chkOutput
 		chkOutput = new CheckButton.with_label (_("Save files in following location"));
 		chkOutput.active = (App.OutputDirectory.length > 0);
-		//chkOutput.margin_left = 6;
 		chkOutput.clicked.connect (chkOutput_clicked);
 		vboxTabGeneral.pack_start (chkOutput, false, true, 0);
 		
@@ -121,8 +117,6 @@
 		txtOutput.hexpand = true;
 		txtOutput.secondary_icon_stock = "gtk-open";
 		txtOutput.placeholder_text = _("Enter path or browse for directory");
-		//txtOutput.margin_left = 6;
-		//txtOutput.margin_bottom = 6;
 		vboxTabGeneral.add (txtOutput);
 
 		if ((App.OutputDirectory != null) && dir_exists (App.OutputDirectory)){
@@ -155,14 +149,12 @@
 		lblBackup = new Label (_("<b>Backup Directory</b>"));
 		lblBackup.set_use_markup(true);
 		lblBackup.halign = Align.START;
-		//lblBackup.margin_bottom = 12;
 		lblBackup.margin_top = 12;
 		vboxTabGeneral.pack_start (lblBackup, false, true, 0);
 
 		// chkBackup
 		chkBackup = new CheckButton.with_label (_("Move source files after encoding is complete"));
 		chkBackup.active = (App.BackupDirectory.length > 0);
-		//chkBackup.margin_left = 6;
 		chkBackup.clicked.connect (chkBackup_clicked);
 		vboxTabGeneral.pack_start (chkBackup, false, true, 0);
 		
@@ -171,8 +163,6 @@
 		txtBackup.hexpand = true;
 		txtBackup.secondary_icon_stock = "gtk-open";
 		txtBackup.placeholder_text = _("Enter path or browse for directory");
-		//txtBackup.margin_left = 6;
-		//txtBackup.margin_bottom = 6;
 		vboxTabGeneral.add (txtBackup);
 
 		if ((App.BackupDirectory != null) && dir_exists (App.BackupDirectory)){
@@ -295,69 +285,6 @@
 			cmbSelectEncoder.active = 0;
 			break;
 		}
-
-		//hboxPlayer -----------------------------------------------
-		
-		var hboxPlayer = new Gtk.Box(Orientation.HORIZONTAL,6);
-		vboxTabTools.pack_start (hboxPlayer, false, true, 0);
-		
-		//lblSelectPlayer
-		var lblSelectPlayer = new Label ("Media player");
-		lblSelectPlayer.set_use_markup(true);
-		lblSelectPlayer.halign = Align.START;
-		lblSelectPlayer.hexpand = true;
-		hboxPlayer.add(lblSelectPlayer);
-		
-		//cmdSelectPlayer
-		model = new Gtk.ListStore (2, typeof (string), typeof (string));
-		model.append (out iter);
-		model.set (iter, 0, _("ffplay"), 1, "ffplay");
-		model.append (out iter);
-		model.set (iter, 0, _("avplay"), 1, "avplay");
-		model.append (out iter);
-		model.set (iter, 0, _("mpv"), 1, "mpv");
-		model.append (out iter);
-		model.set (iter, 0, _("mplayer"), 1, "mplayer");
-		model.append (out iter);
-		model.set (iter, 0, _("smplayer"), 1, "smplayer");
-		model.append (out iter);
-		model.set (iter, 0, _("vlc"), 1, "vlc");
-		
-		cmbSelectPlayer = new ComboBox.with_model(model);
-		hboxPlayer.add(cmbSelectPlayer);
-		sizegroup.add_widget(cmbSelectPlayer);
-		
-		textCell = new CellRendererText();
-        cmbSelectPlayer.pack_start( textCell, false );
-        cmbSelectPlayer.set_attributes( textCell, "text", 0 );
-			
-        tt = _("Select the media player to be used for playing audio and video files");
-        cmbSelectPlayer.set_tooltip_markup(tt);
-		lblSelectPlayer.set_tooltip_markup(tt);
-		
-		switch(App.AVPlayer){
-		case "ffplay":
-			cmbSelectPlayer.active = 0;
-			break;
-		case "avplay":
-			cmbSelectPlayer.active = 1;
-			break;
-		case "mpv":
-			cmbSelectPlayer.active = 2;
-			break;
-		case "mplayer":
-			cmbSelectPlayer.active = 3;
-			break;
-		case "smplayer":
-			cmbSelectPlayer.active = 4;
-			break;
-		case "vlc":
-			cmbSelectPlayer.active = 5;
-			break;
-		default:
-			cmbSelectPlayer.active = 0;
-			break;
-		}
 	}
 	
 	private void chkOutput_clicked(){
@@ -396,8 +323,7 @@
 		App.TileView = (cmbFileView.active == 1);
 
 		App.AVEncoder = gtk_combobox_get_value(cmbSelectEncoder,1,"ffmpeg");
-		App.AVPlayer = gtk_combobox_get_value(cmbSelectPlayer,1,"mplayer");
-		
+
 		// Save settings
 		App.save_config();

selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/ColumnSelectionDialog.vala Added

@@ -0,0 +1,207 @@
+/*
+ * SimpleProgressWindow.vala
+ *
+ * Copyright 2015 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 Gee;
+
+using TeeJee.Logging;
+using TeeJee.FileSystem;
+using TeeJee.JSON;
+using TeeJee.ProcessManagement;
+using TeeJee.GtkHelper;
+using TeeJee.Multimedia;
+using TeeJee.System;
+using TeeJee.Misc;
+
+public class ColumnSelectionDialog : Gtk.Dialog {
+
+	private Gtk.TreeView tvCols;
+	
+	public ColumnSelectionDialog.with_parent(Window parent, Gee.HashMap<TreeViewColumn,TreeViewListColumn> col_list) {
+		title = _("Select Columns");
+		
+		set_transient_for(parent);
+		set_modal(true);
+		set_skip_taskbar_hint(true);
+		set_skip_pager_hint(true);
+		window_position = WindowPosition.CENTER_ON_PARENT;
+		deletable = false;
+		resizable = false;
+		
+		set_transient_for(parent);
+		set_modal(true);
+
+		// get content area
+		var vboxMain = get_content_area();
+		vboxMain.set_size_request(300,300);
+
+		//add treeview for columns
+		tvCols = new TreeView();
+		tvCols.get_selection().mode = SelectionMode.MULTIPLE;
+		tvCols.set_tooltip_text (_("Drag and drop to re-order"));
+		tvCols.headers_visible = false;
+		tvCols.reorderable = true;
+
+		var swCols = new ScrolledWindow(tvCols.get_hadjustment(), tvCols.get_vadjustment());
+		swCols.set_shadow_type (ShadowType.ETCHED_IN);
+		swCols.add (tvCols);
+		swCols.margin = 6;
+		vboxMain.pack_start (swCols, true, true, 0);
+	
+		CellRendererText cellText;
+		
+		//colName
+		var colName = new TreeViewColumn();
+		colName.title = _("File");
+		colName.expand = true;
+		tvCols.append_column(colName);
+
+		//cell toggle
+		CellRendererToggle cell_select = new CellRendererToggle ();
+		cell_select.activatable = true;
+		colName.pack_start (cell_select, false);
+		colName.set_cell_data_func (cell_select, (cell_layout, cell, model, iter) => {
+			bool selected;
+			TreeViewListColumn col;
+			model.get (iter, 0, out selected, 1, out col, -1);
+			(cell as Gtk.CellRendererToggle).active = selected;
+		});
+
+		cell_select.toggled.connect((path) => {
+			var store = (Gtk.ListStore) tvCols.model;
+			bool selected;
+			TreeViewListColumn col;
+
+			TreeIter iter;
+			store.get_iter_from_string (out iter, path);
+			store.get (iter, 0, out selected, 1, out col, -1);
+
+			col.Selected = !selected;
+
+			store.set(iter, 0, col.Selected, -1);
+		});
+
+		//cell text
+		cellText = new CellRendererText();
+		cellText.ellipsize = Pango.EllipsizeMode.END;
+		colName.pack_start (cellText, false);
+		colName.set_cell_data_func (cellText, (cell_layout, cell, model, iter)=>{
+			TreeViewListColumn col;
+			model.get (iter, 1, out col, -1);
+			(cell as Gtk.CellRendererText).text = col.FullDisplayName;
+		});
+
+		//create sorted list ---------------------
+		
+		TreeIter iter;
+		var lst_all = new Gee.ArrayList<TreeViewListColumn>();
+		foreach(TreeViewListColumn col in col_list.values){
+			lst_all.add(col);
+		}
+		CompareDataFunc<TreeViewListColumn> func = (a, b) => {
+			return strcmp(a.FullDisplayName,b.FullDisplayName);
+		};
+		lst_all.sort((owned)func);
+
+		//created ordered list --------------------
+		
+		var lst = new Gee.ArrayList<TreeViewListColumn>();
+		//add selected columns in order
+		foreach(string col_name in App.ListViewColumns.split(",")){
+			foreach(TreeViewListColumn col in col_list.values){
+				if (col.Name == col_name){
+					lst.add(col);
+					break;
+				}
+			}
+		}
+		//add unselected
+		foreach(TreeViewListColumn col in lst_all){
+			if (!col.Selected){
+				lst.add(col);
+			}
+		}
+		
+		//add rows ----------------------
+		
+		var store = new Gtk.ListStore (2, typeof(bool), typeof(TreeViewListColumn));
+		foreach(TreeViewListColumn col in lst){
+			store.append (out iter);
+			store.set (iter, 0, col.Selected);
+			store.set (iter, 1, col);
+		}
+		tvCols.model = store;
+
+		// btnSave
+        var btnSave = (Button) add_button ("gtk-save", Gtk.ResponseType.ACCEPT);
+        btnSave.clicked.connect (()=>{
+			save_columns(col_list);
+			this.close();
+		});
+
+        // btnCancel
+        var btnCancel = (Button) add_button ("gtk-cancel", Gtk.ResponseType.CANCEL);
+        btnCancel.clicked.connect (()=>{
+			this.close();
+		});
+		
+        show_all();
+	}
+
+	private void save_columns(Gee.HashMap<TreeViewColumn,TreeViewListColumn> col_list){
+		if (col_list == null){
+			return;
+		}
+
+		string s = "";
+
+		//get ordered list -----------------------
+		
+		var list = new Gee.ArrayList<TreeViewListColumn>();
+
+		TreeIter iter;
+		bool iterExists = tvCols.model.get_iter_first (out iter);
+		while (iterExists) {
+			TreeViewListColumn item;
+			tvCols.model.get (iter, 1, out item, -1);
+			list.add(item);
+			iterExists = tvCols.model.iter_next (ref iter);
+		}
+
+		// create string of column names -------------
+		
+		foreach(TreeViewListColumn col in list){
+			if (col.Selected){
+				s += col.Name + ",";
+			}
+		}
+		if (s.has_suffix(",")){
+			s = s[0:s.length - 1];
+		}
+
+		App.ListViewColumns = s;
+	}
+}
+
+

selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/CropVideoBatchWindow.vala Added

@@ -0,0 +1,291 @@
+/*
+ * CropVideoBatchWindow.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 Gee;
+
+using TeeJee.Logging;
+using TeeJee.FileSystem;
+using TeeJee.JSON;
+using TeeJee.ProcessManagement;
+using TeeJee.GtkHelper;
+using TeeJee.Multimedia;
+using TeeJee.System;
+using TeeJee.Misc;
+
+public class CropVideoBatchWindow : Gtk.Dialog {
+	private Gtk.Box vboxMain;
+	private Gtk.TreeView tvFiles;
+	private Gtk.ScrolledWindow swFiles;
+	
+	private Gtk.TreeViewColumn colCropL;
+	private Gtk.TreeViewColumn colCropR;
+	private Gtk.TreeViewColumn colCropT;
+	private Gtk.TreeViewColumn colCropB;
+	private Gtk.TreeViewColumn colEdit;
+
+	private MediaFile SelectedFile = null;
+
+	private Gtk.Button btnOk;
+
+	public CropVideoBatchWindow(Gtk.Window parent) {
+		set_transient_for(parent);
+		set_destroy_with_parent(true);
+        //set_skip_taskbar_hint(true);
+
+		window_position = WindowPosition.CENTER_ON_PARENT;
+		icon = get_app_icon(16);
+		
+		modal = true;
+		deletable = true;
+		resizable = true;
+		
+		title = "Crop Videos (Batch)";
+		
+		// get content area
+		vboxMain = get_content_area();
+		vboxMain.set_size_request(600,500);
+
+		init_ui_file_list();
+
+		// btnOk
+        btnOk = (Button) add_button ("gtk-ok", Gtk.ResponseType.ACCEPT);
+        btnOk.clicked.connect (btnOk_clicked);
+        
+        refresh_list_view();
+
+        this.destroy.connect(()=>{ parent.show(); });
+
+        show_all();
+	}
+
+	private void init_ui_file_list(){
+		//tvFiles
+		tvFiles = new TreeView();
+		tvFiles.get_selection().mode = SelectionMode.MULTIPLE;
+		tvFiles.set_tooltip_text (_("Right-click for more options"));
+		tvFiles.headers_clickable = true;
+		tvFiles.activate_on_single_click = true;
+		tvFiles.rules_hint = true;
+		
+		swFiles = new ScrolledWindow(tvFiles.get_hadjustment(), tvFiles.get_vadjustment());
+		swFiles.set_shadow_type (ShadowType.ETCHED_IN);
+		swFiles.add (tvFiles);
+		swFiles.margin = 3;
+		swFiles.set_size_request (-1, 150);
+		vboxMain.pack_start (swFiles, true, true, 0);
+	
+		CellRendererText cellText;
+		CellRendererSpin cellSpin;
+
+		//colName
+		var colName = new TreeViewColumn();
+		colName.title = _("File");
+		colName.expand = true;
+		colName.resizable = true;
+		colName.clickable = true;
+		colName.min_width = 100;
+		tvFiles.append_column(colName);
+		
+		cellText = new CellRendererText();
+		cellText.xalign = (float) 0.0;
+		cellText.ellipsize = Pango.EllipsizeMode.END;
+		colName.pack_start (cellText, false);
+		colName.set_cell_data_func (cellText, (cell_layout, cell, model, iter)=>{
+			MediaFile mf;
+			model.get (iter, 0, out mf, -1);
+			(cell as Gtk.CellRendererText).text = mf.Name;
+		});
+
+		//colCropL
+		colCropL = new TreeViewColumn();
+		colCropL.title = _("Crop Left");
+		colCropL.fixed_width = 80;
+		tvFiles.append_column(colCropL);
+		
+		cellSpin = new CellRendererSpin();
+		//cellSpin.xalign = (float) 0.5;
+		cellSpin.editable = true;
+		cellSpin.adjustment = new Gtk.Adjustment (0, 0, 2000, 1, 2, 0);
+		cellSpin.edited.connect ((path, new_text) => {
+			colCrop_cell_edited(path, new_text, CropInputField.CROP_LEFT);
+		});
+		
+		colCropL.pack_start (cellSpin, false);
+		colCropL.set_attributes(cellSpin, "text",  CropInputField.CROP_LEFT);
+
+		//colCropR
+		colCropR = new TreeViewColumn();
+		colCropR.title = _("Right");
+		colCropR.fixed_width = 80;
+		tvFiles.append_column(colCropR);
+		
+		cellSpin = new CellRendererSpin();
+		//cellSpin.xalign = (float) 0.5;
+		cellSpin.editable = true;
+		cellSpin.adjustment = new Gtk.Adjustment (0, 0, 2000, 1, 2, 0);
+		cellSpin.edited.connect ((path, new_text) => {
+			colCrop_cell_edited(path, new_text, CropInputField.CROP_RIGHT);
+		});
+		
+		colCropR.pack_start (cellSpin, false);
+		colCropR.set_attributes(cellSpin, "text", CropInputField.CROP_RIGHT);
+
+		//colCropT
+		colCropT = new TreeViewColumn();
+		colCropT.title = _("Top");
+		colCropT.fixed_width = 80;
+		tvFiles.append_column(colCropT);
+		
+		cellSpin = new CellRendererSpin();
+		//cellSpin.xalign = (float) 0.5;
+		cellSpin.editable = true;
+		cellSpin.adjustment = new Gtk.Adjustment (0, 0, 2000, 1, 2, 0);
+		cellSpin.edited.connect ((path, new_text) => {
+			colCrop_cell_edited(path, new_text, CropInputField.CROP_TOP);
+		});
+		
+		colCropT.pack_start (cellSpin, false);
+		colCropT.set_attributes(cellSpin, "text", CropInputField.CROP_TOP);
+
+		//colCropB
+		colCropB = new TreeViewColumn();
+		colCropB.title = _("Bottom");
+		colCropB.fixed_width = 80;
+		tvFiles.append_column(colCropB);
+		
+		cellSpin = new CellRendererSpin();
+		//cellSpin.xalign = (float) 0.5;
+		cellSpin.editable = true;
+		cellSpin.adjustment = new Gtk.Adjustment (0, 0, 2000, 1, 2, 0);
+		cellSpin.edited.connect ((path, new_text) => {
+			colCrop_cell_edited(path, new_text, CropInputField.CROP_BOTTOM);
+		});
+		
+		colCropB.pack_start (cellSpin, false);
+		colCropB.set_attributes(cellSpin, "text", CropInputField.CROP_BOTTOM);
+
+		//colEdit
+		var pixbuf = new Gtk.CellRendererPixbuf();
+		pixbuf.icon_name = "gtk-edit";
+		colEdit = new Gtk.TreeViewColumn();
+		colEdit.pack_start (pixbuf, false);
+		tvFiles.append_column(colEdit);
+
+		//colSpacer
+		var colSpacer = new TreeViewColumn();
+		colSpacer.expand = false;
+		colSpacer.fixed_width = 10;
+		tvFiles.append_column(colSpacer);
+		
+		tvFiles.row_activated.connect((path, column)=>{
+			var store = (Gtk.ListStore) tvFiles.model;
+			MediaFile mf;
+			TreeIter iter;
+			store.get_iter_from_string (out iter, path.to_string());
+			store.get (iter, 0, out mf, -1);
+
+			SelectedFile = mf;
+		
+			if (column == colEdit){
+				var win = new CropVideoSingleWindow(this, mf);
+				win.destroy.connect(()=>{
+					store.set(iter, 1, mf.CropL.to_string());
+					store.set(iter, 2, mf.CropR.to_string());
+					store.set(iter, 3, mf.CropT.to_string());
+					store.set(iter, 4, mf.CropB.to_string());
+				});
+			}
+		});
+	}
+
+	private void colCrop_cell_edited(string path, string new_text, CropInputField field){
+		TreeIter iter;
+		var model = (Gtk.ListStore) tvFiles.model;
+		MediaFile mf = null;
+		if (model.get_iter_from_string (out iter, path)){
+			model.get (iter, 0, out mf, -1);
+		}
+		else{
+			return;
+		}
+
+		switch (field){
+			case CropInputField.CROP_LEFT:
+				mf.CropL = int.parse(new_text);
+				break;
+			case CropInputField.CROP_RIGHT:
+				mf.CropR = int.parse(new_text);
+				break;
+			case CropInputField.CROP_TOP:
+				mf.CropT = int.parse(new_text);
+				break;
+			case CropInputField.CROP_BOTTOM:
+				mf.CropB = int.parse(new_text);
+				break;
+		}
+
+		model.set (iter, field, (new_text == "0") ? "" : new_text);
+	}  
+	
+	
+	private void refresh_list_view (){
+		var store = new Gtk.ListStore (5,  
+				typeof(MediaFile), 	//FILE_REF
+				typeof(string), 	//CROP_LEFT
+				typeof(string), 	//CROP_RIGHT
+				typeof(string), 	//CROP_TOP
+				typeof(string) 	//CROP_BOTTOM
+				);
+
+		TreeIter iter;
+		foreach(MediaFile mf in App.InputFiles) {
+			if (mf.HasVideo){
+				store.append (out iter);
+				store.set(iter, 0, mf);
+				store.set(iter, 1, mf.CropL.to_string());
+				store.set(iter, 2, mf.CropR.to_string());
+				store.set(iter, 3, mf.CropT.to_string());
+				store.set(iter, 4, mf.CropB.to_string());
+			}
+		}
+
+		tvFiles.set_model (store);
+		
+		tvFiles.columns_autosize();
+	}
+
+
+	private void btnOk_clicked(){
+		destroy();
+	}
+}
+
+public enum  CropInputField{
+	FILE_REF,
+	CROP_LEFT,
+	CROP_RIGHT,
+	CROP_TOP,
+	CROP_BOTTOM
+}
+

selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/CropVideoSingleWindow.vala Added

@@ -0,0 +1,418 @@
+/*
+ * CropVideoSingleWindow.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 Gee;
+
+using TeeJee.Logging;
+using TeeJee.FileSystem;
+using TeeJee.JSON;
+using TeeJee.ProcessManagement;
+using TeeJee.GtkHelper;
+using TeeJee.Multimedia;
+using TeeJee.System;
+using TeeJee.Misc;
+
+public class CropVideoSingleWindow : Gtk.Window {
+	private Gtk.Box vboxMain;
+	private Gtk.DrawingArea canvas;
+	private Gtk.Scale scalePos;
+	private Gtk.ComboBox cmbZoom;
+
+	private Gtk.SpinButton spinCropL;
+	private Gtk.SpinButton spinCropR;
+	private Gtk.SpinButton spinCropT;
+	private Gtk.SpinButton spinCropB;
+	
+	private Gtk.Label lblSourceSize;
+	private Gtk.Label lblCroppedSize;
+
+	private MediaPlayer player;
+	private MediaFile mFile;
+
+	private uint tmr_init = 0;
+
+	public CropVideoSingleWindow(Gtk.Window parent, MediaFile _mFile) {
+		set_transient_for(parent);
+		set_destroy_with_parent(true);
+        //set_skip_taskbar_hint(true);
+
+		window_position = WindowPosition.CENTER_ALWAYS;
+		icon = get_app_icon(16);
+		
+		modal = true;
+		deletable = true;
+		resizable = false;
+		
+		player = new MediaPlayer();
+		player.mFile = _mFile;
+		mFile = _mFile;
+		
+		title = "Crop Video";
+
+		vboxMain = new Gtk.Box(Orientation.VERTICAL,6);
+		//vboxMain = get_content_area () as Gtk.Box;
+		add(vboxMain);
+
+		init_ui_file_crop_options();
+
+		init_ui_player();
+
+		this.destroy.connect(()=>{ parent.show(); });
+		
+		show_all();
+		
+		tmr_init = Timeout.add(100, init_delayed);
+	}
+	
+	private bool init_delayed() {
+		/* any actions that need to run after window has been displayed */
+		
+		if (tmr_init > 0) {
+			Source.remove(tmr_init);
+			tmr_init = 0;
+		}
+
+		load_file();
+
+		return false;
+	}
+	
+	private void init_ui_file_crop_options(){
+		var grid = new Gtk.Grid();
+		grid.margin = 6;
+		grid.row_spacing = 3;
+		grid.column_spacing = 3;
+		vboxMain.add(grid);
+		
+		Gtk.Adjustment adj;
+		Gtk.SpinButton spin;
+		Gtk.Label label;
+
+		string tt = _("Scroll mouse wheel to adjust");
+		
+		//left
+		label = new Gtk.Label(_("Left:"));
+		label.xalign = (float) 1.0;
+		//label.margin_left = 18;
+		grid.attach(label,0,0,1,1);
+		
+		//left
+		adj = new Gtk.Adjustment(0, 0, 99999, 1, 1, 0);
+		spin = new Gtk.SpinButton (adj, 1, 0);
+		spin.xalign = (float) 0.5;
+		spin.set_tooltip_text(tt);
+		grid.attach(spin,1,0,1,1);
+		
+		spinCropL = spin;
+	
+
+		//right
+		label = new Gtk.Label(_("Right:"));
+		label.xalign = (float) 1.0;
+		//label.margin_left = 18;
+		grid.attach(label,0,1,1,1);
+		
+		//right
+		adj = new Gtk.Adjustment(0, 0, 99999, 1, 1, 0);
+		spin = new Gtk.SpinButton (adj, 1, 0);
+		spin.xalign = (float) 0.5;
+		spin.set_tooltip_text(tt);
+		grid.attach(spin,1,1,1,1);
+
+		spinCropR = spin;
+		
+
+		//top
+		label = new Gtk.Label(_("Top:"));
+		label.xalign = (float) 1.0;
+		//label.margin_left = 18;
+		grid.attach(label,2,0,1,1);
+		
+		//top
+		adj = new Gtk.Adjustment(0, 0, 99999, 1, 1, 0);
+		spin = new Gtk.SpinButton (adj, 1, 0);
+		spin.xalign = (float) 0.5;
+		spin.set_tooltip_text(tt);
+		grid.attach(spin,3,0,1,1);
+
+		spinCropT = spin;
+		
+
+		//bottom
+		label = new Gtk.Label(_("Bottom:"));
+		label.xalign = (float) 1.0;
+		//label.margin_left = 18;
+		grid.attach(label,2,1,1,1);
+		
+		//bottom
+		adj = new Gtk.Adjustment(0, 0, 99999, 1, 1, 0);
+		spin = new Gtk.SpinButton (adj, 1, 0);
+		spin.xalign = (float) 0.5;
+		spin.set_tooltip_text(tt);
+		grid.attach(spin,3,1,1,1);
+		
+		spinCropB = spin;
+
+		label = new Gtk.Label(_("Source:"));
+		label.xalign = (float) 1.0;
+		label.margin_left = 18;
+		grid.attach(label,4,0,1,1);
+
+		label = new Gtk.Label(_("Cropped:"));
+		label.xalign = (float) 1.0;
+		label.margin_left = 18;
+		grid.attach(label,4,1,1,1);
+
+		lblSourceSize = new Gtk.Label("0x0");
+		lblSourceSize.xalign = (float) 1.0;
+		grid.attach(lblSourceSize,5,0,1,1);
+
+		lblCroppedSize = new Gtk.Label("0x0");
+		lblCroppedSize.xalign = (float) 1.0;
+		grid.attach(lblCroppedSize,5,1,1,1);
+
+		var button = new Button.with_label(_("Detect Borders"));
+		button.margin_left = 18;
+		button.set_tooltip_text(_("Detect black borders in the video and set cropping parameters"));
+        grid.attach(button,6,0,1,1);
+
+		button.clicked.connect(btnDetect_clicked);
+
+		button = new Button.with_label(_("OK"));
+		button.margin_left = 18;
+        grid.attach(button,6,1,1,1);
+
+        button.clicked.connect(()=>{ this.destroy(); });
+	}
+
+	private void spin_value_changed_connect(){
+		spinCropL.value_changed.connect(spinCropL_value_changed);
+		spinCropR.value_changed.connect(spinCropR_value_changed);
+		spinCropT.value_changed.connect(spinCropT_value_changed);
+		spinCropB.value_changed.connect(spinCropB_value_changed);
+	}
+	
+	private void spin_value_changed_disconnect(){
+		spinCropL.value_changed.disconnect(spinCropL_value_changed);
+		spinCropR.value_changed.disconnect(spinCropR_value_changed);
+		spinCropT.value_changed.disconnect(spinCropT_value_changed);
+		spinCropB.value_changed.disconnect(spinCropB_value_changed);
+	}
+	
+	private void spinCropL_value_changed(){
+		int original = mFile.CropL;
+		int modified = (int) spinCropL.get_value();
+		int change = modified - original;
+		mFile.CropL = modified;
+		
+		player.ChangeRectangle(2, change);
+		player.ChangeRectangle(0, -change);
+		player.FrameStep();
+		
+		update_label_for_cropped_size();
+	}
+
+	private void spinCropR_value_changed(){
+		int original = mFile.CropR;
+		int modified = (int) spinCropR.get_value();
+		int change = modified - original;
+		mFile.CropR = modified;
+		
+		//player.ChangeRectangle(2, change);
+		player.ChangeRectangle(0, -change);
+		player.FrameStep();
+		
+		update_label_for_cropped_size();
+	}
+
+	private void spinCropT_value_changed(){
+		int original = mFile.CropT;
+		int modified = (int) spinCropT.get_value();
+		int change = modified - original;
+		mFile.CropT = modified;
+		
+		player.ChangeRectangle(3, change);
+		player.ChangeRectangle(1, -change);
+		player.FrameStep();
+		
+		update_label_for_cropped_size();
+	}
+
+	private void spinCropB_value_changed(){
+		int original = mFile.CropB;
+		int modified = (int) spinCropB.get_value();
+		int change = modified - original;
+		mFile.CropB = modified;
+		
+		//player.ChangeRectangle(3, change);
+		player.ChangeRectangle(1, -change);
+		player.FrameStep();
+		
+		update_label_for_cropped_size();
+	}
+	
+	private void init_ui_player(){
+		var hboxSlider = new Gtk.Box(Orientation.HORIZONTAL,6);
+		hboxSlider.margin_left = 6;
+		hboxSlider.margin_right = 6;
+		//hboxSlider.set_size_request(600,600);
+		vboxMain.add(hboxSlider);
+		
+		scalePos = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 0, (mFile.Duration/1000), 1);
+		scalePos.adjustment.value = 0;
+		scalePos.has_origin = false;
+		scalePos.draw_value = false;
+		scalePos.expand = true;
+		//scalePos.value_pos = PositionType.RIGHT;
+		hboxSlider.add(scalePos);
+
+		scalePos.value_changed.connect (() => {
+			player.Seek(scalePos.get_value());
+		});
+
+		//cmbZoom
+		cmbZoom = new ComboBox();
+		var textCell = new CellRendererText();
+        cmbZoom.pack_start(textCell, false);
+        cmbZoom.set_attributes(textCell, "text", 0);
+        hboxSlider.add(cmbZoom);
+
+        //populate
+        TreeIter iter;
+		var model = new Gtk.ListStore (2, typeof (string), typeof (string));
+		model.append (out iter);
+		model.set (iter,0,_("25%"),1,"0.25");
+		model.append (out iter);
+		model.set (iter,0,_("50%"),1,"0.50");
+		model.append (out iter);
+		model.set (iter,0,_("75%"),1,"0.75");
+		model.append (out iter);
+		model.set (iter,0,_("100%"),1,"1.0");
+		model.append (out iter);
+		model.set (iter,0,_("200%"),1,"2.0");
+		cmbZoom.set_model(model);
+
+		if (mFile.SourceWidth > (Gdk.Screen.get_default().get_width() / 2)){
+			cmbZoom.active = 2;
+		}
+		else{
+			cmbZoom.active = 3;
+		}
+		
+		cmbZoom.changed.connect(cmbZoom_changed);
+		
+		canvas = new Gtk.DrawingArea();
+		canvas.set_size_request(400,300);
+		canvas.expand = true;
+		canvas.halign = Align.START;
+		vboxMain.pack_start (canvas, false, false, 0);
+
+        this.canvas.realize.connect(() => {
+			player.WindowID = get_widget_xid(canvas);
+			player.StartPlayerWithRectangle();
+		});
+
+		this.delete_event.connect(()=>{
+			player.Exit();
+			return false;
+		});
+	}
+
+
+	private void load_file(){
+		cmbZoom_changed();
+		player.Open(mFile, true, true, true);
+
+        spin_value_changed_disconnect();
+        
+		spinCropL.adjustment.value = mFile.CropL;
+		spinCropR.adjustment.value = mFile.CropR;
+		spinCropT.adjustment.value = mFile.CropT;
+		spinCropB.adjustment.value = mFile.CropB;
+		
+		lblSourceSize.label = "%dx%d".printf(mFile.SourceWidth,mFile.SourceHeight);
+		update_label_for_cropped_size();
+		
+		spin_value_changed_connect();
+
+		//player.SetRectangle();
+		//player.FrameStep();
+	}
+	
+	private void btnDetect_clicked(){
+		player.Exit();
+		//sleep(2000);
+		player.StartPlayerWithCropDetect();
+		player.Open(mFile, false, true, true);
+
+		
+		var status_msg = _("Detecting borders...");
+		var dlg = new SimpleProgressWindow.with_parent(this, status_msg);
+		dlg.set_title(_("Please Wait..."));
+		dlg.show_all();
+		gtk_do_events();
+
+		//get total count
+		App.progress_total = 10;
+		App.progress_count = 0;
+
+		mFile.CropL = 9999;
+		mFile.CropR = 9999;
+		mFile.CropT = 9999;
+		mFile.CropB = 9999;
+		
+		double duration = (mFile.Duration / 1000.0);
+		double step = duration / 10.0;
+		for(int i = 0; i < 10; i++){
+			player.Seek(step * i);
+			sleep(100);
+			App.progress_count++;
+			dlg.update_progressbar();
+		}
+
+		dlg.finish(_("Detected Parameters: %d, %d, %d, %d").printf(mFile.CropL,mFile.CropR,mFile.CropT,mFile.CropB));
+		
+		//dlg.close();
+		//gtk_do_events();
+
+		player.Exit();
+		player.StartPlayerWithRectangle();
+
+		load_file();
+	}
+	
+	private void update_label_for_cropped_size(){
+		lblCroppedSize.label = "%dx%d".printf((mFile.SourceWidth - mFile.CropL - mFile.CropR),(mFile.SourceHeight - mFile.CropT - mFile.CropB));
+	}
+
+	private void cmbZoom_changed(){
+		double zoom = double.parse(gtk_combobox_get_value(cmbZoom,1,"1.0"));
+		int zoomWidth = (int) (mFile.SourceWidth * zoom * 1.0);
+		int zoomHeight = (int) (mFile.SourceHeight * zoom * 1.0);
+		canvas.set_size_request(zoomWidth, zoomHeight);
+		this.resize(1,1);
+		gtk_do_events();
+	}
+}
+

selene_16.2.1~226~ubuntu16.04.1.tar.xz/src/CustomMessageDialog.vala -> selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/CustomMessageDialog.vala Changed

selene_16.2.1~226~ubuntu16.04.1.tar.xz/src/EncoderConfigWindow.vala -> selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/EncoderConfigWindow.vala Changed

selene_16.2.1~226~ubuntu16.04.1.tar.xz/src/EncoderStatusWindow.vala -> selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/EncoderStatusWindow.vala Changed

selene_16.2.1~226~ubuntu16.04.1.tar.xz/src/FileInfoWindow.vala -> selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/FileInfoWindow.vala Changed

selene_16.2.1~226~ubuntu16.04.1.tar.xz/src/Main.vala -> selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/Main.vala Changed

@@ -36,9 +36,9 @@
 using TeeJee.Misc;
 
 public Main App;
-public const string AppName = "Selene";
+public const string AppName = "Selene Media Converter";
 public const string AppShortName = "selene";
-public const string AppVersion = "16.2.1";
+public const string AppVersion = "16.2.4";
 public const string AppAuthor = "Tony George";
 public const string AppAuthorEmail = "teejeetech@gmail.com";
 
@@ -87,14 +87,20 @@
 	public bool TileView = true;
 	
 	public string AVEncoder = "ffmpeg";
-	public string AVPlayer = "ffplay";
 
+	public string ListViewColumns = "";
+	
 	public ScriptFile SelectedScript;
 	public MediaFile CurrentFile;
 	public string CurrentLine;
 	public string StatusLine;
 	public double Progress;
 
+	//used by SimpleProgressWindow
+	public string status_line = "";
+	public int progress_total = 0;
+	public int progress_count = 0;
+	
 	public bool BatchStarted = false;
 	public bool BatchCompleted = false;
 	public bool Aborted;
@@ -206,6 +212,7 @@
 
 				case "--debug":
 					App.DebugMode = true;
+					LOG_DEBUG = true;
 					break;
 
 				case "--shutdown":
@@ -308,7 +315,6 @@
 		init_encoder_list();
 		check_all_encoders();
 		check_and_default_av_encoder();
-		check_and_default_av_player();
 		check_ffmpeg_codec_support();
 
 		//check critical encoders -------------------------
@@ -436,13 +442,13 @@
 		Encoders["x264"] = new Encoder("x264","H.264 / MPEG-4 AVC Video Encoder","H264 Output");
 		Encoders["x265"] = new Encoder("x265","H.265 / MPEG-H HEVC Video Encoder","H265 Output");
 
-		Encoders["ffplay"] = new Encoder("ffplay","FFmpeg's Audio Video Player","Audio-Video Playback");
-		Encoders["avplay"] = new Encoder("avplay","Libav's Audio Video Player","Audio-Video Playback");
+		//Encoders["ffplay"] = new Encoder("ffplay","FFmpeg's Audio Video Player","Audio-Video Playback");
+		//Encoders["avplay"] = new Encoder("avplay","Libav's Audio Video Player","Audio-Video Playback");
 		Encoders["mplayer"] = new Encoder("mplayer","Media Player","Audio-Video Playback");
-		Encoders["mplayer2"] = new Encoder("mplayer2","Media Player","Audio-Video Playback");
-		Encoders["mpv"] = new Encoder("mpv","Media Player","Audio-Video Playback");
-		Encoders["smplayer"] = new Encoder("smplayer","Media Player","Audio-Video Playback");
-		Encoders["vlc"] = new Encoder("vlc","Media Player","Audio-Video Playback");
+		//Encoders["mplayer2"] = new Encoder("mplayer2","Media Player","Audio-Video Playback");
+		//Encoders["mpv"] = new Encoder("mpv","Media Player","Audio-Video Playback");
+		//Encoders["smplayer"] = new Encoder("smplayer","Media Player","Audio-Video Playback");
+		//Encoders["vlc"] = new Encoder("vlc","Media Player","Audio-Video Playback");
 	}
 
 	public void check_all_encoders(){
@@ -514,7 +520,7 @@
 		config.set_string_member("last-script", SelectedScript.Path);
 		config.set_string_member("tile-view", TileView.to_string());
 		config.set_string_member("av-encoder", AVEncoder);
-		config.set_string_member("av-player", AVPlayer);
+		config.set_string_member("list-view-columns", ListViewColumns);
 		
 		if (SelectedScript != null) {
 			config.set_string_member("last-script", SelectedScript.Path);
@@ -571,16 +577,14 @@
 
 		check_and_default_av_encoder();
 
-		AVPlayer = json_get_string(config,"av-player", "ffplay");
-
-		check_and_default_av_player();
-		
 		val = json_get_string(config,"last-script", "");
 		if (val != null && val.length > 0) {
 			SelectedScript = new ScriptFile(val);
 		}
 
 		TileView = json_get_bool(config,"tile-view",true);
+
+		ListViewColumns = json_get_string(config,"list-view-columns", ListViewColumns);
 	}
 
 	public void check_and_default_av_encoder(){
@@ -599,42 +603,6 @@
 		}
 	}
 
-	public void check_and_default_av_player(){
-		if (Encoders.has_key(AVPlayer) && Encoders[AVPlayer].IsAvailable){
-			return;
-		}
-
-		if (Encoders["smplayer"].IsAvailable){
-			AVPlayer = "smplayer";
-			return;
-		}
-		
-		if (Encoders["vlc"].IsAvailable){
-			AVPlayer = "vlc";
-			return;
-		}
-		
-		if (Encoders["mpv"].IsAvailable){
-			AVPlayer = "mpv";
-			return;
-		}
-
-		if (Encoders["mplayer"].IsAvailable){
-			AVPlayer = "mplayer";
-			return;
-		}
-		
-		if (Encoders["ffplay"].IsAvailable){
-			AVPlayer = "ffplay";
-			return;
-		}
-
-		if (Encoders["avplay"].IsAvailable){
-			AVPlayer = "avplay";
-			return;
-		}
-	}
-	
 	public void exit_app(){
 		save_config();
 		Gtk.main_quit();
@@ -1301,14 +1269,14 @@
 			process_set_priority (procID, prio);
 
 			Pid childPid;
-	    foreach (long pid in get_process_children (procID)){
-		    childPid = (Pid) pid;
+			foreach (long pid in get_process_children (procID)){
+				childPid = (Pid) pid;
 
-		    if (BackgroundMode)
-	    		process_set_priority (childPid, prio);
-	    	else
-	    		process_set_priority (childPid, prio);
-	    }
+				if (BackgroundMode)
+					process_set_priority (childPid, prio);
+				else
+					process_set_priority (childPid, prio);
+			}
 		}
 	}
 
@@ -1323,18 +1291,37 @@
 	private string get_preset_commandline (MediaFile mf, Json.Object settings, out Gee.ArrayList<string>? encoderList = null){
 		string s = "";
 
-		//this list is used for returning the list of encoders that is used by the preset
+		//this list is used for returning the list of encoders used by the preset
 		encoderList = new Gee.ArrayList<string>();
 
 		Json.Object general = (Json.Object) settings.get_object_member("general");
 		Json.Object video = (Json.Object) settings.get_object_member("video");
 		Json.Object audio = (Json.Object) settings.get_object_member("audio");
 		//Json.Object subs = (Json.Object) settings.get_object_member("subtitle");
+		
+		//set output file path ----------------
+		
+		string outpath = "";
+		if (OutputDirectory.length == 0){
+      		outpath = mf.Location;
+      	} else{
+	      	outpath = OutputDirectory;
+	    }
 
-		//insert temporary file names ------------
+		string suffix = "";
+		int count = -1;
+		
+		do{
+			count++;
+			suffix = (count == 0) ? "" : " (%d)".printf(count);
+			mf.OutputFilePath = "%s/%s%s%s".printf(outpath, mf.Title, suffix, general.get_string_member("extension"));
+		}
+		while (file_exists(mf.OutputFilePath));
 
+		//insert temporary file names ------------
+		
 		s += "\n";
-		s += "outputFile=\"${outDir}/${title}" + general.get_string_member("extension") + "\"\n";
+		s += "outputFile=\"${outDir}/${title}" + suffix + general.get_string_member("extension") + "\"\n";
 		if (mf.HasVideo && video.get_string_member("codec") != "disable"){
 			s += "tempVideo=\"${tempDir}/video" + general.get_string_member("extension") + "\"\n";
 		}
@@ -1526,15 +1513,6 @@
 
 		s += "\n";
 
-		//set output file path
-		string outpath = "";
-		if (OutputDirectory.length == 0){
-      		outpath = mf.Location;
-      	} else{
-	      	outpath = OutputDirectory;
-	    }
-		mf.OutputFilePath = outpath + "/" + mf.Title + general.get_string_member("extension") ;
-
 		return s;
 	}
 
@@ -2887,402 +2865,6 @@
 	
 }
 
-public class MediaFile : GLib.Object{
-	public string Path;
-	public string Name;
-	public string Title;
-	public string Extension;
-	public string Location;
-
-	public int64 Size = 0;
-	public long Duration = 0; //in milliseconds
-	public string ThumbnailImagePath = "";
-
-	public string SubFile = "";
-	public string SubName = "";
-	public string SubExt = "";
-
-	public string TrackName = "";
-	public string TrackNumber = "";
-	public string Album = "";
-	public string Artist = "";
-	public string Genre = "";
-	public string RecordedDate = "";
-	public string Comment = "";
-
-	public int CropW = 0;
-	public int CropH = 0;
-	public int CropL = 0;
-	public int CropR = 0;
-	public int CropT = 0;
-	public int CropB = 0;
-	public bool AutoCropError = false;
-
-	public FileStatus Status = FileStatus.PENDING;
-	public bool IsValid;
-	public string ProgressText = _("Queued");
-	public int ProgressPercent = 0;
-
-	public string InfoText = "";
-	public string InfoTextFormatted = "";
-	
-	public bool HasAudio = false;
-	public bool HasVideo = false;
-	public bool HasSubs = false;
-	
-	public int SourceWidth = 0;
-	public int SourceHeight = 0;
-	public double SourceFrameRate = 0;
-	public int AudioChannels = 0;
-	
-	public string FileFormat = "";
-	public string VideoFormat = "";
-	public string AudioFormat = "";
-
-	public string TempScriptFile;
-	public string TempDirectory = "";
-	public string LogFile = "";
-	public string OutputFilePath = "";
-	public long OutputFrameCount = 0;
-
-	public static int ThumbnailWidth = 80;
-	public static int ThumbnailHeight= 64;
-			
-	public MediaFile(string filePath, string av_encoder){
-		IsValid = false;
-		if (file_exists (filePath) == false) { return; }
-
-		// set file properties ------------
-
-		File f = File.new_for_path (filePath);
-		File fp = f.get_parent();
-
-		Path = filePath;
-		Name = f.get_basename();
-		Title = Name[0: Name.last_index_of(".",0)];
-		Extension = Name[Name.last_index_of(".",0):Name.length];
-		Location = fp.get_path();
-		//stderr.printf(@"file=$filePath, name=$Name, title=$Title, ext=$Extension, dir=$Location\n");
-
-		FileInfo fi = null;
-
-		try{
-			fi = f.query_info ("%s".printf(FileAttribute.STANDARD_SIZE), FileQueryInfoFlags.NONE, null);
-			Size = fi.get_size();
-		}
-		catch (Error e) {
-			log_error (e.message);
-		}
-
-		// get media information ----------
-
-		query_mediainfo();
-		if (Duration == 0) { return; }
-
-		// search for subtitle files ---------------
-
-		try{
-	        var enumerator = fp.enumerate_children ("%s,%s".printf(FileAttribute.STANDARD_NAME,FileAttribute.STANDARD_TYPE), 0);
-			var fileInfo = enumerator.next_file();
-	        while (fileInfo != null) {
-	            if (fileInfo.get_file_type() == FileType.REGULAR) {
-		            string fname = fileInfo.get_name().down();
-		            if (fname.has_prefix(Title.down()) && (fname.has_suffix (".srt")||fname.has_suffix (".sub")||fname.has_suffix (".ssa")||fname.has_suffix (".ttxt")||fname.has_suffix (".xml")||fname.has_suffix (".lrc")))
-		            {
-			            SubName = fileInfo.get_name();
-			            SubFile = Location + "/" + SubName;
-	                	SubExt = SubFile[SubFile.last_index_of(".",0):SubFile.length].down();
-	                	HasSubs = true;
-	                	//log ("file=%s, name=%s, ext=%s\n".printf(SubFile, SubName, SubExt));
-	                }
-	            }
-	            fileInfo = enumerator.next_file();
-	        }
-        }
-        catch(Error e){
-	        log_error (e.message);
-	    }
-
-
-	    // get thumbnail ---------
-
-	    generate_thumbnail(av_encoder);
-
-		IsValid = true;
-	}
-
-	public void query_mediainfo(){
-		InfoText = get_mediainfo (Path, true);
-
-		if (InfoText == null || InfoText == ""){
-			return;
-		}
-
-		string sectionType = "";
-
-		foreach (string line in InfoText.split ("\n")){
-			if (line == null || line.length == 0) { continue; }
-
-			if (line.contains (":") == false)
-			{
-				if (line.contains ("Audio")){
-					sectionType = "audio";
-					HasAudio = true;
-				}
-				else if (line.contains ("Video")){
-					sectionType = "video";
-					HasVideo = true;
-				}
-				else if (line.contains ("General")){
-					sectionType = "general";
-				}
-				else if (line.contains ("Text")){
-					sectionType = "text";
-					HasSubs = true;
-				}
-			}
-			else{
-				string[] arr = line.split (": ");
-				if (arr.length != 2) { continue; }
-
-				string key = arr[0].strip();
-				string val = arr[1].strip();
-
-				if (sectionType	== "general"){
-					switch (key.down()) {
-						case "duration/string":
-							Duration = 0;
-							foreach(string p in val.split(" ")){
-								string part = p.strip().down();
-								if (part.contains ("h") || part.contains ("hr"))
-									Duration += long.parse(part.replace ("hr","").replace ("h","")) * 60 * 60 * 1000;
-								else if (part.contains ("mn") || part.contains ("min"))
-									Duration += long.parse(part.replace ("min","").replace ("mn","")) * 60 * 1000;
-								else if (part.contains ("ms"))
-									Duration += long.parse(part.replace ("ms",""));
-								else if (part.contains ("s"))
-									Duration += long.parse(part.replace ("s","")) * 1000;
-							}
-							break;
-						case "track":
-							TrackName = val;
-							break;
-						case "track/position":
-							TrackNumber = val;
-							break;
-						case "album":
-							Album = val;
-							break;
-						case "performer":
-							Artist = val;
-							break;
-						case "genre":
-							Genre = val;
-							break;
-						case "recorded_date":
-							RecordedDate = val;
-							break;
-						case "comment":
-							Comment = val;
-							break;
-						case "format":
-							FileFormat = val;
-							break;
-					}
-				}
-				else if (sectionType == "video"){
-					switch (key.down()) {
-						case "width/string":
-							SourceWidth = int.parse(val.split(" ")[0].strip());
-							break;
-						case "height/string":
-							SourceHeight = int.parse(val.split(" ")[0].strip());
-							break;
-						case "framerate/string":
-						case "framerate_original/string":
-							SourceFrameRate = double.parse(val.split(" ")[0].strip());
-							break;
-						case "format":
-							VideoFormat = val;
-							break;
-					}
-				}
-				else if (sectionType == "audio"){
-					switch (key.down()) {
-						case "channel(s)/string":
-							AudioChannels = int.parse(val.split(" ")[0].strip());
-							break;
-						case "format":
-							AudioFormat = val;
-							break;
-					}
-				}
-			}
-		}
-	}
-
-	public void query_mediainfo_formatted(){
-		InfoTextFormatted = get_mediainfo (Path, false);
-	}
-
-	public void prepare (string baseTempDir){
-		TempDirectory = baseTempDir + "/" + timestamp2() + " - " + Name;
-		LogFile = TempDirectory + "/" + "log.txt";
-		TempScriptFile = TempDirectory + "/convert.sh";
-		OutputFilePath = "";
-		create_dir (TempDirectory);
-
-		//initialize output frame count
-		if (HasVideo && Duration > 0 && SourceFrameRate > 1) {
-			OutputFrameCount = (long) ((Duration / 1000.0) * (SourceFrameRate));
-		}
-		else{
-			OutputFrameCount = 0;
-		}
-	}
-
-	public void generate_thumbnail(string av_encoder){
-		if (HasVideo){
-			ThumbnailImagePath = get_temp_file_path() + ".png";
-			string std_out, std_err;
-			execute_command_script_sync("%s -ss 1 -i \"%s\" -y -f image2 -vframes 1 -r 1 -s %dx%d \"%s\"".printf(av_encoder,Path,ThumbnailWidth,ThumbnailHeight,ThumbnailImagePath), out std_out, out std_err);
-		}
-		else{
-			ThumbnailImagePath = "/usr/share/%s/images/%s".printf(AppShortName, "audio.svg");
-		}
-	}
-
-	public bool crop_detect(){
-		if (HasVideo == false) {
-			AutoCropError = true;
-			return false;
-		}
-
-		string params = get_file_crop_params (Path);
-		string[] arr = params.split (":");
-
-		if (arr.length == 4){
-			CropW = int.parse (arr[0]);
-			CropH = int.parse (arr[1]);
-			CropL = int.parse (arr[2]);
-			CropT = int.parse (arr[3]);
-		}
-
-		CropR = SourceWidth - CropW - CropL;
-		CropB = SourceHeight - CropH - CropT;
-
-		if ((CropW == 0) && (CropH == 0)){
-			AutoCropError = true;
-			return false;
-		}
-		else
-			return true;
-	}
-
-	public bool crop_enabled(){
-		if ((CropW == 0)&&(CropH == 0)&&(CropL == 0)&&(CropT == 0))
-			return false;
-		else
-			return true;
-	}
-
-	public void crop_reset(){
-		CropW = 0;
-		CropH = 0;
-		CropL = 0;
-		CropT = 0;
-		CropR = 0;
-		CropB = 0;
-	}
-
-	public string crop_values_info(){
-		if (crop_enabled())
-			return "%i:%i:%i:%i".printf(CropL,CropT,CropR,CropB);
-		else if (AutoCropError)
-			return _("N/A");
-		else
-			return "";
-	}
-
-	public string crop_values_libav(){
-		if (crop_enabled())
-			return "%i:%i:%i:%i".printf(CropW,CropH,CropL,CropT);
-		else
-			return "iw:ih:0:0";
-	}
-
-	public string crop_values_x264(){
-		if (crop_enabled())
-			return "%i,%i,%i,%i".printf(CropL,CropT,CropR,CropB);
-		else
-			return "0,0,0,0";
-	}
-
-	public void preview_output(string av_player){
-		//deprecated
-	}
-
-	public void play_source(string av_player){
-		play_file(Path, av_player);
-	}
-
-	public void play_output(string av_player){
-		play_file(OutputFilePath, av_player);
-	}
-
-	private void play_file(string file_path, string av_player){
-		if (file_exists(file_path)){
-			
-			string output = "";
-			string error = "";
-
-			string cmd = "";
-			switch(av_player){
-				case "avplay":
-				case "ffplay":
-					cmd = "%s -i \"%s\"".printf(av_player, file_path);
-					break;
-				default:
-					cmd = "%s \"%s\"".printf(av_player, file_path);
-					break;
-			}
-		
-			try {
-				Process.spawn_command_line_sync(cmd, out output, out error);
-			}
-			catch(Error e){
-				log_error (e.message);
-			}
-		}
-	}
-	
-}
-
-public class ScriptFile : GLib.Object{
-	public string Path;
-	public string Name;
-	public string Title;
-	public string Extension;
-	public string Folder;
-
-	public ScriptFile(string filePath)
-	{
-		Path = filePath;
-	    Name = GLib.Path.get_basename (filePath);
-	    Folder = GLib.Path.get_dirname (filePath);
-
-	    int index = Name.index_of(".");
-	    if (index != -1){
-			Title = Name[0:Name.last_index_of(".")];
-			Extension = Name[Name.last_index_of("."):Name.length];
-		}
-		else{
-			Title = Name;
-			Extension = "";
-		}
-	}
-}
-
 public class Encoder : GLib.Object{
 	public string Command = "";
 	public string Name = "";
@@ -3356,3 +2938,4 @@
 		return list;
 	}
 }
+

selene_16.2.1~226~ubuntu16.04.1.tar.xz/src/MainWindow.vala -> selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/MainWindow.vala Changed

@@ -45,12 +45,13 @@
     private ToolButton btnAbout;
     private ToolButton btnDonate;
     private ToolButton btnOpenOutputFolder;
+    private ToolButton btnCrop;
     private ToolButton btnStart;
     private ToolButton btnStop;
     private ToolButton btnFinish;
     private ToolButton btnPause;
     private ToggleToolButton btnShutdown;
-    private ToggleToolButton btnBackground;
+    private ToolButton btnBackground;
     private SeparatorToolItem separator1;
     private SeparatorToolItem separator2;
 
@@ -77,7 +78,6 @@
 	private ImageMenuItem miFileSkip;
 	private Gtk.MenuItem miFileCropAuto;
 	private Gtk.MenuItem miFileRemove;
-	private Gtk.MenuItem miFilePreview;
 	private Gtk.MenuItem miFilePlaySource;
 	private Gtk.MenuItem miFilePlayOutput;
 	private Gtk.MenuItem miFileSeparator1;
@@ -85,14 +85,36 @@
 	private Gtk.MenuItem miFileOpenTemp;
 	private Gtk.MenuItem miFileOpenOutput;
 	private Gtk.MenuItem miFileOpenLogFile;
+	private Gtk.MenuItem miListViewColumns;
+	
 	private TreeViewColumn colName;
 	private TreeViewColumn colSize;
 	private TreeViewColumn colDuration;
-	private TreeViewColumn colCrop;
+	//private TreeViewColumn colCrop;
 	private TreeViewColumn colProgress;
 	private TreeViewColumn colSpacer;
+	private TreeViewColumn colFileFormat;
+	private TreeViewColumn colAFormat;
+	private TreeViewColumn colAChannels;
+	private TreeViewColumn colARate;
+	private TreeViewColumn colBitrate;
+	private TreeViewColumn colABitrate;
+	private TreeViewColumn colVBitrate;
+	private TreeViewColumn colVFormat;
+	private TreeViewColumn colVWidth;
+	private TreeViewColumn colVHeight;
+	private TreeViewColumn colVFps;
+	private TreeViewColumn colArtist;
+	private TreeViewColumn colAlbum;
+	private TreeViewColumn colGenre;
+	private TreeViewColumn colTrackName;
+	private TreeViewColumn colTrackNum;
+	private TreeViewColumn colComments;
+	private TreeViewColumn colRecordedDate;
 	private Grid gridConfig;
 
+	private Gee.HashMap<TreeViewColumn,TreeViewListColumn> col_list;
+
 	private Regex regexGeneric;
 	private Regex regexMkvMerge;
 	private Regex regexFFmpeg;
@@ -121,7 +143,7 @@
 		set_window_title();
         window_position = WindowPosition.CENTER;
         destroy.connect (Gtk.main_quit);
-        set_default_size (550, 20);
+        set_default_size (650, 20);
         icon = get_app_icon(16);
 
 		Gtk.drag_dest_set (this,Gtk.DestDefaults.ALL, targets, Gdk.DragAction.COPY);
@@ -153,7 +175,9 @@
 		init_regular_expressions();
 	}
 
-	public void init_ui_main_toolbar(){
+	// toolbar -------------------------------------
+
+	private void init_ui_main_toolbar(){
 		//toolbar
 		toolbar = new Gtk.Toolbar();
 		toolbar.toolbar_style = ToolbarStyle.BOTH_HORIZ;
@@ -192,6 +216,14 @@
 		separator1 = new Gtk.SeparatorToolItem();
 		toolbar.add(separator1);
 
+		//btnCrop
+		btnCrop = new Gtk.ToolButton.from_stock ("gtk-edit");
+		btnCrop.is_important = true;
+		btnCrop.label = _("Crop");
+		btnCrop.clicked.connect (crop_videos);
+		btnCrop.set_tooltip_text (_("Crop Videos"));
+		toolbar.add (btnCrop);
+		
 		//btnStart
 		btnStart = new Gtk.ToolButton.from_stock ("gtk-media-play");
 		btnStart.is_important = true;
@@ -218,6 +250,16 @@
 		btnStop.no_show_all = true;
 		toolbar.add (btnStop);
 
+		//btnBackground
+        btnBackground = new Gtk.ToolButton.from_stock ("gtk-execute");
+        btnBackground.label = _("Background");
+        btnBackground.visible = false;
+        btnBackground.no_show_all = true;
+        btnBackground.is_important = true;
+        btnBackground.clicked.connect (btnBackground_clicked);
+        btnBackground.set_tooltip_text (_("Run in background with lower priority"));
+        toolbar.add (btnBackground);
+
 		//btnFinish
 		btnFinish = new Gtk.ToolButton.from_stock ("gtk-ok");
 		btnFinish.is_important = true;
@@ -274,16 +316,6 @@
 		btnShutdown.set_tooltip_text (_("Shutdown system after completion"));
 		toolbar.add (btnShutdown);
 
-		//btnBackground
-        btnBackground = new Gtk.ToggleToolButton.from_stock ("gtk-sort-ascending");
-        btnBackground.label = _("Background");
-        btnBackground.visible = false;
-        btnBackground.no_show_all = true;
-        btnBackground.is_important = true;
-        btnBackground.clicked.connect (btnBackground_clicked);
-        btnBackground.set_tooltip_text (_("Run processes with lower priority"));
-        toolbar.add (btnBackground);
-
         //btnOpenOutputFolder
 		btnOpenOutputFolder = new Gtk.ToolButton.from_stock ("gtk-directory");
 		//btnOpenOutputFolder.is_important = true;
@@ -295,13 +327,13 @@
 		toolbar.add (btnOpenOutputFolder);
 	}
 
-	public void init_ui_main_toolbar_add(){
+	private void init_ui_main_toolbar_add(){
 		// menuAdd
 		menuAddFiles = new Gtk.Menu();
 
 		// miAddFile
 		var miAddFile = new Gtk.MenuItem();
-		miAddFile.activate.connect (() => { btnAddItems_clicked(true); });
+		miAddFile.activate.connect (() => { select_items(true); });
 		menuAddFiles.append(miAddFile);
 
 		var box = new Gtk.Box(Orientation.HORIZONTAL,6);
@@ -311,7 +343,7 @@
 		
 		// miAddFolder
 		var miAddFolder = new Gtk.MenuItem();
-		miAddFolder.activate.connect (() => { btnAddItems_clicked(false); });
+		miAddFolder.activate.connect (() => { select_items(false); });
 		menuAddFiles.append(miAddFolder);
 
 		box = new Gtk.Box(Orientation.HORIZONTAL,6);
@@ -328,13 +360,13 @@
 
 		btnAddFiles.clicked.connect(()=>{
 			//menuAddFiles.popup (null, null, null, 0, Gtk.get_current_event_time());
-			btnAddItems_clicked(true);
+			select_items(true);
 		});
 
 		menuAddFiles.show_all();
 	}
 
-	public void init_ui_main_toolbar_remove(){
+	private void init_ui_main_toolbar_remove(){
 		// menuRemove
 		menuRemoveFiles = new Gtk.Menu();
 
@@ -375,37 +407,45 @@
 		
 		menuRemoveFiles.show_all();
 	}
-	
-	public void init_list_view(){
+
+	// file list -------------------------------------
+
+	private void init_list_view(){
 		//tvFiles
 		tvFiles = new TreeView();
 		tvFiles.get_selection().mode = SelectionMode.MULTIPLE;
 		tvFiles.set_tooltip_text (_("Right-click for more options"));
-		tvFiles.set_rules_hint (true);
-
+		tvFiles.headers_clickable = true;
+		tvFiles.rules_hint = true;
+		
 		swFiles = new ScrolledWindow(tvFiles.get_hadjustment(), tvFiles.get_vadjustment());
 		swFiles.set_shadow_type (ShadowType.ETCHED_IN);
 		swFiles.add (tvFiles);
 		//swFiles.margin = 6;
-		swFiles.set_size_request (-1, 250);
-
+		swFiles.set_size_request (-1, 300);
 		vboxMain.pack_start (swFiles, true, true, 0);
-
+	
+		CellRendererText cellText;
+		
 		//colName
 		colName = new TreeViewColumn();
 		colName.title = _("File");
 		colName.expand = true;
 		colName.resizable = true;
+		colName.clickable = true;
+		colName.reorderable = true;
+		colName.min_width = 200;
+		colName.sort_column_id = InputField.FILE_PATH;
 		
 		CellRendererPixbuf cellThumb = new CellRendererPixbuf ();
 		colName.pack_start (cellThumb, false);
 
-		CellRendererText cellSpacer = new CellRendererText();
-		colName.pack_start (cellSpacer, false);
+		cellText = new CellRendererText();
+		colName.pack_start (cellText, false);
 
-		CellRendererText cellName = new CellRendererText();
-		cellName.ellipsize = Pango.EllipsizeMode.END;
-		colName.pack_start (cellName, false);
+		cellText = new CellRendererText();
+		cellText.ellipsize = Pango.EllipsizeMode.END;
+		colName.pack_start (cellText, false);
 
 		colName.set_cell_data_func (cellThumb, (cell_layout, cell, model, iter)=>{
 			string imagePath;
@@ -436,8 +476,9 @@
 			(cell as Gtk.CellRendererPixbuf).pixbuf = pixThumb;
 		});
 
-		colName.set_cell_data_func (cellName, (cell_layout, cell, model, iter)=>{
-			string fileName, fileSize, duration, formatInfo, spanStart, spanEnd;
+		colName.set_cell_data_func (cellText, (cell_layout, cell, model, iter)=>{
+			string fileName, duration, formatInfo, spanStart, spanEnd;
+			int64 fileSize;
 			MediaFile mf;
 			model.get (iter, InputField.FILE_REF, out mf, -1);
 			model.get (iter, InputField.FILE_NAME, out fileName, -1);
@@ -453,7 +494,7 @@
 				+ ((mf.AudioFormat.length > 0) ? (" - " + mf.AudioFormat) : "");
 
 			if (App.TileView){
-				(cell as Gtk.CellRendererText).markup = "%s\n%s%s | %s\n%s%s".printf(fileName, spanStart, duration, fileSize, formatInfo, spanEnd);
+				(cell as Gtk.CellRendererText).markup = "%s\n%s%s | %s\n%s%s".printf(fileName, spanStart, duration, format_file_size(fileSize), formatInfo, spanEnd);
 			}
 			else{
 				(cell as Gtk.CellRendererText).text = fileName;
@@ -461,55 +502,360 @@
 		});
 
 		tvFiles.append_column(colName);
-
+		
 		//colSize
 		colSize = new TreeViewColumn();
 		colSize.title = _("Size");
-		CellRendererText cellSize = new CellRendererText();
-		colSize.pack_start (cellSize, false);
-		colSize.set_attributes(cellSize, "text", InputField.FILE_SIZE);
+		colSize.clickable = true;
+		colSize.reorderable = true;
+		colSize.sort_column_id = InputField.FILE_SIZE;
 		tvFiles.append_column(colSize);
-
+		
+		cellText = new CellRendererText();
+		cellText.xalign = (float) 1.0;
+		colSize.pack_start (cellText, false);
+		//colSize.set_attributes(cellText, "text", InputField.FILE_SIZE);
+		colSize.set_cell_data_func (cellText, (cell_layout, cell, model, iter)=>{
+			int64 val;
+			model.get (iter, InputField.FILE_SIZE, out val, -1);
+			(cell as Gtk.CellRendererText).text = format_file_size(val);
+		});
+		
 		//colDuration
 		colDuration = new TreeViewColumn();
 		colDuration.title = _("Duration");
-		CellRendererText cellDuration = new CellRendererText();
-		colDuration.pack_start (cellDuration, false);
-		colDuration.set_attributes(cellDuration, "text", InputField.FILE_DURATION);
+		colDuration.clickable = true;
+		colDuration.reorderable = true;
+		colDuration.sort_column_id = InputField.FILE_DURATION;
 		tvFiles.append_column(colDuration);
+		
+		cellText = new CellRendererText();
+		colDuration.pack_start (cellText, false);
+		colDuration.set_attributes(cellText, "text", InputField.FILE_DURATION);
+
+		//colFileFormat
+		colFileFormat = new TreeViewColumn();
+		colFileFormat.title = _("Format");
+		colFileFormat.clickable = true;
+		colFileFormat.reorderable = true;
+		colFileFormat.sort_column_id = InputField.FILE_FFORMAT;
+		tvFiles.append_column(colFileFormat);
+		
+		cellText = new CellRendererText();
+		colFileFormat.pack_start (cellText, false);
+		colFileFormat.set_attributes(cellText, "text", InputField.FILE_FFORMAT);
+		
+		//colAFormat
+		colAFormat = new TreeViewColumn();
+		colAFormat.title = _("A-Fmt");
+		colAFormat.clickable = true;
+		colAFormat.reorderable = true;
+		colAFormat.sort_column_id = InputField.FILE_AFORMAT;
+		tvFiles.append_column(colAFormat);
+		
+		cellText = new CellRendererText();
+		colAFormat.pack_start (cellText, false);
+		colAFormat.set_attributes(cellText, "text", InputField.FILE_AFORMAT);
+		
+		//colVFormat
+		colVFormat = new TreeViewColumn();
+		colVFormat.title = _("V-Fmt");
+		colVFormat.clickable = true;
+		colVFormat.reorderable = true;
+		colVFormat.sort_column_id = InputField.FILE_VFORMAT;
+		tvFiles.append_column(colVFormat);
+		
+		cellText = new CellRendererText();
+		colVFormat.pack_start (cellText, false);
+		colVFormat.set_attributes(cellText, "text", InputField.FILE_VFORMAT);
+		
+		//colAChannels
+		colAChannels = new TreeViewColumn();
+		colAChannels.title = _("A-Ch");
+		colAChannels.clickable = true;
+		colAChannels.reorderable = true;
+		colAChannels.sort_column_id = InputField.FILE_ACHANNELS;
+		tvFiles.append_column(colAChannels);
+		
+		cellText = new CellRendererText();
+		cellText.xalign = (float) 1.0;
+		colAChannels.pack_start (cellText, false);
+		//colAChannels.set_attributes(cellText, "text", InputField.FILE_ACHANNELS);
+		colAChannels.set_cell_data_func (cellText, (cell_layout, cell, model, iter)=>{
+			MediaFile mf;
+			int val;
+			model.get (iter, InputField.FILE_REF, out mf, InputField.FILE_ACHANNELS, out val, -1);
+			(cell as Gtk.CellRendererText).text = mf.HasAudio ? "%d".printf(val) : "";
+		});
+		
+		//colARate
+		colARate = new TreeViewColumn();
+		colARate.title = _("A-Sampling");
+		colARate.clickable = true;
+		colARate.reorderable = true;
+		colARate.sort_column_id = InputField.FILE_ARATE;
+		tvFiles.append_column(colARate);
+		
+		cellText = new CellRendererText();
+		cellText.xalign = (float) 1.0;
+		colARate.pack_start (cellText, false);
+		colARate.set_cell_data_func (cellText, (cell_layout, cell, model, iter)=>{
+			MediaFile mf;
+			int val;
+			model.get (iter, InputField.FILE_REF, out mf, InputField.FILE_ARATE, out val, -1);
+			(cell as Gtk.CellRendererText).text = mf.HasAudio ? "%d Hz".printf(val) : "";
+		});
 
+		//colBitrate
+		colBitrate = new TreeViewColumn();
+		colBitrate.title = _("Bitrate");
+		colBitrate.clickable = true;
+		colBitrate.reorderable = true;
+		colBitrate.sort_column_id = InputField.FILE_BITRATE;
+		tvFiles.append_column(colBitrate);
+		
+		cellText = new CellRendererText();
+		cellText.xalign = (float) 1.0;
+		colBitrate.pack_start (cellText, false);
+		colBitrate.set_cell_data_func (cellText, (cell_layout, cell, model, iter)=>{
+			MediaFile mf;
+			int val;
+			model.get (iter, InputField.FILE_REF, out mf, InputField.FILE_BITRATE, out val, -1);
+			(cell as Gtk.CellRendererText).text = mf.HasAudio ? "%d kb/s".printf(val) : "";
+		});
+		
+		//colABitrate
+		colABitrate = new TreeViewColumn();
+		colABitrate.title = _("A-Bitrate");
+		colABitrate.clickable = true;
+		colABitrate.reorderable = true;
+		colABitrate.sort_column_id = InputField.FILE_ABITRATE;
+		tvFiles.append_column(colABitrate);
+		
+		cellText = new CellRendererText();
+		cellText.xalign = (float) 1.0;
+		colABitrate.pack_start (cellText, false);
+		colABitrate.set_cell_data_func (cellText, (cell_layout, cell, model, iter)=>{
+			MediaFile mf;
+			int val;
+			model.get (iter, InputField.FILE_REF, out mf, InputField.FILE_ABITRATE, out val, -1);
+			(cell as Gtk.CellRendererText).text = mf.HasAudio ? "%d kb/s".printf(val) : "";
+		});
+
+/*
+		//colVFrameSize
+		colVFrameSize = new TreeViewColumn();
+		colVFrameSize.title = _("Video Size");
+		tvFiles.append_column(colVFrameSize);
+		
+		cellText = new CellRendererText();
+		colVFrameSize.pack_start (cellText, false);
+		colAFormat.set_cell_data_func (cellText, (cell_layout, cell, model, iter) => {
+			MediaFile mf;
+			model.get (iter, InputField.FILE_REF, out mf, -1);
+			(cell as Gtk.CellRendererText).text = ((mf.SourceWidth > 0) && (mf.SourceHeight > 0)) ? "%dx%d".printf(mf.SourceWidth,mf.SourceHeight) : "";
+		});
+*/
+
+		//colVBitrate
+		colVBitrate = new TreeViewColumn();
+		colVBitrate.title = _("V-Bitrate");
+		colVBitrate.clickable = true;
+		colVBitrate.reorderable = true;
+		colVBitrate.sort_column_id = InputField.FILE_VBITRATE;
+		tvFiles.append_column(colVBitrate);
+		
+		cellText = new CellRendererText();
+		cellText.xalign = (float) 1.0;
+		colVBitrate.pack_start (cellText, false);
+		colVBitrate.set_cell_data_func (cellText, (cell_layout, cell, model, iter)=>{
+			MediaFile mf;
+			int val;
+			model.get (iter, InputField.FILE_REF, out mf, InputField.FILE_VBITRATE, out val, -1);
+			(cell as Gtk.CellRendererText).text = mf.HasVideo ? "%d kb/s".printf(val) : "";
+		});
+		
+		//colVWidth
+		colVWidth = new TreeViewColumn();
+		colVWidth.title = _("V-Width");
+		colVWidth.clickable = true;
+		colVWidth.reorderable = true;
+		colVWidth.sort_column_id = InputField.FILE_VWIDTH;
+		tvFiles.append_column(colVWidth);
+		
+		cellText = new CellRendererText();
+		cellText.xalign = (float) 1.0;
+		colVWidth.pack_start (cellText, false);
+		//colVWidth.set_attributes(cellText, "text", InputField.FILE_VWIDTH);
+		colVWidth.set_cell_data_func (cellText, (cell_layout, cell, model, iter)=>{
+			MediaFile mf;
+			int val;
+			model.get (iter, InputField.FILE_REF, out mf, InputField.FILE_VWIDTH, out val, -1);
+			(cell as Gtk.CellRendererText).text = mf.HasVideo ? "%d px".printf(val) : "";
+		});
+		
+		//colVHeight
+		colVHeight = new TreeViewColumn();
+		colVHeight.title = _("V-Height");
+		colVHeight.clickable = true;
+		colVHeight.reorderable = true;
+		colVHeight.sort_column_id = InputField.FILE_VHEIGHT;
+		tvFiles.append_column(colVHeight);
+		
+		cellText = new CellRendererText();
+		cellText.xalign = (float) 1.0;
+		colVHeight.pack_start (cellText, false);
+		//colVHeight.set_attributes(cellText, "text", InputField.FILE_VHEIGHT);
+		colVHeight.set_cell_data_func (cellText, (cell_layout, cell, model, iter)=>{
+			MediaFile mf;
+			int val;
+			model.get (iter, InputField.FILE_REF, out mf, InputField.FILE_VHEIGHT, out val, -1);
+			(cell as Gtk.CellRendererText).text = mf.HasVideo ? "%d px".printf(val) : "";
+		});
+		
+		//colVFps
+		colVFps = new TreeViewColumn();
+		colVFps.title = _("V-Fps");
+		colVFps.clickable = true;
+		colVFps.reorderable = true;
+		colVFps.sort_column_id = InputField.FILE_VRATE;
+		tvFiles.append_column(colVFps);
+		
+		cellText = new CellRendererText();
+		cellText.xalign = (float) 1.0;
+		colVFps.pack_start (cellText, false);
+		//colVFps.set_attributes(cellText, "text", InputField.FILE_VRATE);
+		colVFps.set_cell_data_func (cellText, (cell_layout, cell, model, iter)=>{
+			MediaFile mf;
+			double val;
+			model.get (iter, InputField.FILE_REF, out mf, InputField.FILE_VRATE, out val, -1);
+			(cell as Gtk.CellRendererText).text = mf.HasVideo ? "%.3f".printf(val) : "";
+		});
+
+		//colArtist
+		colArtist = new TreeViewColumn();
+		colArtist.title = _("Artist");
+		colArtist.clickable = true;
+		colArtist.reorderable = true;
+		colArtist.sort_column_id = InputField.FILE_ARTIST;
+		tvFiles.append_column(colArtist);
+		
+		cellText = new CellRendererText();
+		colArtist.pack_start (cellText, false);
+		colArtist.set_attributes(cellText, "text", InputField.FILE_ARTIST);
+
+		//colAlbum
+		colAlbum = new TreeViewColumn();
+		colAlbum.title = _("Album");
+		colAlbum.clickable = true;
+		colAlbum.reorderable = true;
+		colAlbum.sort_column_id = InputField.FILE_ALBUM;
+		tvFiles.append_column(colAlbum);
+		
+		cellText = new CellRendererText();
+		colAlbum.pack_start (cellText, false);
+		colAlbum.set_attributes(cellText, "text", InputField.FILE_ALBUM);
+
+		//colGenre
+		colGenre = new TreeViewColumn();
+		colGenre.title = _("Genre");
+		colGenre.clickable = true;
+		colGenre.reorderable = true;
+		colGenre.sort_column_id = InputField.FILE_GENRE;
+		tvFiles.append_column(colGenre);
+		
+		cellText = new CellRendererText();
+		colGenre.pack_start (cellText, false);
+		colGenre.set_attributes(cellText, "text", InputField.FILE_GENRE);
+
+		//colTrackName
+		colTrackName = new TreeViewColumn();
+		colTrackName.title = _("Title");
+		colTrackName.clickable = true;
+		colTrackName.reorderable = true;
+		colTrackName.sort_column_id = InputField.FILE_TRACK_NAME;
+		tvFiles.append_column(colTrackName);
+		
+		cellText = new CellRendererText();
+		colTrackName.pack_start (cellText, false);
+		colTrackName.set_attributes(cellText, "text", InputField.FILE_TRACK_NAME);
+
+		//colTrackNum
+		colTrackNum = new TreeViewColumn();
+		colTrackNum.title = _("Track #");
+		colTrackNum.clickable = true;
+		colTrackNum.reorderable = true;
+		colTrackNum.sort_column_id = InputField.FILE_TRACK_NUM;
+		tvFiles.append_column(colTrackNum);
+		
+		cellText = new CellRendererText();
+		cellText.xalign = (float) 1.0;
+		colTrackNum.pack_start (cellText, false);
+		colTrackNum.set_attributes(cellText, "text", InputField.FILE_TRACK_NUM);
+
+		//colComments
+		colComments = new TreeViewColumn();
+		colComments.title = _("Comments");
+		colComments.clickable = true;
+		colComments.reorderable = true;
+		colComments.sort_column_id = InputField.FILE_COMMENTS;
+		tvFiles.append_column(colComments);
+		
+		cellText = new CellRendererText();
+		colComments.pack_start (cellText, false);
+		colComments.set_attributes(cellText, "text", InputField.FILE_COMMENTS);
+
+		//colRecordedDate
+		colRecordedDate = new TreeViewColumn();
+		colRecordedDate.title = _("Recorded Date");
+		colRecordedDate.clickable = true;
+		colRecordedDate.reorderable = true;
+		colRecordedDate.sort_column_id = InputField.FILE_RECORDED_DATE;
+		tvFiles.append_column(colRecordedDate);
+		
+		cellText = new CellRendererText();
+		cellText.xalign = (float) 1.0;
+		colRecordedDate.pack_start (cellText, false);
+		colRecordedDate.set_attributes(cellText, "text", InputField.FILE_RECORDED_DATE);
+		
+		/*
 		//colCrop
 		colCrop = new TreeViewColumn();
 		colCrop.title = _("CropVideo (L:T:R:B)");
 		colCrop.fixed_width = 100;
-		CellRendererText cellCrop = new CellRendererText();
-		cellCrop.editable = true;
-		cellCrop.edited.connect (tvFiles_crop_cell_edited);
-		colCrop.pack_start (cellCrop, false);
-		colCrop.set_attributes(cellCrop, "text", InputField.FILE_CROPVAL);
-		tvFiles.append_column(colCrop);
-
+		//tvFiles.append_column(colCrop);
+		
+		cellText = new CellRendererText();
+		cellText.editable = true;
+		cellText.edited.connect (tvFiles_crop_cell_edited);
+		colCrop.pack_start (cellText, false);
+		colCrop.set_attributes(cellText, "text", InputField.FILE_CROPVAL);
+		*/
+		
 		//colProgress
 		colProgress = new TreeViewColumn();
 		colProgress.title = _("Status");
 		colProgress.fixed_width = 150;
+		tvFiles.append_column(colProgress);
+		
 		CellRendererProgress2 cellProgress = new CellRendererProgress2();
 		cellProgress.height = 15;
 		cellProgress.width = 150;
 		colProgress.pack_start (cellProgress, false);
 		colProgress.set_attributes(cellProgress, "value", InputField.FILE_PROGRESS, "text", InputField.FILE_PROGRESS_TEXT);
-		tvFiles.append_column(colProgress);
-
+		
 		//colSpacer
 		colSpacer = new TreeViewColumn();
 		colSpacer.expand = false;
 		colSpacer.fixed_width = 10;
-		cellSpacer = new CellRendererText();
-		colSpacer.pack_start (cellSpacer, false);
 		tvFiles.append_column(colSpacer);
+		
+		cellText = new CellRendererText();
+		colSpacer.pack_start (cellText, false);
 
-		startupTimer = Timeout.add (100,() =>
-		{
+		tvFiles_init_columns();
+
+		startupTimer = Timeout.add (100,() => {
 			colProgress.visible = false;
 			Source.remove (startupTimer);
 			return true;
@@ -519,7 +865,7 @@
         tvFiles.drag_data_received.connect(on_drag_data_received);
 	}
 
-	public void init_list_view_context_menu(){
+	private void init_list_view_context_menu(){
 		Gdk.RGBA gray = Gdk.RGBA();
 		gray.parse ("rgba(200,200,200,1)");
 
@@ -533,15 +879,23 @@
 		menuFile.append(miFileSkip);
 
 		// miFileCropAuto
-		miFileCropAuto = new Gtk.MenuItem.with_label (_("AutoCrop Video"));
+		miFileCropAuto = new Gtk.MenuItem.with_label (_("Crop Video..."));
 		miFileCropAuto.activate.connect(miFileCropAuto_clicked);
 		menuFile.append(miFileCropAuto);
 
-		// miFilePreview
-		miFilePreview = new Gtk.MenuItem.with_label (_("Preview File"));
-		miFilePreview.activate.connect(miFilePreview_clicked);
-		menuFile.append(miFilePreview);
+		// miFileSeparator0
+		var miFileSeparator0 = new Gtk.MenuItem();
+		miFileSeparator0.override_color (StateFlags.NORMAL, gray);
+		menuFile.append(miFileSeparator0);
+		
+		miFileCropAuto.show.connect(()=>{
+			miFileSeparator0.visible = miFileCropAuto.visible;
+		});
 
+		miFileCropAuto.hide.connect(()=>{
+			miFileSeparator0.visible = miFileCropAuto.visible;
+		});
+		
 		// miFileRemove
 		miFileRemove = new ImageMenuItem.from_stock("gtk-remove", null);
 		miFileRemove.activate.connect(miFileRemove_clicked);
@@ -599,53 +953,166 @@
 		miFileInfoOutput.activate.connect(miFileInfoOutput_clicked);
 		menuFile.append(miFileInfoOutput);
 
+		// miFileSeparator3
+		var miFileSeparator3 = new Gtk.MenuItem();
+		miFileSeparator3.override_color (StateFlags.NORMAL, gray);
+		menuFile.append(miFileSeparator3);
+		
+		// miListViewColumns
+		miListViewColumns = new ImageMenuItem.from_stock("gtk-select", null);
+		miListViewColumns.label = _("Columns...");
+		menuFile.append(miListViewColumns);
+		miListViewColumns.activate.connect(()=>{
+			var dlg = new ColumnSelectionDialog.with_parent(this, col_list);
+			dlg.run();
+			//dlg.close();
+			//dlg.destroy();
+			tvFiles_load_columns();
+		});
+
+		miListViewColumns.show.connect(()=>{
+			miFileSeparator3.visible = miListViewColumns.visible;
+		});
+
+		miListViewColumns.hide.connect(()=>{
+			miFileSeparator3.visible = miListViewColumns.visible;
+		});
+		
 		menuFile.show_all();
 
 		//connect signal for shift+F10
         tvFiles.popup_menu.connect(() => { return menuFile_popup (menuFile, null); });
         //connect signal for right-click
 		tvFiles.button_press_event.connect ((w, event) => {
-				if (event.button == 3) {
-					return menuFile_popup (menuFile, event);
-				}
+			if (event.button == 3) {
+				return menuFile_popup (menuFile, event);
+			}
 
-				return false;
-			});
+			return false;
+		});
 	}
 
 	private void refresh_list_view (bool refresh_model = true){
 		if (refresh_model){
-			Gtk.ListStore inputStore = new Gtk.ListStore (11, typeof(MediaFile), typeof (string), typeof (string), typeof (string), typeof (string), typeof (string), typeof (string), typeof (int), typeof (string), typeof (string), typeof (bool));
+			Gtk.ListStore inputStore = new Gtk.ListStore (29,  
+				typeof(MediaFile), 	//FILE_REF
+				typeof(string), 	//FILE_PATH
+				typeof(string), 	//FILE_NAME
+				typeof(int64), 		//FILE_SIZE
+				typeof(string),		//FILE_DURATION
+				typeof(string),		//FILE_STATUS
+				typeof(string),		//FILE_CROPVAL
+				typeof(int), 		//FILE_PROGRESS
+				typeof(string), 	//FILE_PROGRESS_TEXT
+				typeof(string), 	//FILE_THUMB
+				typeof(bool), 		//FILE_HAS_VIDEO
+				typeof(string), 	//FILE_FFORMAT
+				typeof(string), 	//FILE_AFORMAT
+				typeof(string), 	//FILE_VFORMAT
+				typeof(int), 		//FILE_ACHANNELS
+				typeof(int), 		//FILE_ARATE
+				typeof(int), 		//FILE_ABITRATE
+				typeof(int), 		//FILE_VWIDTH
+				typeof(int), 		//FILE_VHEIGHT
+				typeof(double),		//FILE_VRATE
+				typeof(int), 		//FILE_VBITRATE
+				typeof(int), 		//FILE_BITRATE
+				typeof(string),		//FILE_ARTIST
+				typeof(string),		//FILE_ALBUM
+				typeof(string),		//FILE_GENRE
+				typeof(string),		//FILE_TRACK_NAME
+				typeof(string),		//FILE_TRACK_NUM
+				typeof(string),		//FILE_COMMENTS
+				typeof(string)		//FILE_RECORDED_DATE
+				);
 
 			TreeIter iter;
 			foreach(MediaFile mFile in App.InputFiles) {
 				inputStore.append (out iter);
-				inputStore.set (iter, InputField.FILE_REF, mFile);
-				inputStore.set (iter, InputField.FILE_PATH, mFile.Path);
-				inputStore.set (iter, InputField.FILE_NAME, mFile.Name);
-				inputStore.set (iter, InputField.FILE_SIZE, format_file_size(mFile.Size));
-				inputStore.set (iter, InputField.FILE_DURATION, format_duration(mFile.Duration));
-				inputStore.set (iter, InputField.FILE_STATUS, "gtk-media-pause");
-				inputStore.set (iter, InputField.FILE_CROPVAL, mFile.crop_values_info());
-				inputStore.set (iter, InputField.FILE_PROGRESS, mFile.ProgressPercent);
+				inputStore.set (iter, InputField.FILE_REF, 			mFile);
+				inputStore.set (iter, InputField.FILE_PATH, 		mFile.Path);
+				inputStore.set (iter, InputField.FILE_NAME, 		mFile.Name);
+				inputStore.set (iter, InputField.FILE_SIZE, 		mFile.Size);
+				inputStore.set (iter, InputField.FILE_DURATION, 	format_duration(mFile.Duration));
+				inputStore.set (iter, InputField.FILE_STATUS, 		"gtk-media-pause");
+				inputStore.set (iter, InputField.FILE_CROPVAL, 		mFile.crop_values_info());
+				inputStore.set (iter, InputField.FILE_PROGRESS, 	mFile.ProgressPercent);
 				inputStore.set (iter, InputField.FILE_PROGRESS_TEXT, mFile.ProgressText);
-				inputStore.set (iter, InputField.FILE_THUMB, mFile.ThumbnailImagePath);
-				inputStore.set (iter, InputField.FILE_HAS_VIDEO, mFile.HasVideo);
+				inputStore.set (iter, InputField.FILE_THUMB, 		mFile.ThumbnailImagePath);
+				inputStore.set (iter, InputField.FILE_HAS_VIDEO, 	mFile.HasVideo);
+				inputStore.set (iter, InputField.FILE_FFORMAT, 		mFile.FileFormat);
+				inputStore.set (iter, InputField.FILE_AFORMAT, 		mFile.AudioFormat);
+				inputStore.set (iter, InputField.FILE_VFORMAT, 		mFile.VideoFormat);
+				inputStore.set (iter, InputField.FILE_ACHANNELS, 	mFile.AudioChannels);
+				inputStore.set (iter, InputField.FILE_ARATE, 		mFile.AudioSampleRate);
+				inputStore.set (iter, InputField.FILE_ABITRATE, 	mFile.AudioBitRate);
+				inputStore.set (iter, InputField.FILE_VWIDTH, 		mFile.SourceWidth);
+				inputStore.set (iter, InputField.FILE_VHEIGHT, 		mFile.SourceHeight);
+				inputStore.set (iter, InputField.FILE_VRATE, 		mFile.SourceFrameRate);
+				inputStore.set (iter, InputField.FILE_VBITRATE, 	mFile.VideoBitRate);
+				inputStore.set (iter, InputField.FILE_BITRATE, 		mFile.BitRate);
+				inputStore.set (iter, InputField.FILE_ARTIST, 		mFile.Artist);
+				inputStore.set (iter, InputField.FILE_ALBUM, 		mFile.Album);
+				inputStore.set (iter, InputField.FILE_GENRE, 		mFile.Genre);
+				inputStore.set (iter, InputField.FILE_TRACK_NAME, 	mFile.TrackName);
+				inputStore.set (iter, InputField.FILE_TRACK_NUM, 	mFile.TrackNumber);
+				inputStore.set (iter, InputField.FILE_COMMENTS, 	mFile.Comment);
+				inputStore.set (iter, InputField.FILE_RECORDED_DATE, 	mFile.RecordedDate);
 			}
 
 			tvFiles.set_model (inputStore);
 		}
 
+		//set visibility - columns
+		foreach(TreeViewListColumn col in col_list.values){
+			if (col.Selected){
+				col.Ref.visible = !App.TileView;
+			}
+		}
 		colSize.visible = !App.TileView;
 		colDuration.visible = !App.TileView;
-		colCrop.visible = !App.TileView;
+		
+		//set visibility - column header
 		tvFiles.headers_visible = !App.TileView;
 
 		tvFiles.columns_autosize();
 	}
 
-
-	public void init_preset_toolbar(){
+	private enum InputField{
+		FILE_REF,
+		FILE_PATH,
+		FILE_NAME,
+		FILE_SIZE,
+		FILE_DURATION,
+		FILE_STATUS,
+		FILE_CROPVAL,
+		FILE_PROGRESS,
+		FILE_PROGRESS_TEXT,
+		FILE_THUMB,
+		FILE_HAS_VIDEO,
+		FILE_FFORMAT,
+		FILE_AFORMAT,
+		FILE_VFORMAT,
+		FILE_ACHANNELS,
+		FILE_ARATE,
+		FILE_ABITRATE,
+		FILE_VWIDTH,
+		FILE_VHEIGHT,
+		FILE_VRATE,
+		FILE_VBITRATE,
+		FILE_BITRATE,
+		FILE_ARTIST,
+		FILE_ALBUM,
+		FILE_GENRE,
+		FILE_TRACK_NAME,
+		FILE_TRACK_NUM,
+		FILE_COMMENTS,
+		FILE_RECORDED_DATE
+	}
+	
+	// presets -------------------------------------
+	
+	private void init_preset_toolbar(){
 		// Preset tool bar --------------------------------------
 
         //toolbar
@@ -702,7 +1169,7 @@
 		toolbar2.add (btnPresetInfo);
 	}
 
-	public void init_preset_dropdowns(){
+	private void init_preset_dropdowns(){
 		//vboxMain2
         vboxMain2 = new Box (Orientation.VERTICAL, 0);
 		vboxMain2.margin_left = 6;
@@ -759,7 +1226,7 @@
         gridConfig.attach(btnEditPreset,2,0,1,2);
 	}
 
-	public void init_statusbar(){
+	private void init_statusbar(){
 		//lblStatus
 		lblStatus = new Label("");
 		lblStatus.ellipsize = Pango.EllipsizeMode.END;
@@ -768,7 +1235,7 @@
 		vboxMain2.add (lblStatus);
 	}
 
-	public void init_regular_expressions(){
+	private void init_regular_expressions(){
 		try{
 			regexGeneric = new Regex("""([0-9]+[.]?[0-9]*)%""");
 			regexMkvMerge = new Regex("""Progress: ([0-9]+[.]?[0-9]*)%""");
@@ -789,8 +1256,8 @@
 		}
 	}
 
-	public void set_window_title(){
-		title = AppName + " v" + AppVersion;// + " by " + AppAuthor + " (" + "teejeetech.blogspot.in" + ")";
+	private void set_window_title(){
+		title = AppName + " v" + AppVersion;
 	}
 
 	// script dropdown handlers -----------------------
@@ -993,7 +1460,7 @@
 		TreeIter iter;
 		cmbScriptFolder.get_active_iter(out iter);
 		model.get (iter, 0, out path, -1);
-		exo_open_folder (path);
+		exo_open_folder (path + "/");
 	}
 
 	private void miFileOpenLogFile_clicked(){
@@ -1215,21 +1682,22 @@
 		}
 	}
 
-	// list view and context menu -------------------------
+	// file list context menu -------------------------
 
     private bool menuFile_popup (Gtk.Menu popup, Gdk.EventButton? event) {
 		TreeSelection selection = tvFiles.get_selection();
 		int index = -1;
-
-		if (selection.count_selected_rows() == 0){
-			return true;
-		}
+		MediaFile mFile = null;
+		//if (selection.count_selected_rows() == 0){
+		//	return true;
+		//}
 
 		if (selection.count_selected_rows() == 1){
 			TreeModel model;
 			GLib.List<TreePath> lst = selection.get_selected_rows (out model);
 			TreePath path = lst.nth_data (0);
 			index = int.parse (path.to_string());
+			mFile = App.InputFiles[index];
 		}
 
 		switch(App.Status){
@@ -1241,18 +1709,18 @@
 
 				miFileInfo.visible = true;
 				miFileInfoOutput.visible = false;
-				miFilePreview.visible = false;
 				miFilePlaySource.visible = true;
 				miFilePlayOutput.visible = false;
 				miFileCropAuto.visible = true;
 				miFileRemove.visible = true;
 				miFileSeparator1.visible = true;
 				miFileSeparator2.visible = false;
-
+				
+				miListViewColumns.visible = !App.TileView;
+				
 				miFileInfo.sensitive = (selection.count_selected_rows() == 1);
-				miFilePreview.sensitive = (selection.count_selected_rows() == 1);
 				miFilePlaySource.sensitive = (selection.count_selected_rows() == 1);
-				miFileCropAuto.sensitive = (selection.count_selected_rows() > 0);
+				miFileCropAuto.sensitive = (mFile != null) && (mFile.HasVideo);
 				miFileRemove.sensitive = (selection.count_selected_rows() > 0);
 				break;
 
@@ -1265,13 +1733,15 @@
 				miFileOpenOutput.visible = true;
 				miFileOpenLogFile.visible = false;
 
+				miListViewColumns.visible = false;
+				
 				if (selection.count_selected_rows() == 1){
-					if (App.InputFiles[index].Status == FileStatus.RUNNING){
-						miFileSkip.sensitive = true;
-					}
-					else{
+					//if (App.InputFiles[index].Status == FileStatus.RUNNING){
+						//miFileSkip.sensitive = true;
+					//}
+					//else{
 						miFileSkip.sensitive = false;
-					}
+					//}
 					if (dir_exists(App.InputFiles[index].TempDirectory)){
 						miFileOpenTemp.sensitive = true;
 					}
@@ -1288,7 +1758,6 @@
 
 				miFileInfo.visible = false;
 				miFileInfoOutput.visible = false;
-				miFilePreview.visible = false;
 				miFilePlaySource.visible = false;
 				miFilePlayOutput.visible = false;
 				miFileCropAuto.visible = false;
@@ -1315,12 +1784,13 @@
 				miFileInfoOutput.visible = true;
 				miFilePlaySource.visible = true;
 				miFilePlayOutput.visible = true;
-				miFilePreview.visible = false;
 				miFileCropAuto.visible = false;
 				miFileRemove.visible = false;
 				miFileSeparator1.visible = false;
 				miFileSeparator2.visible = true;
 
+				miListViewColumns.visible = false;
+				
 				if (selection.count_selected_rows() == 1){
 					string outpath = App.InputFiles[index].OutputFilePath;
 					if (outpath != null && outpath.length > 0 && file_exists(outpath)){
@@ -1383,9 +1853,9 @@
 
     private void miFileCropAuto_clicked() {
 		TreeSelection selection = tvFiles.get_selection();
-		if (selection.count_selected_rows() == 0){ return; }
+		if (selection.count_selected_rows() != 1){ return; }
 
-		set_busy (true,this);
+		//set_busy (true,this);
 
 		TreeModel model;
 		GLib.List<TreePath> lst = selection.get_selected_rows (out model);
@@ -1395,19 +1865,25 @@
 			TreeIter iter;
 			model.get_iter (out iter, path);
 			int index = int.parse (path.to_string());
-			MediaFile file = App.InputFiles[index];
+			MediaFile mf = App.InputFiles[index];
+			var win = new CropVideoSingleWindow(this, mf);
+			this.hide();
+			//win.show_all();
 
+			/*
 			if (file.crop_detect()){
 				((Gtk.ListStore)tvFiles.model).set (iter, InputField.FILE_CROPVAL, file.crop_values_info());
 			}
 			else{
 				((Gtk.ListStore)tvFiles.model).set (iter, InputField.FILE_CROPVAL, _("N/A"));
 			}
+			* */
+			break;
 
 			do_events();
 		}
 
-		set_busy (false,this);
+		//set_busy (false,this);
     }
 
     private void miFileRemove_clicked() {
@@ -1427,7 +1903,7 @@
 			model.get_iter (out iter, path);
 			int index = int.parse (path.to_string());
 			MediaFile mf = App.InputFiles[index];
-			exo_open_folder (mf.TempDirectory);
+			exo_open_folder (mf.TempDirectory + "/");
 		}
     }
 
@@ -1446,57 +1922,24 @@
 			MediaFile mf = App.InputFiles[index];
 
 			if (App.OutputDirectory.length == 0){
-				exo_open_folder (mf.Location);
+				exo_open_folder (mf.Location + "/");
 			} else{
-				exo_open_folder (App.OutputDirectory);
+				exo_open_folder (App.OutputDirectory + "/");
 			}
 		}
     }
 
     private void btnOpenOutputFolder_click(){
 		if (App.OutputDirectory.length > 0 && dir_exists(App.OutputDirectory)){
-			exo_open_folder (App.OutputDirectory);
+			exo_open_folder (App.OutputDirectory + "/");
 		}
 	}
 
-	private void set_busy (bool busy, Gtk.Window win) {
-		Gdk.Cursor? cursor = null;
-
-		if (busy){
-			cursor = new Gdk.Cursor(Gdk.CursorType.WATCH);
-		}
-		else{
-			cursor = new Gdk.Cursor(Gdk.CursorType.ARROW);
-		}
-
-		var window = win.get_window();
-
-		if (window != null) {
-			window.set_cursor (cursor);
-		}
-
-		do_events();
-	}
-
     private void do_events(){
 		while(Gtk.events_pending())
 			Gtk.main_iteration();
 	}
 
-    private void miFilePreview_clicked() {
-		TreeSelection selection = tvFiles.get_selection();
-
-		if (selection.count_selected_rows() > 0){
-			TreeModel model;
-			GLib.List<TreePath> lst = selection.get_selected_rows (out model);
-			TreePath path = lst.nth_data (0);
-			int index = int.parse (path.to_string());
-			MediaFile mf = App.InputFiles[index];
-
-			mf.preview_output(App.AVPlayer);
-		}
-	}
-
     private void miFilePlayOutput_clicked() {
 		TreeSelection selection = tvFiles.get_selection();
 
@@ -1507,7 +1950,8 @@
 			int index = int.parse (path.to_string());
 			MediaFile mf = App.InputFiles[index];
 
-			mf.play_output(App.AVPlayer);
+			var mf_output = new MediaFile(mf.OutputFilePath, App.AVEncoder);
+			MediaPlayerWindow.PlayFile(mf_output);
 		}
     }
 
@@ -1521,7 +1965,7 @@
 			int index = int.parse (path.to_string());
 			MediaFile mf = App.InputFiles[index];
 
-			mf.play_source(App.AVPlayer);
+			MediaPlayerWindow.PlayFile(mf);
 		}
     }
 
@@ -1552,10 +1996,10 @@
 
 	// add files --------------------------------
 
-	private void btnAddItems_clicked(bool add_files){
+	private void select_items(bool select_files){
 		Gtk.FileChooserDialog dlg = null;
 
-		if (add_files){
+		if (select_files){
 			dlg = new Gtk.FileChooserDialog(_("Add File(s)"), this, Gtk.FileChooserAction.OPEN,
 					"gtk-cancel", Gtk.ResponseType.CANCEL, "gtk-open", Gtk.ResponseType.ACCEPT);
 		}
@@ -1572,38 +2016,108 @@
 			dlg.set_current_folder(App.InputDirectory);
 		}
 
-		msg_add = "";
+		var list = new Gee.ArrayList<string>();
 		
  		if (dlg.run() == Gtk.ResponseType.ACCEPT){
-
-			set_busy(true,dlg);
-
-	 		foreach (string item_path in dlg.get_filenames()){
-				add_item(item_path);
+			//get file list
+			foreach (string item_path in dlg.get_filenames()){
+				get_list_of_files_to_add(ref list, item_path);
 			}
-
-			set_busy(false,dlg);
-			
 			App.InputDirectory = dlg.get_current_folder();
 	 	}
 
-	 	refresh_list_view();
+		dlg.close();
+		//dlg.destroy();
+		gtk_do_events();
+
+		add_items(list);
+	}
+
+	private void add_items(Gee.ArrayList<string> list){
+		var status_msg = _("Reading file properties...");
+		var progressDlg = new SimpleProgressWindow.with_parent(this, status_msg);
+		progressDlg.set_title(_("Adding..."));
+		progressDlg.show_all();
+		gtk_do_events();
 
-	 	dlg.destroy(); //resets cursor
+		//get total count
+		App.progress_total = list.size;
+		App.progress_count = 0;
+		
+		msg_add = "";
+		foreach (string file_path in list){
+			App.status_line = _("Adding (%d/%d): '%s'").printf(App.progress_count + 1, App.progress_total, file_basename(file_path));
+			progressDlg.update_status_line();
+			gtk_do_events();
+
+			add_file(file_path);
+
+			App.progress_count++;
+			progressDlg.update_progressbar();
+			gtk_do_events();
+		}
+
+		progressDlg.close();
+		//progressDlg.destroy();
+		gtk_do_events();
+
+		//Adjustment adj = swFiles.get_vadjustment();
+		//double pos = adj.get_value();
+		//log_msg("%f".printf(tvFiles.vadjustment.get_value()));
+		refresh_list_view();
+
+		//adj.set_value(adj.upper-adj.page_size);
+		//swFiles.set_vadjustment(adj);
+
+		//log_msg("%f".printf(tvFiles.vadjustment.get_value()));
 
 	 	if (msg_add.length > 0){
 			msg_add = _("Some files could not be opened:") + "\n\n" + msg_add;
 			gtk_messagebox("Unknown Format",msg_add,this,true);
+			msg_add = "";
 		}
 	}
+	
+	private Gee.ArrayList<string> get_list_of_files_to_add(ref Gee.ArrayList<string>? list, string item_path){
+		if (list == null){
+			list = new Gee.ArrayList<string>();
+		}
+		
+		File file = File.new_for_path (item_path);
+		if (file.query_exists()){
+			try{
+				FileInfo f_info = file.query_info("%s,%s".printf(FileAttribute.STANDARD_NAME,FileAttribute.STANDARD_TYPE), FileQueryInfoFlags.NONE);
+				if (f_info.get_file_type() == FileType.REGULAR){
+					list.add(item_path);
+				}
+				else if (f_info.get_file_type() == FileType.DIRECTORY){
+					FileEnumerator f_enum = file.enumerate_children ("%s".printf(FileAttribute.STANDARD_NAME), 0);
+					FileInfo f_info_child;
+					while ((f_info_child = f_enum.next_file ()) != null) {
+						string name = f_info_child.get_name();
+						string item = item_path + "/" + name;
+						get_list_of_files_to_add(ref list, item);
+					}
+				}
+			}
+			catch (Error e) {
+				log_error (e.message);
+			}
+		}
 
-	private void add_item(string item_path){
+		return list;
+	}
+	
+	private void add_item(string item_path, bool count_only, ref int count){
 		File file = File.new_for_path (item_path);
 		if (file.query_exists()){
 			try{
 				FileInfo f_info = file.query_info("%s,%s".printf(FileAttribute.STANDARD_NAME,FileAttribute.STANDARD_TYPE), FileQueryInfoFlags.NONE);
 				if (f_info.get_file_type() == FileType.REGULAR){
-					add_file(item_path);
+					count++;
+					if (!count_only){
+						add_file(item_path);
+					}
 				}
 				else if (f_info.get_file_type() == FileType.DIRECTORY){
 					FileEnumerator f_enum = file.enumerate_children ("%s".printf(FileAttribute.STANDARD_NAME), 0);
@@ -1611,7 +2125,7 @@
 					while ((f_info_child = f_enum.next_file ()) != null) {
 						string name = f_info_child.get_name();
 						string item = item_path + "/" + name;
-						add_item(item);
+						add_item(item, count_only, ref count);
 					}
 				}
 			}
@@ -1629,18 +2143,126 @@
 	}
 
 	private void on_drag_data_received (Gdk.DragContext drag_context, int x, int y, Gtk.SelectionData data, uint info, uint time) {
-		msg_add = "";
-        foreach(string uri in data.get_uris()){
+		//get file list
+		var list = new Gee.ArrayList<string>();
+		foreach (string uri in data.get_uris()){
 			string item_path = uri.replace("file://","").replace("file:/","");
 			item_path = Uri.unescape_string (item_path);
-			add_item (item_path);
+			get_list_of_files_to_add(ref list, item_path);
 		}
 
-        refresh_list_view();
+		add_items(list);
 
         Gtk.drag_finish (drag_context, true, false, time);
     }
 
+	// treeview columns --------------------------------
+
+	private void tvFiles_init_columns(){
+		col_list = new Gee.HashMap<TreeViewColumn,TreeViewListColumn>();
+		//col_list[colName] = new TreeViewListColumn("name",colName);
+		//col_list[colSize] = new TreeViewListColumn("size",colSize);
+		//col_list[colDuration] = new TreeViewListColumn("duration",colDuration);
+		col_list[colFileFormat] = new TreeViewListColumn("format","File Format",colFileFormat);
+		col_list[colAFormat] = new TreeViewListColumn("aformat","Audio Format",colAFormat);
+		col_list[colVFormat] = new TreeViewListColumn("vformat","Video Format",colVFormat);
+		col_list[colAChannels] = new TreeViewListColumn("channels","Audio Channels",colAChannels);
+		col_list[colARate] = new TreeViewListColumn("samplingrate","Audio Sampling Rate",colARate);
+		col_list[colVWidth] = new TreeViewListColumn("width","Video Width",colVWidth);
+		col_list[colVHeight] = new TreeViewListColumn("height","Video Height",colVHeight);
+		col_list[colVFps] = new TreeViewListColumn("framerate","Video Framerate",colVFps);
+		col_list[colBitrate] = new TreeViewListColumn("bitrate","Bitrate",colBitrate);
+		col_list[colABitrate] = new TreeViewListColumn("abitrate","Audio Bitrate",colABitrate);
+		col_list[colVBitrate] = new TreeViewListColumn("vbitrate","Video Bitrate",colVBitrate);
+		col_list[colArtist] = new TreeViewListColumn("artist","Artist",colArtist);
+		col_list[colAlbum] = new TreeViewListColumn("album","Album",colAlbum);
+		col_list[colGenre] = new TreeViewListColumn("genre","Genre",colGenre);
+		col_list[colTrackName] = new TreeViewListColumn("title","Title",colTrackName);
+		col_list[colTrackNum] = new TreeViewListColumn("tracknum","Track No.",colTrackNum);
+		col_list[colComments] = new TreeViewListColumn("comments","Comments",colComments);
+		col_list[colRecordedDate] = new TreeViewListColumn("recordeddate","RecordedDate",colRecordedDate);
+		//col_list[colProgress] = new TreeViewListColumn("status",colProgress);
+		//col_list[colSpacer] = new TreeViewListColumn("spacer",colSpacer);
+	
+		tvFiles_load_columns();
+
+		//disconnect event handler before exit
+		this.delete_event.connect(()=>{
+			tvFiles.columns_changed.disconnect(tvFiles_columns_changed);
+			return false;
+		});
+	}
+
+	private void tvFiles_load_columns(){
+
+		tvFiles.columns_changed.disconnect(tvFiles_columns_changed);
+		
+		//remove all columns
+		var list = new Gee.ArrayList<TreeViewColumn>();
+		foreach(TreeViewColumn col in tvFiles.get_columns()){
+			list.add(col);
+		}
+		foreach(TreeViewColumn col in list){
+			tvFiles.remove_column(col);
+		}
+
+		//add required columns
+		tvFiles.append_column(colName);
+		tvFiles.append_column(colSize);
+		tvFiles.append_column(colDuration);
+		
+		//add selected columns
+		foreach(string col_name in App.ListViewColumns.split(",")){
+			foreach(TreeViewListColumn col in col_list.values){
+				if (col.Name == col_name){
+					tvFiles.append_column(col.Ref);
+					break;
+				}
+			}
+		}
+
+		//add required columns
+		tvFiles.append_column(colProgress);
+		tvFiles.append_column(colSpacer);
+
+		//update Selected flag
+		foreach(TreeViewListColumn col in col_list.values){
+			col.Selected = false;
+		}
+		foreach(TreeViewColumn col in tvFiles.get_columns()){
+			if (col_list.has_key(col)){
+				col_list[col].Selected = true;
+			}
+		}
+
+		tvFiles.columns_changed.connect(tvFiles_columns_changed);
+	}
+	
+	private void tvFiles_columns_changed(){
+		tvFiles_save_columns();
+	}
+	
+	private void tvFiles_save_columns(){
+		if (col_list == null){
+			return;
+		}
+
+		string s = "";
+		var list = tvFiles.get_columns();
+		foreach(TreeViewColumn col in list){
+			//s += "'%s',".printf(col.title);
+			if (col_list.has_key(col)){
+				s += col_list[col].Name + ",";
+			}
+		}
+
+		if (s.has_suffix(",")){
+			s = s[0:s.length - 1];
+		}
+
+		App.ListViewColumns = s;
+	}
+
     // toolbar --------------------------------
     
 	private void btnRemoveFiles_clicked(){
@@ -1702,7 +2324,7 @@
 
 		dialog.program_name = AppName;
 		dialog.comments = _("An audio-video converter for Linux");
-		dialog.copyright = "Copyright © 2015 Tony George (%s)".printf(AppAuthorEmail);
+		dialog.copyright = "Copyright © 2016 Tony George (%s)".printf(AppAuthorEmail);
 		dialog.version = AppVersion;
 		dialog.logo = get_app_icon(128);
 
@@ -1714,7 +2336,7 @@
 		dialog.show_all();
 	}
 
-	public void btnDonation_clicked(){
+	private void btnDonation_clicked(){
 		var dialog = new DonationWindow();
 		dialog.set_transient_for(this);
 		dialog.show_all();
@@ -1748,8 +2370,9 @@
 	}
 
 	private void btnBackground_clicked(){
-		App.BackgroundMode = btnBackground.active;
+		App.BackgroundMode = true;
 		App.set_priority();
+		this.iconify();
 	}
 
 	private void btnPause_clicked(){
@@ -1787,16 +2410,37 @@
 
 	// encoding ----------------------------------
 
-	public void start(){
+	private void crop_videos(){
 		if (App.InputFiles.size == 0){
-			string msg = _("Input queue is empty!\nPlease add some files.\n");
-			var dlg = new Gtk.MessageDialog(null,Gtk.DialogFlags.MODAL, Gtk.MessageType.ERROR, Gtk.ButtonsType.OK, msg);
-			dlg.set_title(_("Queue is Empty"));
-			dlg.set_modal(true);
-			dlg.set_transient_for(this);
-			dlg.run();
-			dlg.destroy();
+			string title = _("No Files");
+			string msg = _("Add some files to the file list");
+			gtk_messagebox(title, msg, this, true);
+			return;
+		}
+
+		int count = 0 ;
+		foreach(var mf in App.InputFiles){
+			if (mf.HasVideo){
+				count++;
+			}
+		}
+		
+		if (count == 0){
+			string title = _("No Videos");
+			string msg = _("Add some videos to the file list");
+			gtk_messagebox(title, msg, this, true);
+			return;
+		}
 
+		var win = new CropVideoBatchWindow(this);
+		this.hide();
+	}
+
+	private void start(){
+		if (App.InputFiles.size == 0){
+			string title = _("No Files");
+			string msg = _("Add some files to the file list");
+			gtk_messagebox(title, msg, this, true);
 			return;
 		}
 
@@ -1821,16 +2465,16 @@
 	    timerID = Timeout.add (500, update_status);
 	}
 
-	public void convert_prepare(){
+	private void convert_prepare(){
 		toolbar2.visible = false;
 		gridConfig.visible = false;
 		btnShutdown.active = App.Shutdown;
 
 		btnShutdown.visible = App.AdminMode;
-		btnBackground.visible = App.AdminMode;
-        btnBackground.active = App.BackgroundMode;
+		btnBackground.visible = true;
         btnOpenOutputFolder.visible = dir_exists(App.OutputDirectory);
 
+		btnCrop.visible = false;
 		btnStart.visible = false;
 		btnAddFiles.visible = true;
 		btnRemoveFiles.visible = false;
@@ -1849,19 +2493,33 @@
 		paused = false;
 		btnPause.stock_id = "gtk-media-pause";
 
-		colCrop.visible = false;
+		foreach(TreeViewListColumn col in col_list.values){
+			if (col.Selected){
+				col.Ref.visible = false;
+			}
+		}
+		//colCrop.visible = false;
 		colProgress.visible = true;
 
 		start_cpu_usage_timer();
 	}
 
-	public void convert_finish(){
+	private void convert_finish(){
 		toolbar2.visible = true;
 		gridConfig.visible = true;
 
-		colCrop.visible = !App.TileView;
+		//show extra columns
+		if (!App.TileView){
+			foreach(TreeViewListColumn col in col_list.values){
+				if (col.Selected){
+					col.Ref.visible = true;
+				}
+			}
+		}
+		//colCrop.visible = !App.TileView;
 		colProgress.visible = false;
 
+		btnCrop.visible = true;
 		btnStart.visible = true;
 		btnAddFiles.visible = true;
 		btnRemoveFiles.visible = true;
@@ -1884,7 +2542,7 @@
 		statusbar_default_message();
 	}
 
-	public bool update_status(){
+	private bool update_status(){
 		TreeIter iter;
 		Gtk.ListStore model = (Gtk.ListStore)tvFiles.model;
 
@@ -1936,6 +2594,8 @@
 				stop_cpu_usage_timer();
 				set_window_title();
 
+				this.present();
+
 				break;
 
 			case AppStatus.RUNNING:
@@ -1965,7 +2625,7 @@
 		return true;
 	}
 
-	public void start_cpu_usage_timer(){
+	private void start_cpu_usage_timer(){
 		cpuUsageTimer = Timeout.add (1000, update_cpu_usage);
 	}
 
@@ -1974,14 +2634,14 @@
 		return true;
 	}
 
-	public void stop_cpu_usage_timer(){
+	private void stop_cpu_usage_timer(){
 		if (cpuUsageTimer != 0){
 			Source.remove(cpuUsageTimer);
 			cpuUsageTimer = 0;
 		}
 	}
 
-	public void update_status_all(){
+	private void update_status_all(){
 		Gtk.ListStore model = (Gtk.ListStore)tvFiles.model;
 		MediaFile mf;
 		int index = -1;
@@ -2000,22 +2660,22 @@
 		}
 	}
 
-	public bool shutdown(){
+	private bool shutdown(){
 		shutdown();
 		return true;
 	}
 }
 
-public enum InputField{
-	FILE_REF,
-	FILE_PATH,
-	FILE_NAME,
-	FILE_SIZE,
-	FILE_DURATION,
-	FILE_STATUS,
-	FILE_CROPVAL,
-	FILE_PROGRESS,
-	FILE_PROGRESS_TEXT,
-	FILE_THUMB,
-	FILE_HAS_VIDEO
+public class TreeViewListColumn : GLib.Object {
+	public string Name;
+	public TreeViewColumn Ref;
+	public string FullDisplayName;
+	public bool Selected = false;
+	
+	public TreeViewListColumn(string _Name, string _FullDisplayName, TreeViewColumn _Ref){
+		Name = _Name;
+		Ref = _Ref;
+		FullDisplayName = _FullDisplayName;
+	}
 }
+

selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/MediaFile.vala Added

@@ -0,0 +1,391 @@
+using TeeJee.Logging;
+using TeeJee.FileSystem;
+using TeeJee.JSON;
+using TeeJee.ProcessManagement;
+using TeeJee.GtkHelper;
+using TeeJee.Multimedia;
+using TeeJee.System;
+using TeeJee.Misc;
+
+public class MediaFile : GLib.Object{
+	public string Path;
+	public string Name;
+	public string Title;
+	public string Extension;
+	public string Location;
+
+	public int64 Size = 0;
+	public long Duration = 0; //in milliseconds
+	public string ThumbnailImagePath = "";
+
+	public string SubFile = "";
+	public string SubName = "";
+	public string SubExt = "";
+
+	public string TrackName = "";
+	public string TrackNumber = "";
+	public string Album = "";
+	public string Artist = "";
+	public string Genre = "";
+	public string RecordedDate = "";
+	public string Comment = "";
+
+	public int CropW = 0;
+	public int CropH = 0;
+	public int CropL = 0;
+	public int CropR = 0;
+	public int CropT = 0;
+	public int CropB = 0;
+	public bool AutoCropError = false;
+
+	//public int Status = 0;
+	public FileStatus Status = FileStatus.PENDING;
+	public bool IsValid;
+	public string ProgressText = _("Queued");
+	public int ProgressPercent = 0;
+
+	public string InfoText = "";
+	public string InfoTextFormatted = "";
+	
+	public bool HasAudio = false;
+	public bool HasVideo = false;
+	public bool HasSubs = false;
+
+	public string FileFormat = "";
+	public string VideoFormat = "";
+	public string AudioFormat = "";
+	public int SourceWidth = 0;
+	public int SourceHeight = 0;
+	public double SourceFrameRate = 0;
+	public int AudioChannels = 0;
+	public int AudioSampleRate = 0;
+	public int AudioBitRate = 0;
+	public int VideoBitRate = 0;
+	public int BitRate = 0;
+
+	public string TempScriptFile;
+	public string TempDirectory = "";
+	public string LogFile = "";
+	public string OutputFilePath = "";
+	public long OutputFrameCount = 0;
+
+	public static int ThumbnailWidth = 80;
+	public static int ThumbnailHeight= 64;
+			
+	public MediaFile(string filePath, string av_encoder){
+		IsValid = false;
+		if (file_exists (filePath) == false) { return; }
+
+		// set file properties ------------
+
+		File f = File.new_for_path (filePath);
+		File fp = f.get_parent();
+
+		Path = filePath;
+		Name = f.get_basename();
+		Title = Name[0: Name.last_index_of(".",0)];
+		Extension = Name[Name.last_index_of(".",0):Name.length];
+		Location = fp.get_path();
+		//stderr.printf(@"file=$filePath, name=$Name, title=$Title, ext=$Extension, dir=$Location\n");
+
+		FileInfo fi = null;
+
+		try{
+			fi = f.query_info ("%s".printf(FileAttribute.STANDARD_SIZE), FileQueryInfoFlags.NONE, null);
+			Size = fi.get_size();
+		}
+		catch (Error e) {
+			log_error (e.message);
+		}
+
+		// get media information ----------
+
+		query_mediainfo();
+		if (Duration == 0) { return; }
+
+		// search for subtitle files ---------------
+
+		try{
+	        var enumerator = fp.enumerate_children ("%s,%s".printf(FileAttribute.STANDARD_NAME,FileAttribute.STANDARD_TYPE), 0);
+			var fileInfo = enumerator.next_file();
+	        while (fileInfo != null) {
+	            if (fileInfo.get_file_type() == FileType.REGULAR) {
+		            string fname = fileInfo.get_name().down();
+		            if (fname.has_prefix(Title.down()) && (fname.has_suffix (".srt")||fname.has_suffix (".sub")||fname.has_suffix (".ssa")||fname.has_suffix (".ttxt")||fname.has_suffix (".xml")||fname.has_suffix (".lrc")))
+		            {
+			            SubName = fileInfo.get_name();
+			            SubFile = Location + "/" + SubName;
+	                	SubExt = SubFile[SubFile.last_index_of(".",0):SubFile.length].down();
+	                	HasSubs = true;
+	                	//log ("file=%s, name=%s, ext=%s\n".printf(SubFile, SubName, SubExt));
+	                }
+	            }
+	            fileInfo = enumerator.next_file();
+	        }
+        }
+        catch(Error e){
+	        log_error (e.message);
+	    }
+
+
+	    // get thumbnail ---------
+
+	    generate_thumbnail(av_encoder);
+
+		IsValid = true;
+	}
+
+	public void query_mediainfo(){
+		InfoText = get_mediainfo (Path, true);
+
+		if (InfoText == null || InfoText == ""){
+			return;
+		}
+
+		string sectionType = "";
+
+		foreach (string line in InfoText.split ("\n")){
+			if (line == null || line.length == 0) { continue; }
+
+			if (line.contains (":") == false)
+			{
+				if (line.contains ("Audio")){
+					sectionType = "audio";
+					HasAudio = true;
+				}
+				else if (line.contains ("Video")){
+					sectionType = "video";
+					HasVideo = true;
+				}
+				else if (line.contains ("General")){
+					sectionType = "general";
+				}
+				else if (line.contains ("Text")){
+					sectionType = "text";
+					HasSubs = true;
+				}
+			}
+			else{
+				string[] arr = line.split (": ");
+				if (arr.length != 2) { continue; }
+
+				string key = arr[0].strip();
+				string val = arr[1].strip();
+
+				if (sectionType	== "general"){
+					switch (key.down()) {
+						case "duration/string":
+							Duration = 0;
+							foreach(string p in val.split(" ")){
+								string part = p.strip().down();
+								if (part.contains ("h") || part.contains ("hr"))
+									Duration += long.parse(part.replace ("hr","").replace ("h","")) * 60 * 60 * 1000;
+								else if (part.contains ("mn") || part.contains ("min"))
+									Duration += long.parse(part.replace ("min","").replace ("mn","")) * 60 * 1000;
+								else if (part.contains ("ms"))
+									Duration += long.parse(part.replace ("ms",""));
+								else if (part.contains ("s"))
+									Duration += long.parse(part.replace ("s","")) * 1000;
+							}
+							break;
+						case "track":
+							TrackName = val;
+							break;
+						case "track/position":
+							TrackNumber = val;
+							break;
+						case "album":
+							Album = val;
+							break;
+						case "performer":
+							Artist = val;
+							break;
+						case "genre":
+							Genre = val;
+							break;
+						case "recorded_date":
+							RecordedDate = val;
+							break;
+						case "comment":
+							Comment = val;
+							break;
+						case "format":
+							FileFormat = val;
+							break;
+						case "overallbitrate/string":
+							BitRate = int.parse(val.split(" ")[0].strip());
+							break;
+					}
+				}
+				else if (sectionType == "video"){
+					switch (key.down()) {
+						case "width/string":
+							SourceWidth = int.parse(val.split(" ")[0].strip());
+							break;
+						case "height/string":
+							SourceHeight = int.parse(val.split(" ")[0].strip());
+							break;
+						case "framerate/string":
+						case "framerate_original/string":
+							SourceFrameRate = double.parse(val.split(" ")[0].strip());
+							break;
+						case "format":
+							VideoFormat = val;
+							break;
+						case "bitrate/string":
+							VideoBitRate = int.parse(val.split(" ")[0].strip());
+							break;
+					}
+				}
+				else if (sectionType == "audio"){
+					switch (key.down()) {
+						case "channel(s)/string":
+							AudioChannels = int.parse(val.split(" ")[0].strip());
+							break;
+						case "samplingrate/string":
+							AudioSampleRate = (int)(double.parse(val.split(" ")[0].strip()) * 1000);
+							break;
+						case "format":
+							AudioFormat = val;
+							break;
+						case "bitrate/string":
+							AudioBitRate = int.parse(val.split(" ")[0].strip());
+							break;
+					}
+				}
+			}
+		}
+	}
+
+	public void query_mediainfo_formatted(){
+		InfoTextFormatted = get_mediainfo (Path, false);
+	}
+
+	public void prepare (string baseTempDir){
+		TempDirectory = baseTempDir + "/" + timestamp2() + " - " + Name;
+		LogFile = TempDirectory + "/" + "log.txt";
+		TempScriptFile = TempDirectory + "/convert.sh";
+		OutputFilePath = "";
+		create_dir (TempDirectory);
+
+		//initialize output frame count
+		if (HasVideo && Duration > 0 && SourceFrameRate > 1) {
+			OutputFrameCount = (long) ((Duration / 1000.0) * (SourceFrameRate));
+		}
+		else{
+			OutputFrameCount = 0;
+		}
+	}
+
+	public void generate_thumbnail(string av_encoder){
+		if (HasVideo){
+			ThumbnailImagePath = get_temp_file_path() + ".png";
+			string std_out, std_err;
+			execute_command_script_sync("%s -ss 1 -i \"%s\" -y -f image2 -vframes 1 -r 1 -s %dx%d \"%s\"".printf(av_encoder,Path,ThumbnailWidth,ThumbnailHeight,ThumbnailImagePath), out std_out, out std_err);
+		}
+		else{
+			ThumbnailImagePath = "/usr/share/%s/images/%s".printf(AppShortName, "audio.svg");
+		}
+	}
+
+	public bool crop_detect(){
+		if (HasVideo == false) {
+			AutoCropError = true;
+			return false;
+		}
+
+		string params = get_file_crop_params (Path);
+		string[] arr = params.split (":");
+
+		if (arr.length == 4){
+			CropW = int.parse (arr[0]);
+			CropH = int.parse (arr[1]);
+			CropL = int.parse (arr[2]);
+			CropT = int.parse (arr[3]);
+		}
+
+		CropR = SourceWidth - CropW - CropL;
+		CropB = SourceHeight - CropH - CropT;
+
+		if ((CropW == 0) && (CropH == 0)){
+			AutoCropError = true;
+			return false;
+		}
+		else
+			return true;
+	}
+
+	public bool crop_enabled(){
+		if ((CropW == 0)&&(CropH == 0)&&(CropL == 0)&&(CropT == 0))
+			return false;
+		else
+			return true;
+	}
+
+	public void crop_reset(){
+		CropW = 0;
+		CropH = 0;
+		CropL = 0;
+		CropT = 0;
+		CropR = 0;
+		CropB = 0;
+	}
+
+	public string crop_values_info(){
+		if (crop_enabled())
+			return "%i:%i:%i:%i".printf(CropL,CropT,CropR,CropB);
+		else if (AutoCropError)
+			return _("N/A");
+		else
+			return "";
+	}
+
+	public string crop_values_libav(){
+		if (crop_enabled())
+			return "%i:%i:%i:%i".printf(CropW,CropH,CropL,CropT);
+		else
+			return "iw:ih:0:0";
+	}
+
+	public string crop_values_x264(){
+		if (crop_enabled())
+			return "%i,%i,%i,%i".printf(CropL,CropT,CropR,CropB);
+		else
+			return "0,0,0,0";
+	}
+
+	public void preview_output(string av_player){
+		//deprecated
+	}
+
+	public void play_source(string av_player){
+		play_file(Path, av_player);
+	}
+
+	private void play_file(string file_path, string av_player){
+		if (file_exists(file_path)){
+			
+			string output = "";
+			string error = "";
+
+			string cmd = "";
+			switch(av_player){
+				case "avplay":
+				case "ffplay":
+					cmd = "nohup %s -i \"%s\"".printf(av_player, file_path);
+					break;
+				default:
+					cmd = "nohup %s \"%s\"".printf(av_player, file_path);
+					break;
+			}
+		
+			try {
+				Process.spawn_command_line_sync(cmd, out output, out error);
+			}
+			catch(Error e){
+				log_error (e.message);
+			}
+		}
+	}
+	
+}

selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/MediaPlayer.vala Added

@@ -0,0 +1,350 @@
+using TeeJee.Logging;
+using TeeJee.FileSystem;
+using TeeJee.JSON;
+using TeeJee.ProcessManagement;
+using TeeJee.GtkHelper;
+using TeeJee.Multimedia;
+using TeeJee.System;
+using TeeJee.Misc;
+
+public class MediaPlayer : GLib.Object{
+	public MediaFile mFile;
+
+	//playback state
+	public string isRunning;
+	public bool IsMuted = false;
+    public bool IsPaused = false;
+    public bool IsIdle = true;
+	public double Position = 0.0;
+	public int Volume = 70;
+	
+	//default state flags
+    public bool MuteOnLoad = false;
+    public bool PauseOnLoad = false;
+
+	public uint WindowID = 0;
+	
+    public string err_line;
+	public string out_line;
+	public string status_line;
+	public string status_summary;
+	public Gee.ArrayList<string> stdout_lines;
+	public Gee.ArrayList<string> stderr_lines;
+	public Pid proc_id;
+	public DataInputStream dis_out;
+	public DataInputStream dis_err;
+	public DataOutputStream dos_inp;
+	public int64 progress_count;
+	public int64 progress_total;
+	public bool is_running;
+
+	public int CropL = 0;
+	public int CropR = 0;
+	public int CropT = 0;
+	public int CropB = 0;
+
+	private Regex rex_crop;
+	private Regex rex_pause;
+	private Regex rex_av;
+	private Regex rex_audio;
+	private Regex rex_video;
+	
+
+	public MediaPlayer(){
+        IsMuted = false;
+        IsPaused = false;
+        IsIdle = true;
+
+        try{
+			//[CROP] Crop area: X: 4..1275  Y: 40..689  (-vf crop=1264:640:8:46).
+			//[CROP] Crop area: X: 1..1279  Y: 40..699  (-vf crop=1264:656:10:42).
+			rex_crop = new Regex(""".*-vf crop=([0-9]+):([0-9]+):([0-9]+):([0-9]+)""");
+
+			//  =====  PAUSE  =====
+			rex_pause = new Regex(""".*=====  PAUSE  =====""");
+
+			//A:   1.9 V:   1.9 A-V:  0.001 ct:  0.000   0/  0  1%  1%  0.4% 0 0
+			rex_av = new Regex("""^A:[ \t]*([0-9.]+)[ \t]*V:[ \t]*([0-9.]+)[ \t]*""");
+
+			//A:   1.9 V:   1.9 A-V:  0.001 ct:  0.000   0/  0  1%  1%  0.4% 0 0
+			rex_video = new Regex("""^V:[ \t]*([0-9.]+)[ \t]*""");
+			
+			//A:   1.9 V:   1.9 A-V:  0.001 ct:  0.000   0/  0  1%  1%  0.4% 0 0
+			rex_audio = new Regex("""^A:[ \t]*([0-9.]+)[ \t]*""");
+			
+		}
+		catch (Error e) {
+			log_error (e.message);
+		}
+	}
+
+	public void StartPlayerWithRectangle(){
+		if (mFile != null){
+			int x = mFile.CropL;
+			int y = mFile.CropT;
+			int w = mFile.SourceWidth - mFile.CropL - mFile.CropR;
+			int h = mFile.SourceHeight - mFile.CropT - mFile.CropB;
+			StartPlayer("-vf rectangle=%d:%d:%d:%d".printf(w,h,x,y));
+		}
+		else{
+			StartPlayer("-vf rectangle");
+		}
+	}
+
+	public void StartPlayerWithCropDetect(){
+		StartPlayer("-vf cropdetect");
+	}
+	
+	public void StartPlayer(string ExtraOptions = ""){
+		string args = "mplayer";
+        args += " -slave -identify -idle -noquiet -osdlevel 0 -colorkey 0x101010 -msglevel all=6 -nofs";
+        args += " -wid %u".printf(WindowID);
+		if (ExtraOptions.length > 0){
+			args += " " + ExtraOptions.strip();
+		}
+
+        log_debug(args);
+
+        run(args);
+
+        sleep(500);
+    }
+
+    private bool run (string cmd) {
+		string[] argv = new string[1];
+		argv[0] = create_temp_bash_script(cmd);
+
+		Pid child_pid;
+		int input_fd;
+		int output_fd;
+		int error_fd;
+
+		try {
+			//execute script file
+			Process.spawn_async_with_pipes(
+			    null, //working dir
+			    argv, //argv
+			    null, //environment
+			    SpawnFlags.SEARCH_PATH,
+			    null,   // child_setup
+			    out child_pid,
+			    out input_fd,
+			    out output_fd,
+			    out error_fd);
+
+			is_running = true;
+
+			proc_id = child_pid;
+
+			//create stream readers
+			var uis_out = new UnixInputStream(output_fd, false);
+			var uis_err = new UnixInputStream(error_fd, false);
+			var uos_inp = new UnixOutputStream(input_fd, false);
+			dis_out = new DataInputStream(uis_out);
+			dis_err = new DataInputStream(uis_err);
+			dos_inp = new DataOutputStream(uos_inp);
+			dis_out.newline_type = DataStreamNewlineType.ANY;
+			dis_err.newline_type = DataStreamNewlineType.ANY;
+			//dos_inp.newline_type = DataStreamNewlineType.ANY;
+
+			try {
+				//start thread for reading output stream
+				Thread.create<void> (read_output_line, true);
+			} catch (Error e) {
+				log_error (e.message);
+			}
+
+			try {
+				//start thread for reading error stream
+				Thread.create<void> (read_error_line, true);
+			} catch (Error e) {
+				log_error (e.message);
+			}
+
+			return true;
+		}
+		catch (Error e) {
+			log_error (e.message);
+			return false;
+		}
+	}
+
+	private void read_error_line() {
+		try {
+			MatchInfo match;
+			
+			err_line = dis_err.read_line (null);
+			while (is_running && (err_line != null)) {
+				
+				if (rex_av.match(err_line, 0, out match)){
+					Position = double.parse(match.fetch(2));
+					IsPaused = false;
+					//log_debug("Pos=%.2f".printf(Position));
+				}
+				else if (rex_video.match(err_line, 0, out match)){
+					Position = double.parse(match.fetch(1));
+					IsPaused = false;
+				}
+				else if (rex_audio.match(err_line, 0, out match)){
+					Position = double.parse(match.fetch(1));
+					IsPaused = false;
+				}
+				else if (rex_pause.match(err_line, 0, out match)){
+					IsPaused = true;
+					//log_debug("PAUSED");
+				}
+
+				//log_debug("err:" + err_line);
+				err_line = dis_err.read_line (null); //read next
+			}
+		}
+		catch (Error e) {
+			log_debug("In read_error_line()");
+			log_error (e.message);
+		}
+	}
+
+	private void read_output_line() {
+		try {
+			MatchInfo match;
+			
+			out_line = dis_out.read_line (null);
+			while (is_running && (out_line != null)) {
+
+				if (rex_crop.match (out_line, 0, out match)){
+					int w = int.parse(match.fetch(1));
+					int h = int.parse(match.fetch(2));
+					int x = int.parse(match.fetch(3));
+					int y = int.parse(match.fetch(4));
+
+					//log_debug("match=%d,%d,%d,%d".printf(w,h,x,y));
+					
+					int cropL = x;
+					int cropR = mFile.SourceWidth - w - x;
+					int cropT = y;
+					int cropB = mFile.SourceHeight - h - y;
+					
+					if (cropL < mFile.CropL){
+						mFile.CropL = cropL;
+					}
+					if (cropR < mFile.CropR){
+						mFile.CropR = cropR;
+					}
+					if (cropT < mFile.CropT){
+						mFile.CropT = cropT;
+					}
+					if (cropB < mFile.CropB){
+						mFile.CropB = cropB;
+					}
+				}
+
+				//  log_debug("out:" + out_line);
+				out_line = dis_out.read_line (null);  //read next
+			}
+
+			is_running = false;
+		}
+		catch (Error e) {
+			log_debug("In read_output_line()");
+			log_error (e.message);
+		}
+	}
+
+	private void write_to_stdin(string line) {
+		try {
+			if (is_running){
+				log_debug(line);
+				dos_inp.put_string(line + "\n");
+				dos_inp.flush();
+			}
+		}
+		catch (Error e) {
+			log_debug("In write_to_stdin()");
+			log_error (e.message);
+		}
+	}
+
+	public void Open(MediaFile _mFile, bool pause, bool mute, bool loop){
+		mFile = _mFile;
+		
+		write_to_stdin("loadfile '%s'".printf(mFile.Path.replace("'","\\'")));
+		
+		if (pause){
+			FrameStep(); //'frame_step' will pause the video, 'pause' will toggle
+		}
+		if (mute){
+			Mute();
+		}
+		if (loop){
+			Loop();
+		}
+	}
+
+	public void Loop(){
+		write_to_stdin("loop 100 ");
+	}
+
+	public void Pause(){
+		FrameStep();
+	}
+
+	public void UnPause(){
+		if (IsPaused){
+			PauseToggle();
+		}
+	}
+	
+	public void PauseToggle(){
+		//pause/unpause
+		write_to_stdin("pause ");
+	}
+
+	public void Mute(){
+		write_to_stdin("mute 1");
+		IsMuted = true;
+	}
+
+	public void UnMute(){
+		write_to_stdin("mute 0");
+		IsMuted = false;
+	}
+
+	public void SetVolume(int percent){
+		Volume = percent;
+		write_to_stdin("volume %d 1".printf(Volume));
+	}
+	
+	public void Stop(){
+		write_to_stdin("stop ");
+	}
+
+	public void ChangeRectangle(int parameter, int amount){
+		write_to_stdin("change_rectangle %d %d ".printf(parameter, amount));
+	}
+
+	public void FrameStep(){
+		write_to_stdin("frame_step ");
+	}
+	
+	public void SetRectangle(){
+		ChangeRectangle(0, - mFile.CropL - mFile.CropR); //0=width
+		FrameStep();
+		ChangeRectangle(1, - mFile.CropT - mFile.CropB); //1=height
+		FrameStep();
+		ChangeRectangle(2, mFile.CropL); //2=x
+		FrameStep();
+		ChangeRectangle(3, mFile.CropT); //3=y
+		FrameStep();
+	}
+	
+	public void Seek(double seconds){
+		write_to_stdin("seek %.1f 2".printf(seconds));
+	}
+
+	public void Exit(){
+		write_to_stdin("quit ");
+		is_running = false;
+		//process_kill(proc_id);
+	}
+}
+

selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/MediaPlayerWindow.vala Added

@@ -0,0 +1,229 @@
+/*
+ * MediaPlayerWindow.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 Gee;
+
+using TeeJee.Logging;
+using TeeJee.FileSystem;
+using TeeJee.JSON;
+using TeeJee.ProcessManagement;
+using TeeJee.GtkHelper;
+using TeeJee.Multimedia;
+using TeeJee.System;
+using TeeJee.Misc;
+
+public class MediaPlayerWindow : Gtk.Window {
+	private Gtk.Box vboxMain;
+	private Gtk.DrawingArea canvas;
+	private Gtk.Scale scalePos;
+	private Gtk.Scale scaleVolume;
+	private Gtk.Button btnPlay;
+	private Gtk.Button btnMute;
+	
+	private MediaPlayer player;
+	private MediaFile mFile;
+
+	private uint tmr_status = 0;
+	
+	public MediaPlayerWindow(MediaFile _mFile) {
+		//set_transient_for(parent);
+		//set_destroy_with_parent(true);
+        //set_skip_taskbar_hint(true);
+		//window_position = WindowPosition.CENTER_ON_PARENT;
+		
+		icon = get_app_icon(16);
+		modal = false;
+		deletable = true;
+		resizable = false;
+		
+		player = new MediaPlayer();
+		title = "Selene Media Player";
+
+		mFile = _mFile;
+
+		// get content area
+		vboxMain = new Gtk.Box(Orientation.VERTICAL,0);
+		add(vboxMain);
+		
+		init_ui_player();
+
+		init_ui_player_controls();
+
+		this.delete_event.connect(()=>{
+			player.Exit();
+			return false;
+		});
+
+		set_play_icon();
+		set_mute_icon();
+	}
+
+	public static void PlayFile(MediaFile mf){
+		var win = new MediaPlayerWindow(mf);
+		win.show_all();
+		win.Play();
+	}
+
+	public void init_ui_player(){
+		canvas = new Gtk.DrawingArea();
+		canvas.expand = true;
+		vboxMain.pack_start (canvas, true, true, 0);
+
+		canvas.realize.connect(() => {
+			player.WindowID = get_widget_xid(canvas);
+			player.StartPlayer();
+		});
+	}
+
+	public void init_ui_player_controls(){
+		var hboxControls = new Gtk.Box(Orientation.HORIZONTAL, 6);
+		hboxControls.margin = 6;
+		vboxMain.add(hboxControls);
+
+		//btnPlay
+		btnPlay = new Gtk.Button();
+		hboxControls.add(btnPlay);
+
+		btnPlay.clicked.connect(() => {
+			player.PauseToggle();
+			set_play_icon();
+		});
+
+		//btnMute
+		btnMute = new Gtk.Button();
+		hboxControls.add(btnMute);
+
+		btnMute.clicked.connect(() => {
+			if (player.IsMuted){
+				player.UnMute();
+			}
+			else{
+				player.Mute();
+			}
+			set_mute_icon();
+		});
+
+		//scalePos
+		scalePos = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 0, 1000, 1);
+		scalePos.adjustment.value = 0;
+		scalePos.has_origin = true;
+		scalePos.value_pos = PositionType.BOTTOM;
+		scalePos.hexpand = true;
+		scalePos.set_size_request(300,-1);
+		hboxControls.add(scalePos);
+
+		scalePos_value_changed_connect();
+		
+		scalePos.format_value.connect((val)=>{
+			return format_duration((long) (val * 1000)) + " / " + format_duration(mFile.Duration);
+		});
+
+		//scaleVolume
+		scaleVolume = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 0, 100, 1);
+		scaleVolume.adjustment.value = 70;
+		scaleVolume.has_origin = true;
+		scaleVolume.value_pos = PositionType.BOTTOM;
+		scaleVolume.hexpand = false;
+		scaleVolume.set_size_request(100,-1);
+		hboxControls.add(scaleVolume);
+
+		scaleVolume.value_changed.connect(()=>{
+			player.SetVolume((int)scaleVolume.adjustment.value);
+		});
+	}
+
+	private void scalePos_value_changed(){
+		player.Seek(scalePos.get_value());
+	}
+	
+	private void scalePos_value_changed_connect(){
+		scalePos.value_changed.connect(scalePos_value_changed);
+	}
+
+	private void scalePos_value_changed_disconnect(){
+		scalePos.value_changed.disconnect(scalePos_value_changed);
+	}
+	
+	private void set_play_icon(){
+		if (player.IsPaused){
+			btnPlay.set_tooltip_text (_("Play"));
+			btnPlay.image = get_shared_icon("", "media-playback-start.png", 24);
+		}
+		else{
+			btnPlay.set_tooltip_text (_("Pause"));
+			btnPlay.image = get_shared_icon("", "media-playback-pause.png", 24);
+		}
+		gtk_do_events();
+	}
+	
+	private void set_mute_icon(){
+		if (player.IsMuted){
+			btnMute.set_tooltip_text (_("Unmute"));
+			btnMute.image = get_shared_icon("", "audio-muted.svg", 24);
+		}
+		else{
+			btnMute.set_tooltip_text (_("Mute"));
+			btnMute.image = get_shared_icon("", "audio-high.svg", 24);
+		}
+		gtk_do_events();
+	}
+
+	protected void Play(){
+		canvas.set_size_request(mFile.SourceWidth, mFile.SourceHeight);
+		scalePos.adjustment.upper = (mFile.Duration/1000);
+		player.Open(mFile, false, false, true);
+		title = mFile.Name + " - Selene";
+		
+		status_timer_start();
+	}
+
+	private void status_timer_start(){
+		status_timer_stop();
+
+		tmr_status = Timeout.add(1000, status_timeout);
+	}
+
+	private void status_timer_stop(){
+		if (tmr_status > 0) {
+			Source.remove(tmr_status);
+			tmr_status = 0;
+		}
+	}
+	
+	private bool status_timeout(){
+		status_timer_stop();
+
+		scalePos_value_changed_disconnect();
+		scalePos.adjustment.value = (int) player.Position;
+		scalePos_value_changed_connect();
+
+		set_play_icon();
+		set_mute_icon();
+
+		gtk_do_events();
+
+		status_timer_start();
+		return true;
+	}
+}

selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/ScriptFile.vala Added

selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/SimpleProgressWindow.vala Added

@@ -0,0 +1,200 @@
+/*
+ * SimpleProgressWindow.vala
+ *
+ * Copyright 2015 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 Gee;
+
+using TeeJee.Logging;
+using TeeJee.FileSystem;
+using TeeJee.JSON;
+using TeeJee.ProcessManagement;
+using TeeJee.GtkHelper;
+using TeeJee.Multimedia;
+using TeeJee.System;
+using TeeJee.Misc;
+
+public class SimpleProgressWindow : Gtk.Window {
+	private Gtk.Box vbox_main;
+	private Gtk.Spinner spinner;
+	private Gtk.Label lbl_msg;
+	private Gtk.Label lbl_status;
+	private ProgressBar progressbar;
+	
+	private uint tmr_init = 0;
+	private uint tmr_pulse = 0;
+	private uint tmr_close = 0;
+	private int def_width = 400;
+	private int def_height = 50;
+
+	private string status_message;
+	// init
+	
+	public SimpleProgressWindow.with_parent(Gtk.Window parent, string message) {
+		set_transient_for(parent);
+		set_modal(true);
+		set_skip_taskbar_hint(true);
+		set_skip_pager_hint(true);
+		window_position = WindowPosition.CENTER;
+
+		App.status_line = "";
+		App.progress_count = 0;
+		App.progress_total = 0;
+		
+		status_message = message;
+
+		init_window();
+	}
+
+	public void init_window () {
+		title = "";
+		icon = get_app_icon(16);
+		resizable = false;
+		deletable = false;
+		
+		//vbox_main
+		vbox_main = new Gtk.Box(Orientation.VERTICAL, 6);
+		vbox_main.margin = 6;
+		vbox_main.set_size_request (def_width, def_height);
+		add (vbox_main);
+
+		var hbox_status = new Gtk.Box (Orientation.HORIZONTAL, 3);
+		hbox_status.margin_top = 6;
+		vbox_main.add (hbox_status);
+		
+		spinner = new Gtk.Spinner();
+		spinner.active = true;
+		hbox_status.add(spinner);
+
+		//lbl_msg
+		lbl_msg = new Gtk.Label (status_message);
+		lbl_msg.halign = Align.START;
+		lbl_msg.ellipsize = Pango.EllipsizeMode.END;
+		lbl_msg.max_width_chars = 50;
+		lbl_msg.margin_bottom = 3;
+		lbl_msg.margin_left = 3;
+		lbl_msg.margin_right = 3;
+		hbox_status.add (lbl_msg);
+
+		//progressbar
+		progressbar = new Gtk.ProgressBar();
+		progressbar.margin_bottom = 3;
+		progressbar.margin_left = 3;
+		progressbar.margin_right = 3;
+		//progressbar.set_size_request(-1, 25);
+		progressbar.pulse_step = 0.1;
+		vbox_main.pack_start (progressbar, false, true, 0);
+
+		//lbl_status
+		lbl_status = new Gtk.Label ("");
+		lbl_status.halign = Align.START;
+		lbl_status.ellipsize = Pango.EllipsizeMode.END;
+		lbl_status.max_width_chars = 50;
+		lbl_status.margin_bottom = 3;
+		lbl_status.margin_left = 3;
+		lbl_status.margin_right = 3;
+		vbox_main.pack_start (lbl_status, false, true, 0);
+	}
+
+	// common
+
+	public void pulse_start(){
+		tmr_pulse = Timeout.add(100, pulse_timeout);
+	}
+
+	private bool pulse_timeout(){
+		if (tmr_pulse > 0) {
+			Source.remove(tmr_pulse);
+			tmr_pulse = 0;
+		}
+			
+		progressbar.pulse();
+		gtk_do_events();
+
+		tmr_pulse = Timeout.add(100, pulse_timeout);
+		return true;
+	}
+	
+	public void pulse_stop(){
+		if (tmr_pulse > 0) {
+			Source.remove(tmr_pulse);
+			tmr_pulse = 0;
+		}
+	}
+
+	public void update_message(string msg){
+		if (msg.length > 0){
+			lbl_msg.label = msg;
+		}
+	}
+
+	public void update_status_line(bool clear = false){
+		if (clear){
+			lbl_status.label = "";
+		}
+		else{
+			lbl_status.label = App.status_line;
+		}
+	}
+	
+	public void update_progressbar(){
+		double fraction = App.progress_count / (App.progress_total * 1.0);
+		if (fraction > 1.0){
+			fraction = 1.0;
+		}
+		progressbar.fraction = fraction;
+		gtk_do_events();
+	}
+	
+	public void finish(string message = "") {
+		pulse_stop();
+		progressbar.fraction = 1.0;
+		
+		lbl_msg.label = message;
+		lbl_status.label = "";
+		
+		spinner.visible = false;
+		
+		gtk_do_events();
+		auto_close_window();
+	}
+
+	private void auto_close_window() {
+		tmr_close = Timeout.add(2000, ()=>{
+			if (tmr_init > 0) {
+				Source.remove(tmr_init);
+				tmr_init = 0;
+			}
+
+			this.close();
+			return false;
+		});
+	}
+	
+	public void sleep(int ms){
+		Thread.usleep ((ulong) ms * 1000);
+		gtk_do_events();
+	}
+}
+
+

selene_16.2.1~226~ubuntu16.04.1.tar.xz/src/Utility.vala -> selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/Utility.vala Changed

@@ -173,6 +173,10 @@
 		return File.new_for_path(filePath).get_basename();
 	}
 
+	public string file_path_escape_quotes(string filePath){
+		return filePath.replace("'","'\\''");
+	}
+	
 	public bool file_exists (string filePath){
 
 		/* Check if file exists */
@@ -1037,7 +1041,6 @@
 
 		return img_icon;
 	}
-
 }
 
 namespace TeeJee.Multimedia{
@@ -1278,45 +1281,48 @@
 		*/
 
 		string path;
+		string args = "'%s'".printf(file_path_escape_quotes(dir_path));
 
+		log_msg("xdg-open " + args);
+		
 		if (xdg_open_try_first){
 			//try using xdg-open
 			path = get_cmd_path ("xdg-open");
 			if ((path != null)&&(path != "")){
-				return execute_command_script_async ("xdg-open \"" + dir_path + "\"");
+				return execute_command_script_async ("xdg-open " + args);
 			}
 		}
 
 		path = get_cmd_path ("nemo");
 		if ((path != null)&&(path != "")){
-			return execute_command_script_async ("nemo \"" + dir_path + "\"");
+			return execute_command_script_async ("nemo " + args);
 		}
 
 		path = get_cmd_path ("nautilus");
 		if ((path != null)&&(path != "")){
-			return execute_command_script_async ("nautilus \"" + dir_path + "\"");
+			return execute_command_script_async ("nautilus " + args);
 		}
 
 		path = get_cmd_path ("thunar");
 		if ((path != null)&&(path != "")){
-			return execute_command_script_async ("thunar \"" + dir_path + "\"");
+			return execute_command_script_async ("thunar " + args);
 		}
 
 		path = get_cmd_path ("pantheon-files");
 		if ((path != null)&&(path != "")){
-			return execute_command_script_async ("pantheon-files \"" + dir_path + "\"");
+			return execute_command_script_async ("pantheon-files " + args);
 		}
 
 		path = get_cmd_path ("marlin");
 		if ((path != null)&&(path != "")){
-			return execute_command_script_async ("marlin \"" + dir_path + "\"");
+			return execute_command_script_async ("marlin " + args);
 		}
 
 		if (xdg_open_try_first == false){
 			//try using xdg-open
 			path = get_cmd_path ("xdg-open");
 			if ((path != null)&&(path != "")){
-				return execute_command_script_async ("xdg-open \"" + dir_path + "\"");
+				return execute_command_script_async ("xdg-open " + args);
 			}
 		}
 
@@ -1328,15 +1334,16 @@
 		/* Tries to open the given text file in a text editor */
 
 		string path;
-
+		string args = "'%s'".printf(file_path_escape_quotes(txt));
+		
 		path = get_cmd_path ("exo-open");
 		if ((path != null)&&(path != "")){
-			return execute_command_script_async ("exo-open \"" + txt + "\"");
+			return execute_command_script_async ("exo-open " + args);
 		}
 
 		path = get_cmd_path ("gedit");
 		if ((path != null)&&(path != "")){
-			return execute_command_script_async ("gedit --new-document \"" + txt + "\"");
+			return execute_command_script_async ("gedit --new-document " + args);
 		}
 
 		return false;
@@ -1483,7 +1490,9 @@
 		}
 	}
 
-
+	public void sleep(int milliseconds){
+		Thread.usleep ((ulong) milliseconds * 1000);
+	}
 }
 
 namespace TeeJee.Misc {

selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/XidHelper.vala Added

@@ -0,0 +1,33 @@
+/*
+ * XidHelper.vala
+ *
+ * Copyright 2016 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.
+ *
+ *
+ */
+
+
+/*
+This code needs to be in a separate .vala file to avoid build errors with the vala compiler
+*/
+
+using Gtk;
+
+public uint get_widget_xid(Gtk.Widget widget){
+	return (uint) (((Gdk.X11.Window) widget.get_window()).get_xid());
+}
\ No newline at end of file

selene_16.2.1~226~ubuntu16.04.1.tar.xz/src/makefile -> selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/makefile Changed

@@ -11,7 +11,8 @@
 
 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" "CustomMessageDialog.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,/usr/share/${app_name}/libs "Main.vala" "Utility.vala" "MainWindow.vala" "AppConfigWindow.vala" "EncoderConfigWindow.vala" "EncoderStatusWindow.vala" "FileInfoWindow.vala" "AboutWindow.vala" "DonationWindow.vala" "CustomMessageDialog.vala" "SimpleProgressWindow.vala" "ColumnSelectionDialog.vala" "CropVideoSingleWindow.vala" "CropVideoBatchWindow.vala" "MediaFile.vala" "MediaPlayer.vala" "ScriptFile.vala" "MediaPlayerWindow.vala" "XidHelper.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 --pkg gdk-x11-3.0
+	#--pkg gdk-x11-3.0
 
 	#valac -X -D'GETTEXT_PACKAGE=ffmpeg-builder' --Xcc="-lm" -X -Wl,-rpath,/usr/share/${app_name}/libs "Main.vala" "Utility.vala" "FFmpegBuilder.vala" "CustomMessageDialog.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 --pkg libvte

selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/share/selene/images/audio-high.svg Added

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="22"
+   height="24"
+   id="svg4431"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="audio-volume-high-panel.svg"
+   sodipodi:version="0.32"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata16">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1280"
+     inkscape:window-height="753"
+     id="namedview14"
+     showgrid="false"
+     inkscape:zoom="6.7850896"
+     inkscape:cx="-30.743913"
+     inkscape:cy="11"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4431"
+     showborder="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2995"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4433">
+    <linearGradient
+       id="linearGradient3587-6-5">
+      <stop
+         id="stop3589-9-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5"
+       id="linearGradient2390"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.7805424,-0.73368357,0,28.208675,-36.749634)"
+       x1="50.925655"
+       y1="11.648451"
+       x2="73.986542"
+       y2="11.648451" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5"
+       id="linearGradient2393"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-2,-2.384186e-8)"
+       x1="9"
+       y1="3"
+       x2="9"
+       y2="21" />
+  </defs>
+  <path
+     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1.70000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3209-0"
+     d="m 16.632893,5.85 c 0,0 2.517107,2.422712 2.517107,7.634915 0,5.18658 -2.521378,7.665085 -2.521378,7.665085 M 13.767856,8.095476 c 0,0 1.777264,1.744801 1.714032,5.404524 -0.06376,3.690079 -1.742577,5.404524 -1.742577,5.404524 M 10.85,10.221859 c 0,0 0.947187,0.794985 0.971329,3.230647 C 11.845176,15.857803 10.85,16.778141 10.85,16.778141"
+     inkscape:connector-curvature="0" />
+  <path
+     style="opacity:0.6;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+     id="path2387-4"
+     d="m 2,11 0,5 2,0 4,4 0,-13 -4,4 -2,0 z"
+     inkscape:connector-curvature="0" />
+  <path
+     style="opacity:0.7;fill:url(#linearGradient2393);fill-opacity:1;fill-rule:evenodd;stroke:none"
+     id="path2387"
+     d="m 2,10 0,5 2,0 4,4 0,-13 -4,4 -2,0 z"
+     inkscape:connector-curvature="0" />
+  <path
+     style="opacity:0.7;fill:none;stroke:url(#linearGradient2390);stroke-width:1.70000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3209"
+     d="m 16.632893,4.85 c 0,0 2.517107,2.422712 2.517107,7.634915 0,5.18658 -2.521378,7.665085 -2.521378,7.665085 M 13.767856,7.095476 c 0,0 1.777264,1.744801 1.714032,5.404524 -0.06376,3.690079 -1.742577,5.404524 -1.742577,5.404524 M 10.85,9.221859 c 0,0 0.947187,0.794985 0.971329,3.230647 C 11.845176,14.857803 10.85,15.778141 10.85,15.778141"
+     inkscape:connector-curvature="0" />
+</svg>

selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/share/selene/images/audio-muted.svg Added

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="22"
+   height="24"
+   id="svg4431"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="audio-output-none-panel.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata16">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="753"
+     inkscape:window-width="1280"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showgrid="false"
+     inkscape:zoom="11.168499"
+     inkscape:cx="27.460538"
+     inkscape:cy="15.036144"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:current-layer="svg4431"
+     inkscape:window-maximized="1" />
+  <defs
+     id="defs4433">
+    <linearGradient
+       id="linearGradient3587-6-5">
+      <stop
+         id="stop3589-9-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="9"
+       y1="3"
+       x2="9"
+       y2="21"
+       id="linearGradient2393"
+       xlink:href="#linearGradient3587-6-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,0)" />
+  </defs>
+  <g
+     id="g3272"
+     style="opacity:0.4"
+     transform="translate(-1,0)">
+    <path
+       d="m 3,11 0,5 2,0 4,4 0,-13 -4,4 -2,0 z m 8,2 c 0.666667,0 1.333333,0 2,0 0,0.333333 0,0.666667 0,1 -0.666667,0 -1.333333,0 -2,0 0,-0.333333 0,-0.666667 0,-1 z m 8,0 c 0.666667,0 1.333333,0 2,0 0,0.333333 0,0.666667 0,1 -0.666667,0 -1.333333,0 -2,0 0,-0.333333 0,-0.666667 0,-1 z m -4,0 c 0.666667,0 1.333333,0 2,0 0,0.333333 0,0.666667 0,1 -0.666667,0 -1.333333,0 -2,0 0,-0.333333 0,-0.666667 0,-1 z"
+       id="path2387-4"
+       style="opacity:0.6;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 3,10 0,5 2,0 4,4 0,-13 -4,4 -2,0 z m 8,2 c 0.666667,0 1.333333,0 2,0 0,0.333333 0,0.666667 0,1 -0.666667,0 -1.333333,0 -2,0 0,-0.333333 0,-0.666667 0,-1 z m 8,0 c 0.666667,0 1.333333,0 2,0 0,0.333333 0,0.666667 0,1 -0.666667,0 -1.333333,0 -2,0 0,-0.333333 0,-0.666667 0,-1 z m -4,0 c 0.666667,0 1.333333,0 2,0 0,0.333333 0,0.666667 0,1 -0.666667,0 -1.333333,0 -2,0 0,-0.333333 0,-0.666667 0,-1 z"
+       id="path2387"
+       style="opacity:0.8;fill:url(#linearGradient2393);fill-opacity:1;fill-rule:evenodd;stroke:none"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>

selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/share/selene/images/media-playback-pause.png Added

selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/share/selene/images/media-playback-start.png Added

selene_16.2.1~226~ubuntu16.04.1.tar.xz/src/share/selene/images/video.svg -> selene_16.2.4~246~ubuntu16.04.1.tar.xz/src/share/selene/images/video.svg Changed

@@ -1,376 +1,459 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
    version="1.0"
-   sodipodi:docname="video-x-generic.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   width="48"
+   height="48"
+   id="svg4018">
   <defs
-     id="defs4">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient2547"
+     id="defs4020">
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         id="stop5050"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop5056"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop5052"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507"
+       id="linearGradient2467"
+       xlink:href="#linearGradient5048"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       gradientTransform="matrix(6.7324884e-2,0,0,1.4700216e-2,-0.3411391,37.040146)" />
+    <radialGradient
        cx="605.71429"
        cy="486.64789"
+       r="117.14286"
        fx="605.71429"
        fy="486.64789"
-       r="117.14286" />
+       id="radialGradient2464"
+       xlink:href="#linearGradient5060"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.3039943e-2,0,0,1.4700216e-2,21.62311,37.040176)" />
     <linearGradient
-       id="linearGradient5060"
-       inkscape:collect="always">
+       id="linearGradient5060">
       <stop
          id="stop5062"
-         offset="0"
-         style="stop-color:black;stop-opacity:1;" />
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
       <stop
          id="stop5064"
-         offset="1"
-         style="stop-color:black;stop-opacity:0;" />
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient2545"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
        cx="605.71429"
        cy="486.64789"
+       r="117.14286"
        fx="605.71429"
        fy="486.64789"
-       r="117.14286" />
+       id="radialGradient2461"
+       xlink:href="#linearGradient5060"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.3039948e-2,0,0,1.4700216e-2,26.360882,37.040176)" />
     <linearGradient
-       id="linearGradient5048">
-      <stop
-         id="stop5050"
-         offset="0"
-         style="stop-color:black;stop-opacity:0;" />
+       id="linearGradient2490">
       <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0.5"
-         id="stop5056" />
+         id="stop2492"
+         style="stop-color:#2e4a5a;stop-opacity:1"
+         offset="0" />
       <stop
-         id="stop5052"
-         offset="1"
-         style="stop-color:black;stop-opacity:0;" />
+         id="stop2494"
+         style="stop-color:#6e8796;stop-opacity:1"
+         offset="1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient2543"
+       x1="-51.786404"
+       y1="53.623615"
+       x2="-51.786404"
+       y2="2.9062471"
+       id="linearGradient2458"
+       xlink:href="#linearGradient2490"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
+       gradientTransform="matrix(0.8074968,0,0,0.8948322,59.410232,-2.9805533)" />
+    <linearGradient
+       id="linearGradient3993">
+      <stop
+         id="stop3995"
+         style="stop-color:#a3c0d0;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4001"
+         style="stop-color:#427da1;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient259"
-       id="radialGradient3239"
+       cx="14.76559"
+       cy="10.898237"
+       r="18.000002"
+       fx="14.76559"
+       fy="10.898237"
+       id="radialGradient2456"
+       xlink:href="#linearGradient3993"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4949305,0,0,0.5336295,0.1113962,-0.3686884)"
-       cx="33.966679"
-       cy="35.736916"
-       fx="33.966679"
-       fy="35.736916"
-       r="86.70845" />
+       gradientTransform="matrix(-2.2703142e-8,2.1357283,-3.5601359,-3.7844828e-8,54.620625,-24.438287)" />
+    <radialGradient
+       cx="102"
+       cy="112.3047"
+       r="139.55859"
+       id="XMLID_8_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop41"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop47"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0.18851049" />
+      <stop
+         id="stop49"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="0.25718147" />
+      <stop
+         id="stop51"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="102"
+       cy="112.3047"
+       r="139.55859"
+       id="radialGradient2453"
+       xlink:href="#XMLID_8_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3617022,0,0,-0.3907784,0.8510637,47.517004)" />
+    <linearGradient
+       x1="16.745687"
+       y1="46.132927"
+       x2="16.745687"
+       y2="1.4097958"
+       id="linearGradient3864"
+       xlink:href="#linearGradient3582"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9383184,0,0,0.9679388,0.547213,-0.6596499)" />
+    <linearGradient
+       x1="-22.539846"
+       y1="11.109024"
+       x2="-22.539846"
+       y2="46.263954"
+       id="linearGradient3862"
+       xlink:href="#linearGradient3932"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8774069,0,0,1.0044796,44.19332,-1.5805958)" />
     <linearGradient
-       id="linearGradient259">
+       id="linearGradient3582">
       <stop
-         id="stop260"
-         offset="0"
-         style="stop-color:#828282;stop-opacity:1;" />
+         id="stop3584"
+         style="stop-color:#333333;stop-opacity:1"
+         offset="0" />
       <stop
-         id="stop261"
-         offset="1"
-         style="stop-color:#434343;stop-opacity:1;" />
+         id="stop3586"
+         style="stop-color:#5a5a5a;stop-opacity:1"
+         offset="1" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient259"
-       id="radialGradient3236"
+    <linearGradient
+       x1="16.745687"
+       y1="46.132927"
+       x2="16.745687"
+       y2="1.4097958"
+       id="linearGradient3859"
+       xlink:href="#linearGradient3582"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9472413,0,0,0.9707629,2.0424825,-0.7943462)" />
+    <linearGradient
+       id="linearGradient3932">
+      <stop
+         id="stop3934"
+         style="stop-color:#828282;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3936"
+         style="stop-color:#434343;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-22.539846"
+       y1="11.109024"
+       x2="-22.539846"
+       y2="46.263954"
+       id="linearGradient3857"
+       xlink:href="#linearGradient3932"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4568944,0,0,0.5332867,1.7561321,-0.3677758)"
-       cx="33.966679"
-       cy="35.736916"
-       fx="33.966679"
-       fy="35.736916"
-       r="86.70845" />
+       gradientTransform="matrix(0.8857506,0,0,1.0074102,46.103643,-1.717979)" />
     <linearGradient
-       id="linearGradient3522">
+       id="linearGradient3211">
       <stop
-         style="stop-color:#81aac3;stop-opacity:1;"
-         offset="0"
-         id="stop3524" />
+         id="stop3213"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
       <stop
-         style="stop-color:#4e82a3;stop-opacity:1;"
-         offset="1"
-         id="stop3526" />
+         id="stop3215"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3522"
-       id="linearGradient3233"
+       x1="24"
+       y1="1.9999999"
+       x2="24"
+       y2="46.01725"
+       id="linearGradient2450"
+       xlink:href="#linearGradient3211"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0407062,0,0,0.9903846,-0.2996983,0.556229)"
-       x1="12.872127"
-       y1="5.0561161"
-       x2="12.872127"
-       y2="18.911581" />
+       gradientTransform="matrix(1,0,0,0.9777778,0,-0.9666693)" />
+    <filter
+       height="1.3286875"
+       y="-0.16434373"
+       width="1.2969251"
+       x="-0.14846256"
+       id="filter3212">
+      <feGaussianBlur
+         id="feGaussianBlur3214"
+         stdDeviation="0.77391625"
+         inkscape:collect="always" />
+    </filter>
+    <linearGradient
+       id="linearGradient8589">
+      <stop
+         id="stop8591"
+         style="stop-color:#fefefe;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop8593"
+         style="stop-color:#cbcbcb;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="32.892288"
+       y1="8.0590115"
+       x2="36.358372"
+       y2="5.4565363"
+       id="linearGradient2441"
+       xlink:href="#linearGradient8589"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9976985,0,0,1.0406866,0.1638029,-1.1057939)" />
+    <linearGradient
+       id="linearGradient4267">
+      <stop
+         id="stop4269"
+         style="stop-color:#c4c4c4;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4271"
+         style="stop-color:#c4c4c4;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="35.516502"
+       y1="4.8577352"
+       x2="34.102982"
+       y2="6.5436172"
+       id="linearGradient2438"
+       xlink:href="#linearGradient4267"
+       gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10.375"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="640"
-     inkscape:window-height="720"
-     inkscape:window-x="800"
-     inkscape:window-y="24" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
      id="layer1">
-    <g
-       transform="matrix(1.1327628e-2,0,0,6.2714644e-3,22.575195,21.94509)"
-       id="g5022"
-       style="display:inline">
-      <rect
-         style="opacity:0.40206185;fill:url(#linearGradient2543);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect4173"
-         width="1339.6335"
-         height="478.35718"
-         x="-1559.2523"
-         y="-150.69685" />
-      <path
-         style="opacity:0.40206185;fill:url(#radialGradient2545);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z"
-         id="path5058"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path5018"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z"
-         style="opacity:0.40206185;fill:url(#radialGradient2547);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    </g>
+    <rect
+       width="32.508301"
+       height="3.5700529"
+       x="7.7378473"
+       y="42.429947"
+       id="rect2879"
+       style="opacity:0.3;fill:url(#linearGradient2467);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
     <path
-       style="display:block;fill:url(#radialGradient3239);fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;overflow:visible"
-       d="M 6.7690983,22.47398 C 5.7244947,22.47398 4.6798914,22.47398 3.635288,22.47398 C 3.3813856,22.225642 3.5744558,21.732588 3.5141283,21.381015 C 3.5141283,14.794278 3.5141283,8.2075405 3.5141283,1.6208033 L 3.5495373,1.5355087 L 3.635288,1.5002882 L 3.635288,1.5002882 C 4.7225072,1.5002882 5.6392629,1.5002882 6.7264822,1.5002882"
-       id="path3385" />
+       d="M 7.7378475,42.430102 C 7.7378475,42.430102 7.7378475,45.999958 7.7378475,45.999958 C 6.5513473,46.006679 4.869468,45.200135 4.869468,44.2148 C 4.869468,43.229467 6.1935126,42.430103 7.7378475,42.430102 z"
+       id="path2881"
+       style="opacity:0.3;fill:url(#radialGradient2464);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
     <path
-       style="display:block;fill:url(#radialGradient3236);fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;overflow:visible"
-       d="M 18.499999,1.5000005 C 19.463514,1.5000005 20.422911,1.5000005 21.375107,1.5000005 C 21.609499,1.7481797 21.431265,2.2409175 21.486956,2.5922646 C 21.486956,9.1747721 21.495164,15.70097 21.495164,22.283478 C 21.495164,22.573407 21.028681,22.48838 20.472591,22.48838 C 19.823127,22.48838 19.173663,22.460226 18.5242,22.460226"
-       id="rect15391"
-       sodipodi:nodetypes="cccccc" />
-    <rect
-       style="display:inline;fill:url(#linearGradient3233);fill-opacity:1;stroke:#333333;stroke-width:0.99999994000000003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3457"
-       width="11.999999"
-       height="21"
-       x="6.4999995"
-       y="1.5"
-       rx="0"
-       ry="0" />
+       d="M 40.246148,42.430102 C 40.246148,42.430102 40.246148,45.999958 40.246148,45.999958 C 41.432648,46.006679 43.114528,45.200135 43.114528,44.2148 C 43.114528,43.229467 41.790483,42.430103 40.246148,42.430102 z"
+       id="path2883"
+       style="opacity:0.3;fill:url(#radialGradient2461);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
     <path
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#333333;stroke-width:0.99999994000000003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 6.5,11.5 L 18.501874,11.5"
-       id="path3460" />
-    <g
-       id="g2547"
-       transform="matrix(0.9359974,0,0,1.0449527,0.3671035,-8.8545943e-2)"
-       style="display:inline;stroke-width:0.99938755999999995;stroke-miterlimit:4;stroke-dasharray:none">
-      <rect
-         y="2.0974374"
-         x="4.3610935"
-         height="0.89926022"
-         width="1"
-         id="rect3464"
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99938756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         y="4.0987401"
-         x="4.3610935"
-         height="0.89926022"
-         width="1"
-         id="rect3466"
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99938756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         y="6.1000419"
-         x="4.3610935"
-         height="0.89926022"
-         width="1"
-         id="rect3468"
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99938756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         y="8.1013441"
-         x="4.3610935"
-         height="0.89926022"
-         width="1"
-         id="rect3470"
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99938756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         y="10.102646"
-         x="4.3610935"
-         height="0.89926022"
-         width="1"
-         id="rect3472"
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99938756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         y="12.103948"
-         x="4.3610935"
-         height="0.89926022"
-         width="1"
-         id="rect3474"
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99938756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         y="14.105249"
-         x="4.3610935"
-         height="0.89926022"
-         width="1"
-         id="rect3476"
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99938756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         y="16.106552"
-         x="4.3610935"
-         height="0.89926022"
-         width="1"
-         id="rect3478"
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99938756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         y="18.107853"
-         x="4.3610935"
-         height="0.89926022"
-         width="1"
-         id="rect3480"
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99938756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         y="20.109156"
-         x="4.3610935"
-         height="0.89926022"
-         width="1"
-         id="rect3482"
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99938756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    </g>
+       d="M 6.4999609,0.49719878 C 14.520256,0.49719878 22.540551,0.49719878 30.560847,0.49719878 C 31.086081,2.4573984 36.693941,7.3488015 41.500042,10.123605 C 41.500042,21.583338 41.500042,33.04307 41.500042,44.502803 C 29.833348,44.502803 18.166655,44.502803 6.4999609,44.502803 C 6.4999609,29.834268 6.4999609,15.165733 6.4999609,0.49719878 z"
+       id="path4160"
+       style="fill:url(#radialGradient2456);fill-opacity:1;stroke:url(#linearGradient2458);stroke-width:0.99992186;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
+    <path
+       d="M 7.3617017,44 C 7.1624047,44 6.9999997,43.824541 6.9999997,43.60922 L 6.9999997,1.4051701 C 6.9999997,1.1894613 7.1624047,1.0143926 7.3617017,1.0143926 C 14.844793,1.1224073 23.137385,0.85281757 30.611384,1.0412872 L 40.894021,9.9073127 L 41,43.60922 C 41,43.824541 40.837957,44 40.638297,44 L 7.3617017,44 z"
+       id="path4191"
+       style="opacity:0.05;fill:url(#radialGradient2453);fill-opacity:1" />
+    <path
+       d="M 13.4815,22.518499 L 36.518497,22.481337"
+       id="path3460"
+       style="fill:none;fill-rule:evenodd;stroke:#464646;stroke-width:0.96299994;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 13.481499,23.5185 L 36.518498,23.481336"
+       id="path4720"
+       style="opacity:0.3;fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.96299994;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 12.434759,0.48667906 C 12.434759,3.0972193 12.513321,42.403873 12.513321,44.513322 C 10.587577,44.513322 8.66183,44.513322 6.736085,44.513322 C 6.26801,43.992022 6.62394,42.957035 6.512726,42.219038 C 6.512726,28.392575 6.512726,14.566115 6.512726,0.73965718 L 6.578002,0.56061163 L 6.736085,0.48667906 L 6.736085,0.48667906 C 8.740394,0.48667906 10.430451,0.48667906 12.434759,0.48667906 z"
+       id="path3489"
+       style="fill:url(#linearGradient3862);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3864);stroke-width:0.97335809;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+    <path
+       d="M 35.537771,44.481459 C 35.537771,42.165026 35.488978,7.9059948 35.488978,5.4889783 C 37.136409,7.8376445 40.56063,8.5612951 41.511019,10.365826 C 41.51102,21.653186 41.511022,32.940544 41.511022,44.227906 C 41.046345,44.759249 40.123787,44.355209 39.465945,44.481459 C 38.156554,44.481459 36.847161,44.481459 35.537771,44.481459 z"
+       id="path4696"
+       style="fill:url(#linearGradient3857);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3859);stroke-width:0.97795641;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
+    <rect
+       width="3"
+       height="2"
+       x="8.000001"
+       y="4.0000038"
+       id="rect3464"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.3082948;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       width="3"
+       height="2"
+       x="8.000001"
+       y="8.0000038"
+       id="rect3466"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.3082948;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       width="3"
+       height="2"
+       x="8.000001"
+       y="12.000004"
+       id="rect3468"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.3082948;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       width="3"
+       height="2"
+       x="8.000001"
+       y="16.000004"
+       id="rect3470"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.3082948;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       width="3"
+       height="2"
+       x="8.000001"
+       y="20.000004"
+       id="rect3472"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.3082948;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       width="3"
+       height="2"
+       x="8.000001"
+       y="24.000004"
+       id="rect3474"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.3082948;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       width="3"
+       height="2"
+       x="8.000001"
+       y="28.000004"
+       id="rect3476"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.3082948;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       width="3"
+       height="2"
+       x="8.000001"
+       y="32.000004"
+       id="rect3478"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.3082948;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       width="3"
+       height="2"
+       x="8.000001"
+       y="36.000004"
+       id="rect3480"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.3082948;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       width="3"
+       height="2"
+       x="8.000001"
+       y="40"
+       id="rect3482"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.3082948;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     <g
-       id="g2559"
-       transform="matrix(0.9359974,0,0,1.0449527,15.530262,-8.8545943e-2)"
-       style="display:inline;stroke-width:0.99938755999999995;stroke-miterlimit:4;stroke-dasharray:none">
-      <rect
-         y="2.0974374"
-         x="4.3610935"
-         height="0.89926022"
-         width="1"
-         id="rect2561"
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99938756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+       transform="matrix(1.2089381,0,0,0.951907,-8.5145145,-0.3275072)"
+       id="g4684"
+       style="stroke-width:0.91853887;stroke-miterlimit:4;stroke-dasharray:none">
       <rect
-         y="4.0987401"
-         x="4.3610935"
-         height="0.89926022"
-         width="1"
-         id="rect2563"
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99938756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         y="6.1000419"
-         x="4.3610935"
-         height="0.89926022"
-         width="1"
+         width="2.4815166"
+         height="1.9643654"
+         x="37.648342"
+         y="11.899804"
          id="rect2565"
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99938756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.91853887;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <rect
-         y="8.1013441"
-         x="4.3610935"
-         height="0.89926022"
-         width="1"
+         width="2.4815166"
+         height="1.9643654"
+         x="37.648342"
+         y="16.271496"
          id="rect2567"
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99938756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.91853887;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <rect
-         y="10.102646"
-         x="4.3610935"
-         height="0.89926022"
-         width="1"
+         width="2.4815166"
+         height="1.9643654"
+         x="37.648342"
+         y="20.643188"
          id="rect2569"
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99938756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.91853887;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <rect
-         y="12.103948"
-         x="4.3610935"
-         height="0.89926022"
-         width="1"
+         width="2.4815166"
+         height="1.9643654"
+         x="37.648342"
+         y="25.014879"
          id="rect2571"
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99938756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.91853887;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <rect
-         y="14.105249"
-         x="4.3610935"
-         height="0.89926022"
-         width="1"
+         width="2.4815166"
+         height="1.9643654"
+         x="37.648342"
+         y="29.38657"
          id="rect2573"
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99938756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.91853887;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <rect
-         y="16.106552"
-         x="4.3610935"
-         height="0.89926022"
-         width="1"
+         width="2.4815166"
+         height="1.9643654"
+         x="37.648342"
+         y="33.758263"
          id="rect2575"
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99938756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.91853887;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <rect
-         y="18.107853"
-         x="4.3610935"
-         height="0.89926022"
-         width="1"
+         width="2.4815166"
+         height="1.9643654"
+         x="37.648342"
+         y="38.129951"
          id="rect2577"
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99938756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.91853887;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <rect
-         y="20.109156"
-         x="4.3610935"
-         height="0.89926022"
-         width="1"
+         width="2.4815166"
+         height="1.9643654"
+         x="37.648342"
+         y="42.501644"
          id="rect2579"
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99938756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.91853887;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
     <path
-       style="display:block;opacity:0.36637932000000001;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;overflow:visible"
-       d="M 7.5,12.5 C 10.833178,12.5 14.166355,12.5 17.499531,12.5"
-       id="path4015"
-       sodipodi:nodetypes="cc" />
+       d="M 40.500039,10.258811 C 40.500039,21.207848 40.500039,32.573221 40.500039,43.522258 C 29.500013,43.522258 18.499987,43.522258 7.4999609,43.522258 C 7.4999609,29.507417 7.4999609,15.492577 7.4999609,1.4777367 C 15.061954,1.4777367 22.804295,1.4777367 30.366289,1.4777367"
+       id="path2435"
+       style="opacity:0.4;fill:none;fill-opacity:1;stroke:url(#linearGradient2450);stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
+    <path
+       d="M 28.617256,0.92125832 C 32.899778,0.92125832 30.770506,9.4044296 30.770506,9.4044296 C 30.770506,9.4044296 41.128148,7.6020829 41.128148,12.223174 C 41.128148,9.6134507 29.825844,1.4945784 28.617256,0.92125832 z"
+       id="path12038"
+       style="opacity:0.4;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;filter:url(#filter3212)" />
+    <path
+       d="M 28.617256,0.92125832 C 31.803749,0.92125832 30.953016,8.5831368 30.953016,8.5831368 C 30.953016,8.5831368 41.128148,7.6020829 41.128148,12.223174 C 41.128148,11.097235 41.214061,10.290929 40.994371,9.9395812 C 39.416058,7.4154025 32.881194,1.7511811 30.41941,1.008793 C 30.235188,0.95323837 29.544367,0.92125832 28.617256,0.92125832 z"
+       id="path4474"
+       style="fill:url(#linearGradient2441);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
     <path
-       style="display:block;opacity:0.36637932000000001;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;overflow:visible"
-       d="M 7.5,2.5 C 10.833178,2.5 14.166355,2.5 17.499531,2.5"
-       id="path4017"
-       sodipodi:nodetypes="cc" />
+       d="M 30.560847,0.5 C 31.96778,0.9746531 39.526301,6.3794034 41.500042,10.123605 C 41.500042,21.583338 41.500042,10.949143 41.500042,22.408876 C 1.0542159,38.137806 6.2643971,0.5 30.560847,0.5 z"
+       id="path4238"
+       style="fill:none;fill-opacity:1;stroke:url(#linearGradient2438);stroke-width:0.99992186;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
   </g>
 </svg>