~josephjamesmills/u2t/dailybuilds

« back to all changes in this revision

Viewing changes to shell/3rdparty/ITV/ITV.qml

  • Committer: Joseph Mills
  • Date: 2013-01-30 22:00:35 UTC
  • Revision ID: josephjamesmills@ubuntu.com-20130130220035-9bt17q998iql9smy
* adding tv guide youtube and netfilxs 
* fixed dash rendering issues 
* removed some doubled files 
* added more translations 
* added framework for previews for news and torrents
* added torrents and news lens to d/control 
* added string validatiors for dconf settings
* ITV.qml: changed "ubuntu tv extra's" to "ubuntu tv extras" 
modified:
  config.h.in
  debian/changelog
  debian/control
  libunity-2d-private/Unity2d/plugin.cpp
  session/2d-ubuntu.session
  shell/3rdparty/ITV/ITV.qml
  shell/3rdparty/qtv-qml/content/PreviewTextRight.qml
  shell/3rdparty/qtv-qml/content/ProgresBar.qml
  shell/3rdparty/qtv-qml/content/ProgresDialog.qml
  shell/3rdparty/qtv-qml/content/SearchBar.qml
  shell/3rdparty/qtv-qml/content/SearchBox.qml
  shell/3rdparty/qtv-qml/content/SearchEntryTVDB.qml
  shell/3rdparty/qtv-qml/content/SerieDelegate.qml
  shell/3rdparty/qtv-qml/content/SerieModel.qml
  shell/3rdparty/qtv-qml/content/SeriesDelegate.qml
  shell/3rdparty/qtv-qml/content/StatusBar.qml
  shell/3rdparty/qtv-qml/content/TextButton.qml
  shell/3rdparty/qtv-qml/main.qml
  shell/common/Background.qml
  shell/common/IconTile.qml
  shell/common/SearchEntry.qml
  shell/common/utils.js
  shell/dash/ButtonBackground.qml
  shell/dash/Dash.qml
  shell/dash/LensBar.qml
  shell/dash/LensButton.qml
  shell/dash/ListViewWithScrollbar.qml
  shell/dash/previews/MythTvPreview.qml
  shell/dash/previews/Previews.qml
  shell/dash/previews/VideoPreview.qml
  shell/dash/renderTypes/RendererCoverFlow.qml
  shell/dash/renderTypes/TileHorizontal.qml
  shell/dash/renderTypes/TileVertical.qml
  shell/launcher/LauncherItem.qml
  shell/launcher/SimpleLauncher.qml
  shell/systeminfo/SettingsMangerParser.qml

added:
  shell/3rdparty/mythweb/
  shell/3rdparty/mythweb/BrowserHeader.qml
  shell/3rdparty/mythweb/BrowserScrollbars.qml
  shell/3rdparty/mythweb/ButtonBackground.qml
  shell/3rdparty/mythweb/FlicableWebView.qml
  shell/3rdparty/mythweb/MythWeb.qml
  shell/3rdparty/shaders/
  shell/3rdparty/shaders/billboard.fsh
  shell/3rdparty/shaders/blackandwhite.fsh
  shell/3rdparty/shaders/emboss.fsh
  shell/3rdparty/shaders/gaussianblur_h.fsh
  shell/3rdparty/shaders/gaussianblur_v.fsh
  shell/3rdparty/shaders/glow.fsh
  shell/3rdparty/shaders/isolate.fsh
  shell/3rdparty/shaders/magnify.fsh
  shell/3rdparty/shaders/pagecurl.fsh
  shell/3rdparty/shaders/pixelate.fsh
  shell/3rdparty/shaders/posterize.fsh
  shell/3rdparty/shaders/ripple.fsh
  shell/3rdparty/shaders/selectionpanel.fsh
  shell/3rdparty/shaders/sepia.fsh
  shell/3rdparty/shaders/sharpen.fsh
  shell/3rdparty/shaders/shockwave.fsh
  shell/3rdparty/shaders/sobeledgedetection1.fsh
  shell/3rdparty/shaders/sobeledgedetection2.fsh
  shell/3rdparty/shaders/tiltshift.fsh
  shell/3rdparty/shaders/toon.fsh
  shell/3rdparty/shaders/vignette.fsh
  shell/3rdparty/shaders/warhol.fsh
  shell/3rdparty/shaders/wobble.fsh
  shell/dash/previews/NewsPreviews.qml
  shell/dash/previews/TorrentsPreview.qml
  shell/shell.qmlproject.user

