[SCM] gmusicbrowser/master: Merge tag 'upstream/1.1.11'
noskcaj-guest at users.alioth.debian.org
noskcaj-guest at users.alioth.debian.org
Thu Jan 23 20:42:08 UTC 2014
Imported Upstream version 1.1.11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 79bf7bd788f70bc7a9006af13ad28ec7f2cb0f93
X-Git-Newrev: 7756e44415dccbbc9b2afc75709e9464a18235fa
The following commit has been merged in the master branch:
commit 53b7087963ae966a2cd5b63543186b1b6d228260
Merge: 79bf7bd788f70bc7a9006af13ad28ec7f2cb0f93 a58997692944f6aa2400134e306a0fac1709422f
Author: Jackson Doak (Noskcaj) <noskcaj at ubuntu.com>
Date: Fri Jan 24 07:30:59 2014 +1100
Merge tag 'upstream/1.1.11'
Upstream version 1.1.11
Conflicts:
debian/changelog
debian/compat
debian/control
debian/copyright
debian/docs
debian/gmusicbrowser.menu
debian/rules
debian/watch
diff --combined debian/patches/fix-menu
index b8ea9ba,0000000..73acab5
mode 100644,000000..100644
--- a/debian/patches/fix-menu
+++ b/debian/patches/fix-menu
@@@ -1,19 -1,0 +1,19 @@@
+Description: fix the menu as per Debian Menu System
+Author: Antonio Radici <antonio at dyne.org>
+---
+ gmusicbrowser.menu | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
- --- gmusicbrowser.orig/gmusicbrowser.menu
- +++ gmusicbrowser/gmusicbrowser.menu
++--- a/gmusicbrowser.menu
+++++ b/gmusicbrowser.menu
+@@ -1,8 +1,6 @@
+ ?package(gmusicbrowser):needs="X11" \
+- section="Multimedia/Sound" \
++ section="Applications/Sound" \
+ title="gmusicbrowser" \
+ longtitle="Jukebox for mp3/ogg/flac/mpc files" \
+ command="/usr/bin/gmusicbrowser" \
+- icon="gmusicbrowser.png" \
+- startup_notify="true"
+-
++ icon="/usr/share/gmusicbrowser/pix/gmusicbrowser.xpm"
diff --combined debian/patches/no-extra-copying
index f00cee9,0000000..7858494
mode 100644,000000..100644
--- a/debian/patches/no-extra-copying
+++ b/debian/patches/no-extra-copying
@@@ -1,27 -1,0 +1,27 @@@
+Description: Stop the distribution of COPYING from makefile, the license is
+ already provided by us.
+Author: Antonio Radici <antonio at dyne.org>
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
- --- gmusicbrowser.orig/Makefile
- +++ gmusicbrowser/Makefile
++--- a/Makefile
+++++ b/Makefile
+@@ -7,14 +7,14 @@ bindir = ${DESTDIR}/${prefix}/bin
+ appdir = ${DESTDIR}/${prefix}/share/applications
+ datadir = ${DESTDIR}/${prefix}/share
+ mandir = ${DESTDIR}/${prefix}/share/man
+-docdir = ${DESTDIR}/${prefix}/share/doc/$(PACKAGE)-${VERSION}
++docdir = ${DESTDIR}/${prefix}/share/doc/$(PACKAGE)
+ localedir = ${DESTDIR}/${prefix}/share/locale
+-menudir = ${DESTDIR}/${prefix}/lib/menu
++menudir = ${DESTDIR}/${prefix}/share/menu
+ iconsdir = ${DESTDIR}/${prefix}/share/icons
+ liconsdir = $(iconsdir)/large
+ miconsdir = $(iconsdir)/mini
+
+-DOCS=AUTHORS COPYING README NEWS INSTALL layout_doc.html
++DOCS=AUTHORS README layout_doc.html
- LINGUAS=$(shell for l in po/*po; do basename $$l .po; done)
+
- all: locale
++ # this triggers correct gettext behavior
++ # unset LINGUAS => installs all supported linguas
diff --combined debian/patches/shimmer-layouts
index 71b6b4a,0000000..5948478
mode 100644,000000..100644
--- a/debian/patches/shimmer-layouts
+++ b/debian/patches/shimmer-layouts
@@@ -1,339 -1,0 +1,325 @@@
+From acc72078ea6db95174726ebc6f720abf96baca7c Mon Sep 17 00:00:00 2001
+From: Sean Davis <smd.seandavis at gmail.com>
+Date: Wed, 28 Aug 2013 19:14:00 -0400
+Subject: [PATCH] shimmer-layouts update
+
+---
- gmbrc.default | 10 +++++++++
- gmusicbrowser.pl | 6 ++---
- gmusicbrowser_layout.pm | 15 ++++++++++++-
- gmusicbrowser_list.pm | 34 +++++++++++++++++++++++-----
- layouts/songtree.layout | 59 ++++++++++++++++++++++++++++++++++++++++++++++---
- plugins/fetch_cover.pm | 4 +++-
++ gmbrc.default | 10 ++++++++
++ gmusicbrowser.pl | 6 ++--
++ gmusicbrowser_layout.pm | 15 +++++++++++-
++ gmusicbrowser_list.pm | 34 ++++++++++++++++++++++-----
++ layouts/songtree.layout | 59 +++++++++++++++++++++++++++++++++++++++++++++---
++ plugins/fetch_cover.pm | 4 ++-
+ 6 files changed, 114 insertions(+), 14 deletions(-)
+
- diff --git a/gmbrc.default b/gmbrc.default
- index 2b1cb66..e224701 100644
+--- a/gmbrc.default
++++ b/gmbrc.default
+@@ -9,6 +9,16 @@
+ # of the plugin found at the top of the plugin file :
+ PLUGIN_LYRICS: 1
+ PLUGIN_FETCHCOVER: 1
++PLUGIN_ARTISTINFO: 1
++PLUGIN_MPRIS2: 1
++
++UseTray: 0
++
++Layout: Shimmer Desktop
++IconTheme: elementary
++LayoutT: Shimmer Traytip
++LayoutF: Shimmer Party
++
+
+ # default player layout
+ #Layout: Small player
- diff --git a/gmusicbrowser.pl b/gmusicbrowser.pl
- index 894ef70..19ae706 100755
+--- a/gmusicbrowser.pl
++++ b/gmusicbrowser.pl
+@@ -497,9 +497,9 @@ our @cMenuAA=
+ ( { label => _"Lock", code => sub { ToggleLock($_[0]{lockfield}); }, check => sub { $::TogLock && $::TogLock eq $_[0]{lockfield}}, mode => 'P',
+ test => sub { $_[0]{field} eq $_[0]{lockfield} || $_[0]{gid} == Songs::Get_gid($::SongID,$_[0]{lockfield}); },
+ },
+- { label => _"Lookup in AMG", code => sub { AMGLookup( $_[0]{mainfield}, $_[0]{aaname} ); },
+- test => sub { $_[0]{mainfield} =~m/^album$|^artist$|^title$/; },
+- },
++ #{ label => _"Lookup in AMG", code => sub { AMGLookup( $_[0]{mainfield}, $_[0]{aaname} ); },
++ # test => sub { $_[0]{mainfield} =~m/^album$|^artist$|^title$/; },
++ #},
+ { label => _"Filter", code => sub { Select(filter => Songs::MakeFilterFromGID($_[0]{field},$_[0]{gid})); }, stockicon => 'gmb-filter', mode => 'P' },
+ { label => \&SongsSubMenuTitle, submenu => \&SongsSubMenu, },
+ { label => sub {$_[0]{mode} eq 'P' ? _"Display Songs" : _"Filter"}, code => \&FilterOnAA,
- diff --git a/gmusicbrowser_layout.pm b/gmusicbrowser_layout.pm
- index ffd7cc3..ae1f82a 100644
+--- a/gmusicbrowser_layout.pm
++++ b/gmusicbrowser_layout.pm
+@@ -7,6 +7,7 @@
+
+ use strict;
+ use warnings;
++use utf8;
+
+ package Layout;
+ use Gtk2;
+@@ -245,6 +246,7 @@ our %Widgets=
+ { class => 'Layout::Label',
+ group => 'Play',
+ minsize => 20,
++ options => 'showcover',
+ markup => '<b><big>%S</big></b>%V',
+ markup_empty => '<b><big><'._("Playlist Empty").'></big></b>',
+ click1 => \&PopupSongsFromAlbum,
+@@ -268,6 +270,10 @@ our %Widgets=
+ dragsrc => [::DRAG_ARTIST,\&DragCurrentArtist],
+ cursor => 'hand2',
+ },
++ ArtistBreadcrumb =>
++ { parent => 'Artist',
++ click1 => sub { my $ID=::GetSelID($_[0]); ::PopupAA( 'album', format=> ::__x( _"<big><b>{album}</b></big>\n{year} / {songs}", album => "%a", year => "%y", songs => "%s"), from=> Songs::Get_gid($ID,'artists')) if defined $ID; },
++ },
+ Album =>
+ { class => 'Layout::Label',
+ group => 'Play',
+@@ -278,6 +284,10 @@ our %Widgets=
+ dragsrc => [::DRAG_ALBUM,\&DragCurrentAlbum],
+ cursor => 'hand2',
+ },
++ AlbumBreadcrumb =>
++ { parent => 'Album',
++ click1 => \&PopupSongsFromAlbum,
++ },
+ Year =>
+ { class => 'Layout::Label',
+ group => 'Play',
+@@ -372,8 +382,10 @@ our %Widgets=
+ group => 'Play',
+ aa => 'album',
+ oldopt1 => 'maxsize',
++ options => 'showcover',
+ schange => sub { my $key=(defined $_[1])? Songs::Get_gid($_[1],'album') : undef ; $_[0]->set($key); },
+ click1 => \&PopupSongsFromAlbum,
++ click3 => sub { my $ID=::GetSelID($_[0]); ::PopupAAContextMenu({self =>$_[0], field=>'album', ID=>$ID, gid=>Songs::Get_gid($ID,'album'), mode => 'P'}) if defined $ID; },
+ event => 'Picture_album',
+ update => \&Layout::AAPicture::Changed,
+ noinit => 1,
+@@ -387,6 +399,7 @@ our %Widgets=
+ oldopt1 => 'maxsize',
+ schange => sub { my $key=(defined $_[1])? Songs::Get_gid($_[1],'artists') : undef ;$_[0]->set($key); },
+ click1 => sub { ::PopupAA('artist'); },
++ click3 => sub { my $ID=::GetSelID($_[0]); ::PopupAAContextMenu({self =>$_[0], field=>'artist', ID=>$ID, gid=>Songs::Get_gid($ID,'artist'), mode => 'P'}) if defined $ID; },
+ event => 'Picture_artist',
+ update => \&Layout::AAPicture::Changed,
+ noinit => 1,
- @@ -1596,7 +1609,7 @@ use base 'Gtk2::Window';
++@@ -1588,7 +1601,7 @@ use base 'Gtk2::Window';
+ sub new
+ { my ($class,$layout,%options)=@_;
+ my @original_args=@_;
+- my $fallback=delete $options{fallback} || 'Lists, Library & Context';
++ my $fallback=delete $options{fallback} || 'Shimmer Desktop';
+ my $opt0={};
+ if (my $opt= $layout=~m/^[^(]+\(.*=/)
+ { ($layout,$opt0)= $layout=~m/^([^(]+)\((.*)\)$/; #separate layout id and options
- diff --git a/gmusicbrowser_list.pm b/gmusicbrowser_list.pm
- index ba2999f..0fef1d2 100644
+--- a/gmusicbrowser_list.pm
++++ b/gmusicbrowser_list.pm
- @@ -199,8 +199,8 @@ sub Update
++@@ -198,8 +198,8 @@ sub Update
+ if (!$array) { $tip=$text=_"error"; }
+ else { $text.= ::CalcListLength($array,$self->{format}); }
+ my $format= $self->{size} ? '<span size="'.$self->{size}.'">%s</span>' : '%s';
+- $self->child->set_markup_with_format($format,$text);
+- $self->set_tooltip_text($tip);
++ if ($self->{mode} eq "filter") { $self->child->set_markup_with_format($format,$text); $self->set_tooltip_text($tip); }
++ else { $self->child->set_markup_with_format($format,$tip); $self->set_tooltip_text($text); }
+ $self->{needupdate}=0;
+ }
+
- @@ -227,7 +227,7 @@ sub filter_Update
++@@ -226,7 +226,7 @@ sub filter_Update
+ { my $self=shift;
+ my $filter=::GetFilter($self);
+ my $array=$filter->filter;
+- return _("Filter : "), $array, $filter->explain;
++ return _("Filter : "), $array, ("Filter: ".$filter->explain);
+ }
+
+ ### list functions
- @@ -246,7 +246,7 @@ sub list_SongArray_changed
++@@ -245,7 +245,7 @@ sub list_SongArray_changed
+ sub list_Update
+ { my $self=shift;
+ my $array=::GetSongArray($self) || return;
+- return _("Listed : "), $array, ::__('%d song','%d songs',scalar@$array);
++ return _("Listed : "), $array, ::__('%d song listed','%d songs listed',scalar@$array);
+ }
+
+ ### selected functions
- @@ -1586,6 +1586,7 @@ our %Pages=
++@@ -1591,6 +1591,7 @@ our %Pages=
+ our @MenuMarkupOptions=
+ ( "%a",
+ "<b>%a</b>%Y\n<small>%s <small>%l</small></small>",
++ "<b>%a</b>%Y\n<small>%x / %s / <small>%l</small></small>",
+ "<b>%a</b>%Y\n<small>%b</small>",
+ "<b>%a</b>%Y\n<small>%b</small>\n<small>%s <small>%l</small></small>",
+ "<b>%y %a</b>",
- @@ -1602,6 +1603,7 @@ my @mpicsize_menu=
++@@ -1607,6 +1608,7 @@ my @mpicsize_menu=
+ _("medium size") => 64,
+ _("big size") => 96,
+ _("huge size") => 128,
++ _("giant size") => 256,
+ );
+ my @cloudstats_menu=
+ ( _("number of songs") => 'count',
- @@ -3300,7 +3302,7 @@ sub new
++@@ -3309,7 +3311,7 @@ sub new
+ my $BAlblist=::NewIconButton('gmb-playlist',undef,undef,'none');
+ $BAlblist->signal_connect(button_press_event => \&AlbumListButton_press_cb);
+ $BAlblist->set_tooltip_text(_"Choose Album From this Artist");
+- $buttonbox->pack_start($BAlblist, ::FALSE, ::FALSE, 0);
++ $buttonbox->pack_start($_, ::FALSE, ::FALSE, 0) for $BAlblist;
+ }
+
+ my $drgsrc=$aa eq 'album' ? ::DRAG_ALBUM : ::DRAG_ARTIST;
- @@ -4539,6 +4541,16 @@ sub button_press_cb
++@@ -4601,6 +4603,16 @@ sub button_press_cb
+ else { $self->{pressed}=1; }
+ return 0;
+ }
++ if ($but==2)
++ { my ($i,$j,$key)=$self->coord_to_index($event->get_coords);
++ if (defined $key && !exists $self->{selected}{$key})
++ { $self->key_selected($event,$i,$j);
++ }
++ my $menu = ::ChooseSongsFromA($key);
++ my $event = Gtk2->get_current_event;
++ $menu->show_all;
++ $menu->popup(undef,undef,undef,undef,$event->button,$event->time);
++ }
+ if ($but==3)
+ { my ($i,$j,$key)=$self->coord_to_index($event->get_coords);
+ if (defined $key && !exists $self->{selected}{$key})
- @@ -5464,7 +5476,7 @@ sub new
++@@ -5526,7 +5538,7 @@ sub new
+ my $default= $::Options{"DefaultOptions_$name"} || {};
+
+ %$opt=( @DefaultOptions, %$default, %$opt );
+- $self->{$_}=$opt->{$_} for qw/headclick songxpad songypad no_typeahead grouping/;
++ $self->{$_}=$opt->{$_} for qw/headclick songxpad songypad no_typeahead grouping showbb/;
+
+ #create widgets used to draw the songtree as a treeview, would be nice to do without but it's not possible currently
+ $self->{stylewidget}=Gtk2::TreeView->new;
- @@ -5530,6 +5542,16 @@ sub new
++@@ -5592,6 +5604,16 @@ sub new
+ $self->AddColumn($_) for split / +/,$opt->{cols};
+ unless ($self->{cells}) { $self->AddColumn('title'); } #to ensure there is at least 1 column
+
++ if ($self->{showbb}) { # show queue actions in QueueList if option showbb is set
++ my $qactions = Layout::NewWidget("QueueActions");
++ my $clearb = ::NewIconButton('gtk-clear',"",\&::ClearQueue,"none","Clear Queue");
++ my $shuffleb = ::NewIconButton('gmb-shuffle',"",\&::ShuffleQueue,"none","Shuffle Queue");
++ my $bbox = Gtk2::HBox->new(0,0);
++ $bbox->pack_start($qactions,0,0,0);
++ $bbox->pack_end($clearb,0,0,0);
++ $bbox->pack_end($shuffleb,0,0,0);
++ $vbox->pack_end($bbox,0,0,0);
++ }
+ $self->{selected}='';
+ $self->{lastclick}=$self->{startgrow}=-1;
+ $self->set_head_columns;
- diff --git a/layouts/songtree.layout b/layouts/songtree.layout
- index 0f7c557..a9b6e56 100644
+--- a/layouts/songtree.layout
++++ b/layouts/songtree.layout
+@@ -1,6 +1,37 @@
+ #SongTree Group & Columns definitions
+ #####################################
+
++{Group Compact}
++title=Compact
++head=pic:h
++tail=25
++vcollapse=head
++vmin=pic:y+pic:h+25
++title: text(markup='<b><big>'.pesc($album).'</big></b>'. if($year,'\n'.pesc($year)) . '\n'.pesc($artist),pad=2,x=pic:w)
++pic: aapic(y=title:y,picsize=picsize,ypad=2,xpad=1,aa='album')
++picsize : OptionNumber(default=50,min=20,max=1000,step=10)
++
++{Group discleft}
++title=disc on the left side
++head=3
++left=width
++vcollapse=head+title:h+line:h+2
++title: text(markup='<b><big>'.pesc($title).'</big></b>'.if(!$_expanded,'<big><b>»</b></big>'),pad=2,w=left))
++width: OptionNumber(default=15,min=10,max=100,step=1)
++line: line(x1=1,y1=1,x2=$_w,y2=1,color='#ccc',width=1)
++
++{Group artistalbum_breadcrumbs}
++title=album and artist breadcrumbs
++head=title:h
++tail=25
++vcollapse=head
++vmin=pic:y+pic:h+25
++left=pic:w+2
++title: text(markup='<b><big>'.pesc($album).'</big></b>'. if($year,' <big><b>«</b></big> '.pesc($year)) . ' <big><b>«</b></big> '.pesc($artist),pad=2)
++pic: +aapic(y=title:h+title:y,picsize=picsize,ypad=2,xpad=1,aa='album')
++picsize : OptionNumber(default=100,min=20,max=1000,step=10)
++picstars : picture(file=ratingpic($rating_avrg),x=(picsize/2)-(picstars:w/2),y=pic:y+pic:h,hide=$rating_avrg==50 || picsize < 80)
++
+ {Group pic}
+ title= _"with picture"
+ head=title:h
- @@ -33,6 +64,14 @@ pic: aapic(y=title:y + title:h +2, picsize=min(picsize,width), pad=2)
++@@ -33,6 +64,14 @@ pic: aapic(y=title:y + title:h +2, picsi
+ width: OptionNumber(default=200,min=20,max=1000,step=10)
+ picsize : OptionNumber(default=100,min=20,max=1000,step=10)
+
++{Column RhythmboxQueue}
++menutitle = _"Rhythmbox 2nd queue column"
++title = _"Queue"
++hreq=text:h
++width=200
++sort= title:i
++text : text(markup=pesc($title).'\n<small>by <i>'.pesc($artist).'</i>\non <i>'.pesc($album).'</i></small>',pad=2)
++
+ {Column testtitleandprogress}
+ title= _"Title & progress"
+ sort=album:i title:i
+@@ -42,6 +81,20 @@ hreq=text:h
+ progress: pbar( fill=$progress, hide=!$playing,y=1,h=-2)
+ text: text(markup=playmarkup(pesc($title)))
+
++{Column queuenumber}
++menutitle = Queue-Item Number
++title = #
++width = 20
++text: text(markup=$queued, x=-text:w)
++
++{Column playandqueueandtrack}
++menutitle = Playing/Queue Icon or Track
++title = #
++width = 20
++sort = track
++ico: icon(pad=2,icon=$playicon, hide= !$playing && !$queued)
++text: text(markup=pesc($track.' '.$queued), hide= $playing || $queued)
++
+ {Column playandqueue}
+ menutitle = _"Playing and queue icons"
+ width = 20
+@@ -82,9 +135,9 @@ title = _"Rating"
+ menutitle = _"Rating (picture)"
+ sort = rating
+ width=100
+-#hreq = pic:h
+-#pic : picture(file=ratingpic($rating),init_file=ratingpic(0))
+-pic : picture(file=ratingpic($rating),h=$_h,w=$_w,resize='ratio',init_file=ratingpic(0))
++hreq = pic:h
++pic : picture(file=ratingpic($rating),init_file=ratingpic(0),x=pic:w)
++#pic : picture(file=ratingpic($rating),h=$_h,w=$_w,resize='ratio',init_file=ratingpic(0))
+
+ {Column right_aligned_folder}
+ menutitle = _"Folder (right-aligned)"
- diff --git a/plugins/fetch_cover.pm b/plugins/fetch_cover.pm
- index 1028fa6..75c543c 100644
+--- a/plugins/fetch_cover.pm
++++ b/plugins/fetch_cover.pm
- @@ -42,15 +42,17 @@ my %Sites=
++@@ -46,15 +46,17 @@ my %Sites=
+ );
+
+ my %menuitem=
+-( label => _"Search for a picture on internet", #label of the menu item
++( label => _"Search Picture", #label of the menu item
+ code => sub { Fetch($_[0]{mainfield},$_[0]{gid},$_[0]{ID}); }, #when menu item selected
+ test => sub {$_[0]{mainfield} eq 'album' || $_[0]{mainfield} eq 'artist'}, #the menu item is displayed if returns true
++ stockicon => 'gtk-find',
+ );
+ my %fpane_menuitem=
+ ( label=> _"Search for a picture on internet",
+ code => sub { Fetch($_[0]{field},$_[0]{gidlist}[0]); },
+ onlyone=> 'gidlist', #menu item is hidden if more than one album/artist is selected
+ istrue => 'aa', #menu item is hidden for non artist/album (aa) FPanes
++ stockicon => 'gtk-find',
+ );
+
+ ::SetDefaultOptions(OPT, USEFILE => 1, COVERFILE => 'cover', PictureSite_artist => 'googlei', PictureSite_album => 'googlei');
- --
- 1.8.1.2
--
gmusicbrowser packaging
More information about the pkg-multimedia-commits
mailing list