[SCM] gmusicbrowser/master: Refresh debian/patches/shimmer-layout
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Sat Oct 5 18:12:46 UTC 2013
The following commit has been merged in the master branch:
commit aee3aaf661a7e50e88675a2c4796e4433c22215b
Author: Alessio Treglia <alessio at debian.org>
Date: Sat Oct 5 19:05:43 2013 +0100
Refresh debian/patches/shimmer-layout
diff --git a/debian/patches/shimmer-layouts b/debian/patches/shimmer-layouts
index f77b39e..9bd9c6d 100644
--- a/debian/patches/shimmer-layouts
+++ b/debian/patches/shimmer-layouts
@@ -1,17 +1,129 @@
-Description: Add some extra layouts made by the shimmer project
-Origin: other, https://github.com/shimmerproject/gmusicbrowser
-Author: Simon Steinbeiß <simon.steinbeiss at elfenbeinturm.at>
+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 | 12 ++++-----
- gmusicbrowser_layout.pm | 15 +++++++++++-
- gmusicbrowser_list.pm | 34 ++++++++++++++++++++++-----
- layouts/songtree.layout | 59 +++++++++++++++++++++++++++++++++++++++++++++---
- plugins/fetch_cover.pm | 4 ++-
- 6 files changed, 117 insertions(+), 17 deletions(-)
+ 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(-)
---- gmusicbrowser.orig/gmusicbrowser_list.pm
-+++ gmusicbrowser/gmusicbrowser_list.pm
+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';
+ 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
if (!$array) { $tip=$text=_"error"; }
else { $text.= ::CalcListLength($array,$self->{format}); }
@@ -41,7 +153,7 @@ Author: Simon Steinbeiß <simon.steinbeiss at elfenbeinturm.at>
}
### selected functions
-@@ -1534,6 +1534,7 @@ our %Pages=
+@@ -1586,6 +1586,7 @@ our %Pages=
our @MenuMarkupOptions=
( "%a",
"<b>%a</b>%Y\n<small>%s <small>%l</small></small>",
@@ -49,7 +161,7 @@ Author: Simon Steinbeiß <simon.steinbeiss at elfenbeinturm.at>
"<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>",
-@@ -1550,6 +1551,7 @@ my @mpicsize_menu=
+@@ -1602,6 +1603,7 @@ my @mpicsize_menu=
_("medium size") => 64,
_("big size") => 96,
_("huge size") => 128,
@@ -57,7 +169,7 @@ Author: Simon Steinbeiß <simon.steinbeiss at elfenbeinturm.at>
);
my @cloudstats_menu=
( _("number of songs") => 'count',
-@@ -3221,7 +3223,7 @@ sub new
+@@ -3300,7 +3302,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");
@@ -66,7 +178,7 @@ Author: Simon Steinbeiß <simon.steinbeiss at elfenbeinturm.at>
}
my $drgsrc=$aa eq 'album' ? ::DRAG_ALBUM : ::DRAG_ARTIST;
-@@ -4450,6 +4452,16 @@ sub button_press_cb
+@@ -4539,6 +4541,16 @@ sub button_press_cb
else { $self->{pressed}=1; }
return 0;
}
@@ -83,7 +195,7 @@ Author: Simon Steinbeiß <simon.steinbeiss at elfenbeinturm.at>
if ($but==3)
{ my ($i,$j,$key)=$self->coord_to_index($event->get_coords);
if (defined $key && !exists $self->{selected}{$key})
-@@ -5327,7 +5339,7 @@ sub new
+@@ -5464,7 +5476,7 @@ sub new
my $default= $::Options{"DefaultOptions_$name"} || {};
%$opt=( @DefaultOptions, %$default, %$opt );
@@ -92,7 +204,7 @@ Author: Simon Steinbeiß <simon.steinbeiss at elfenbeinturm.at>
#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;
-@@ -5398,6 +5410,16 @@ sub new
+@@ -5530,6 +5542,16 @@ sub new
$self->AddColumn($_) for split / +/,$opt->{cols};
unless ($self->{cells}) { $self->AddColumn('title'); } #to ensure there is at least 1 column
@@ -109,158 +221,10 @@ Author: Simon Steinbeiß <simon.steinbeiss at elfenbeinturm.at>
$self->{selected}='';
$self->{lastclick}=$self->{startgrow}=-1;
$self->set_head_columns;
---- gmusicbrowser.orig/gmusicbrowser_layout.pm
-+++ gmusicbrowser/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,
-@@ -1590,7 +1603,7 @@ use base 'Gtk2::Window';
-
- sub new
- { my ($class,$layout,%options)=@_;
-- 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
---- gmusicbrowser.orig/gmbrc.default
-+++ gmusicbrowser/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
---- gmusicbrowser.orig/gmusicbrowser.pl
-+++ gmusicbrowser/gmusicbrowser.pl
-@@ -480,9 +480,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,
-@@ -3160,7 +3160,7 @@ sub ChooseSongsTitle #Songs with the sa
- }
-
- sub ChooseSongsFromA #FIXME limit the number of songs if HUGE number of songs (>100-200 ?)
--{ my $album=$_[0];
-+{ my ($album,$showcover)=@_;
- return unless defined $album;
- my $list= AA::GetIDs(album=>$album);
- Songs::SortList($list,'disc track file');
-@@ -3182,7 +3182,7 @@ sub ChooseSongsFromA #FIXME limit the nu
- }
- my $menu = ChooseSongs($list, markup=>'%n %S<small>%V</small>');
- $menu->show_all;
-- if (1)
-+ if ($showcover)
- { my $h=$menu->size_request->height;
- my $w=$menu->size_request->width;
- my $maxwidth= $menu->get_screen->get_width;
-@@ -3282,7 +3282,7 @@ sub ChooseSongs
- my $activate_callback=sub
- { return if $_[0]->get_submenu;
- if ($_[0]{middle}) { Enqueue($_[1]); }
-- else { Select(song => $_[1]); }
-+ else { Select(song => $_[1], play=>1); }
- };
- my $click_callback=sub
- { my ($mitem,$event)=@_;
---- gmusicbrowser.orig/plugins/fetch_cover.pm
-+++ gmusicbrowser/plugins/fetch_cover.pm
-@@ -42,15 +42,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');
---- gmusicbrowser.orig/layouts/songtree.layout
-+++ gmusicbrowser/layouts/songtree.layout
+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
#####################################
@@ -280,7 +244,7 @@ Author: Simon Steinbeiß <simon.steinbeiss at elfenbeinturm.at>
+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))
++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)
+
@@ -291,7 +255,7 @@ Author: Simon Steinbeiß <simon.steinbeiss at elfenbeinturm.at>
+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)
++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)
@@ -299,7 +263,7 @@ Author: Simon Steinbeiß <simon.steinbeiss at elfenbeinturm.at>
{Group pic}
title= _"with picture"
head=title:h
-@@ -33,6 +64,14 @@ pic: aapic(y=title:y + title:h +2, picsi
+@@ -33,6 +64,14 @@ pic: aapic(y=title:y + title:h +2, picsize=min(picsize,width), pad=2)
width: OptionNumber(default=200,min=20,max=1000,step=10)
picsize : OptionNumber(default=100,min=20,max=1000,step=10)
@@ -348,3 +312,28 @@ Author: Simon Steinbeiß <simon.steinbeiss at elfenbeinturm.at>
{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=
+ );
+
+ 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