Show diffs side-by-side

added added

removed removed

Lines of Context:
39
39
            }
40
40
            ItvButton {
41
41
                id:watchserie
42
 
                label:  u2d.tr("WatchSeries")
 
42
                label:  u2d.tr("News")
43
43
                focus: true
44
44
                KeyNavigation.right: youtube
45
45
                KeyNavigation.left:weather
46
46
                KeyNavigation.down: sysset
47
 
                icon: "../../launcher/artwork/icons/watchseries-lens-active.png"
48
 
                onClicked: activateLens("series.lens")
 
47
                icon: "/usr/share/unity/lenses/news/news_blank.png"
 
48
                iconSourceSize.width: 128
 
49
                iconSourceSize.height: 128
 
50
                onClicked: activateLens("news.lens")
49
51
            }
50
52
 
51
53
            ItvButton {
63
65
                label:  u2d.tr("Maps")
64
66
                KeyNavigation.left:  youtube
65
67
                KeyNavigation.right: weather
66
 
                KeyNavigation.down: alphavideo
 
68
                KeyNavigation.down: torrents
67
69
                icon: "../../launcher/artwork/icons/map-lens-active.png"
68
70
                onClicked:  activateNokiaMaps()   //activateLens("maps")
69
71
            }
73
75
                label:  u2d.tr("Unity 2d Settings")
74
76
                KeyNavigation.left: maps
75
77
                KeyNavigation.right: watchserie
76
 
                KeyNavigation.down: torrents
 
78
                KeyNavigation.down: netflixs
77
79
                icon: "../../dash/artwork/unity-ubuntu.png"
78
80
                onClicked: activateDconfsettings()
79
81
                iconSourceSize.width: 128
82
84
            ItvButton {
83
85
                id: sysset
84
86
                label:  u2d.tr("System Settings")
85
 
                KeyNavigation.left:torrents
 
87
                KeyNavigation.left:netflixs
86
88
                KeyNavigation.right: qtviewer
87
89
                KeyNavigation.up: watchserie
88
90
                icon: "../../systeminfo/Systemsetting_images/wrench-active.png"
91
93
            ItvButton {
92
94
                id:qtviewer
93
95
                label:  u2d.tr("Qt Viewer")
94
 
                KeyNavigation.right:alphavideo
 
96
                KeyNavigation.right:torrents
95
97
                KeyNavigation.left: sysset
96
98
                KeyNavigation.up: youtube
97
99
                icon:"../../launcher/artwork/icons/iplayer-active.png"
98
100
                onClicked: activateQtvviewer()
99
101
            }
 
102
 
100
103
            ItvButton {
101
 
                id:alphavideo
102
 
                label:  u2d.tr("Alpha Video effects")
103
 
                KeyNavigation.right: torrents
 
104
                id: torrents
 
105
                label:  u2d.tr("Torrents")
 
106
                KeyNavigation.right: netflixs
104
107
                KeyNavigation.left: qtviewer
105
108
                KeyNavigation.up: maps
106
 
                icon: "../../launcher/artwork/icons/tvpicker-active.png"
107
 
                onClicked: activateVideffect()
108
 
            }
109
 
            ItvButton {
110
 
                id: torrents
111
 
                label:  u2d.tr("Torrents")
 
109
                icon: "../../launcher/artwork/icons/torrent-lens-active.png"
 
110
                onClicked: activateLens("torrents.lens")
 
111
}
 
112
                SettingsMangerParser{
 
113
                id: netflixs
112
114
                KeyNavigation.up:weather
113
 
                KeyNavigation.left: alphavideo
 
115
                KeyNavigation.left: torrents
114
116
                KeyNavigation.right: sysset
115
 
                icon: "../../launcher/artwork/icons/torrent-lens-active.png"
116
 
                onClicked: activateLens("torrents.lens")
 
117
                icon: "/usr/share/netflix-desktop/NetflixIcon.png"
 
118
                iconSourceSize.width: 128
 
119
                iconSourceSize.height: 128
 
120
                desktopFile:  "netflix-desktop.desktop"
 
121
 
 
122
                }
117
123
            }
118
124
        }
119
125
    }
120
 
}