Skip to content

Commit

Permalink
Merge branch 'master' into ps3
Browse files Browse the repository at this point in the history
Conflicts:
	Makefile
	glwthemes/mono/popups/auth.view
	glwthemes/mono/skins/grey/buttons/buttons.view
	src/ui/glw/glw_opengl.h
	src/ui/glw/glw_throbber3d.c
  • Loading branch information
andoma committed Mar 13, 2011
2 parents 23e2389 + b4d14f8 commit 9939e90
Show file tree
Hide file tree
Showing 195 changed files with 4,652 additions and 2,285 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ SRCS += src/misc/ptrvec.c \
src/misc/string.c \
src/misc/fs.c \
src/misc/extents.c \
src/misc/isolang.c \

SRCS-${CONFIG_TREX} += ext/trex/trex.c

Expand Down
32 changes: 16 additions & 16 deletions glwthemes/mono/commandmenu.view
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
widget(container_x, {

widget(icon, {
.source = "theme:https://icons/48x48/Check.png";
.source = "skin:https://icons/Check.png";
.shadow = true;
.alpha = iir($self.id == CURRENT, 8);
});
Expand Down Expand Up @@ -153,7 +153,7 @@ widget(container_x, {
widget(container_x, {
.align = center;

ICON2("theme:https://icons/48x48/NavLeft.png",
ICON2("skin:https://icons/NavLeft.png",
"Back",
{
$ui.menu = false;
Expand All @@ -163,7 +163,7 @@ widget(container_x, {
$global.nav.canGoBack);


ICON2("theme:https://icons/48x48/NavRight.png",
ICON2("skin:https://icons/NavRight.png",
"Forward",
{
$ui.menu = false;
Expand All @@ -172,7 +172,7 @@ widget(container_x, {
PLATE_COLOR_CMDMENU(),
$global.nav.canGoForward);

ICON2("theme:https://icons/48x48/Home.png",
ICON2("skin:https://icons/Home.png",
"Home",
{
$ui.menu = false;
Expand All @@ -181,13 +181,13 @@ widget(container_x, {
PLATE_COLOR_CMDMENU(),
$global.nav.canGoHome);

ICON2("theme:https://icons/48x48/Blank.png",
ICON2("skin:https://icons/Blank.png",
"Blank",
event(EnableScreenSaver),
PLATE_COLOR_CMDMENU(),
true);

ICON2("theme:https://icons/48x48/Settings.png",
ICON2("skin:https://icons/Settings.png",
"Settings",
{
$ui.menu = false;
Expand All @@ -197,7 +197,7 @@ widget(container_x, {
1);


ICON2("theme:https://icons/48x48/Queue.png",
ICON2("skin:https://icons/Queue.png",
"Playqueue",
{
$ui.menu = false;
Expand All @@ -206,7 +206,7 @@ widget(container_x, {
PLATE_COLOR_CMDMENU(),
1);

ICON2("theme:https://icons/48x48/Exit.png",
ICON2("skin:https://icons/Exit.png",
"Exit",
event(Quit),
PLATE_COLOR_CMDMENU(),
Expand All @@ -224,13 +224,13 @@ widget(container_x, {
widget(container_x, {
.align = center;

ICON2("theme:https://icons/48x48/SkipBack.png",
ICON2("skin:https://icons/SkipBack.png",
"Prev track",
event(PreviousTrack),
PLATE_COLOR_CMDMENU(),
$global.media.current.canSkipBackward);

ICON2("theme:https://icons/48x48/SeekBack.png",
ICON2("skin:https://icons/SeekBack.png",
"Rewind",
event(SeekReverse),
PLATE_COLOR_CMDMENU(),
Expand All @@ -242,13 +242,13 @@ widget(container_x, {
.noInitialTransform = true;
.time = 0.2;

ICON2("theme:https://icons/48x48/Pause.png",
ICON2("skin:https://icons/Pause.png",
"Pause",
event(Pause),
PLATE_COLOR_CMDMENU(),
$global.media.current.canPause);

ICON2("theme:https://icons/48x48/Play.png",
ICON2("skin:https://icons/Play.png",
"Play",
event(Play),
PLATE_COLOR_CMDMENU(),
Expand All @@ -260,25 +260,25 @@ widget(container_x, {
"pause", 1);
});

ICON2("theme:https://icons/48x48/SeekFwd.png",
ICON2("skin:https://icons/SeekFwd.png",
"Fast Forward",
event(SeekForward),
PLATE_COLOR_CMDMENU(),
$global.media.current.canSeek);

ICON2("theme:https://icons/48x48/SkipNext.png",
ICON2("skin:https://icons/SkipNext.png",
"Next Track",
event(NextTrack),
PLATE_COLOR_CMDMENU(),
$global.media.current.canSkipForward);

ICON2("theme:https://icons/48x48/Stop.png",
ICON2("skin:https://icons/Stop.png",
"Stop",
event(Stop),
PLATE_COLOR_CMDMENU(),
$global.media.current.canStop);

ICON2("theme:https://icons/48x48/Eject.png",
ICON2("skin:https://icons/Eject.png",
"Eject",
event(Eject),
PLATE_COLOR_CMDMENU(),
Expand Down
79 changes: 79 additions & 0 deletions glwthemes/mono/commandmenu/cmd_details.view
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
#import "skin:https://commandmenu.skin"
#import "theme:https://include/separators.view";

widget(container_y, {

.spacing = 20;
.align = bottom;


widget(container_x, {
.hidden = $global.media.current.type != "video";
.height = $ui.size * 10;
.spacing = 20;
.align = center;

commandGroup(widget(container_y, {
.width = $ui.size * 10;
widget(label, {
.caption = "Audio tracks";
.align = center;
.color = [0.5, 0.5, 0.5];
});
HORIZONTAL_SEPARATOR();

widget(list_y, {
cloner($global.media.current.metadata.audiostreams, container_z, {
commandSelectableItem($self.title,
$self.format,
$self.id == $global.media.current.audio.current,
selectTrack($self.id));
});
});
}));

commandGroup(widget(container_y, {
.width = $ui.size * 10;
widget(label, {
.caption = "Subtitles";
.align = center;
.color = [0.5, 0.5, 0.5];
});
HORIZONTAL_SEPARATOR();

widget(list_y, {
cloner($global.media.current.metadata.subtitlestreams, container_z, {
commandSelectableItem($self.title,
$self.format,
$self.id == $global.media.current.subtitle.current,
selectTrack($self.id));
});
});
}));
});

widget(container_x, {
.align = center;
.hidden = $global.media.current.type != "video";
commandGroup(widget(container_y, {

.width = 20 + $ui.size * 20;

widget(label, {
.caption = "Lipsync (Audio delay)";
});
commandSlider($global.media.current.avdelta, -1000, 1000, 10,
int2str($global.media.current.avdelta) + "ms");
}));
});


commandGroup(widget(container_x, {
widget(container_y, {
commandMenuLeft(targetedEvent("cmd_deck", Decrease), "Main", 0.1);
});
space(1);

}));

});
117 changes: 117 additions & 0 deletions glwthemes/mono/commandmenu/cmd_main.view
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
#import "skin:https://commandmenu.skin"
#import "theme:https://include/separators.view";

widget(container_y, {

.spacing = 20;
.align = center;

// -- clock and date -------------------------------------------------

widget(container_x, {
.align = right;
.spacing = 5;

commandGroup(widget(container_z, {
.width = $ui.size * 4;
widget(image, {
.source = "skin:https://gfx/clock.png";
.hqScaling = true;
});
widget(image, {
.source = "skin:https://gfx/clock-hand-short.png";
.angle = ($global.clock.hour % 12) * 30 +
($global.clock.minute) / 2;
});
widget(image, {
.source = "skin:https://gfx/clock-hand-long.png";
.angle = $global.clock.minute * 6;
});
}));


commandGroup(widget(container_y, {
.width = $ui.size * 4;
widget(label, {
.align = center;
.caption = strftime($global.clock.unixtime, "%B");
});
widget(label, {
.align = center;
.sizeScale = 2;
.caption = strftime($global.clock.unixtime, "%d");
});
}));

});

space(1);


// -- playdeck ------------------------------------------------------

commandGroup(widget(container_x, {
.align = center;

widget(container_y, {
commandMenuLeft(targetedEvent("cmd_deck", Decrease), "System menu", 0.1);
});

space(1);

widget(container_y, {
.spacing = 5;

widget(container_x, {
.spacing = 5;
.align = center;
.homogenous = true;
$view.playcontrollerswidth = getWidth();

commandSkipBackward(event(PreviousTrack),
$global.media.current.canSkipBackward);
commandSeekReverse(event(SeekReverse),
$global.media.current.canSeek);

widget(deck, {
.effect = flipVertical;
.noInitialTransform = true;
.time = 0.2;

commandPause(event(Pause), $global.media.current.canPause);
commandPlay(event(Play), $global.media.current.canPause);

.page = $global.media.current.playstatus == "pause";
});

commandSeekForward(event(SeekForward),
$global.media.current.canSeek);
commandSkipForward(event(NextTrack),
$global.media.current.canSkipForward);

commandStop(event(Stop), $global.media.current.canStop);
commandEject(event(Eject), $global.media.current.canEject);

commandRepeatToggle($global.media.current.repeat,
$global.media.current.canRepeat);
commandRepeatShuffle($global.media.current.shuffle,
$global.media.current.canShuffle);
});

commandSeekSlider(
$global.media.current.currenttime,
$global.media.current.metadata.duration,
$global.media.current.canSeek,
$view.playcontrollerswidth,
!$global.media.current.canSeek
);
});

space(1);

widget(container_y, {
commandMenuRight(targetedEvent("cmd_deck", Increase), "Video", 0.1);
});

}));
});
22 changes: 22 additions & 0 deletions glwthemes/mono/commandmenu/cmd_root.view
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@

widget(container_y, {
.hidden = !$ui.menu;
.padding = 5;

widget(deck, {
.filterConstraintY = true;
.noInitialTransform = true;
.id = "cmd_deck";
.effect = flipVertical;
.time = 0.3;

#include "theme:https://commandmenu/cmd_sysinfo.view"
#include "theme:https://commandmenu/cmd_main.view"
#include "theme:https://commandmenu/cmd_details.view"

.page = 1; // Bad: Must be after the actual pages
});
widget(dummy, {
.height = $ui.playdeckheight;
});
});
Loading

0 comments on commit 9939e90

Please sign in to comment.