diff --git a/docs/docresources/configdvbnetwork.png b/docs/docresources/configdvbnetwork.png index 1b889640..40e70841 100644 Binary files a/docs/docresources/configdvbnetwork.png and b/docs/docresources/configdvbnetwork.png differ diff --git a/docs/docresources/configdvrtab.png b/docs/docresources/configdvrtab.png deleted file mode 100644 index 834a1ff2..00000000 Binary files a/docs/docresources/configdvrtab.png and /dev/null differ diff --git a/docs/docresources/configdvrtab1.png b/docs/docresources/configdvrtab1.png new file mode 100644 index 00000000..adfd5d1c Binary files /dev/null and b/docs/docresources/configdvrtab1.png differ diff --git a/docs/docresources/configdvrtab2.png b/docs/docresources/configdvrtab2.png new file mode 100644 index 00000000..b3b5a55d Binary files /dev/null and b/docs/docresources/configdvrtab2.png differ diff --git a/docs/docresources/configdvrtab3.png b/docs/docresources/configdvrtab3.png new file mode 100644 index 00000000..622f56b3 Binary files /dev/null and b/docs/docresources/configdvrtab3.png differ diff --git a/docs/docresources/configtvadapters.png b/docs/docresources/configtvadapters.png new file mode 100644 index 00000000..194b25c2 Binary files /dev/null and b/docs/docresources/configtvadapters.png differ diff --git a/docs/html/config_dvr.html b/docs/html/config_dvr.html index 1b5a652b..87432c1c 100644 --- a/docs/html/config_dvr.html +++ b/docs/html/config_dvr.html @@ -1,6 +1,10 @@
- + +
+ +
+

This tab is used to configure operation of the Digital Video Recorder. diff --git a/docs/html/config_networks.html b/docs/html/config_networks.html index a34e4b1b..0c58597e 100644 --- a/docs/html/config_networks.html +++ b/docs/html/config_networks.html @@ -2,54 +2,88 @@

A network is the type of carrier for your television signals. Tvheadend supports several different types of network, notably:

-
  • DVB-C : Cable TV, delivered via a cable to your house -
  • DVB-S : Satellite (includes S2), so any signal coming in via a dish -
  • DVB-T : Terrestrial, so over-the-air broadcasts received through a traditional television aerial -
  • ATSC : Over-the-air terrestrial, common in north and central America and parts of south Asia -
  • IPTV : IP, so over the Internet +
  • DVB-C : Cable TV, delivered via a cable to your house +
  • DVB-S : Satellite (includes S2), so any signal coming in via a dish +
  • DVB-T : Terrestrial, so over-the-air broadcasts received through a traditional television aerial +
  • ATSC : Over-the-air terrestrial, common in north and central America and parts of south Asia +
  • IPTV : IP, so over the Internet

    • - +
    +
    +Buttons +
    +Buttons have the following functions: +

    +
    +
    Add +
    + Add a new network. You can choose from any of the types described above. +

    +

    Delete +
    + Delete an existing network. This will also remove any association with an adapter. +

    +

    Edit +
    + Edit an existing network. This allows you to change any of the parameters you'd otherwise set when adding a new network, e.g. network discovery, idle scan, etc. - similar to using the check boxes to enable/disable functions. +

    +

    Save +
    + Saves any changes. +

    +

    Undo +
    + Undoes any changes. +

    +

    +

    +
    +

    + Columns +
    The columns have the following functions:
    -
    Network Name +
    Network Name
    The name of the network. This can be set automatically or you can give it a name that means something to you (e.g. if you have multiple OTA networks). - - -
    Network Discovery +

    +

    Network Discovery
    Whether automatic discovery is enabled for this network, i.e. whether Tvheadend looks for muxes or simply stays with the list of muxes as defined initially. - -
    Skip initial Scan +

    +

    Skip initial Scan
    Don't scan this network for muxes at Tvheadend start. - -
    Idle Scan Muxes +

    +

    Idle Scan Muxes
    When nothing else happens Tvheadend will continuously rotate among all muxes and tune to them to verify that they are still working. If your adapter have problems with lots of tuning, try to disable this. - -
    Max Input Streams +

    +

    Ignore Provider's Channel Numbers +
    Some providers will try to set a channel number so that every receiver is consistent - "tune to Channel x on 150". This option allows you to ignore this and let tvhheadend allocate a channel number itself. +

    +

    Max Input Streams
    IPTV : maximum simultaneous streams that can be played. - -
    Max Bandwidth +

    +

    Max Bandwidth
    IPTV : maximum bandwidth allowed for streams. - -
    Max timeout +

    +

    Max timeout
    IPTV : maximum timeout trying to play stream. - -
    Network ID +

    +

    Network ID
    If you experience problems caused by overlaps between multiple network providers this option can be used to filter which network ID is received by a given adapter. - -
    Character Set +

    +

    Character Set
    The character encoding for this network (e.g. UTF-8). - -
    Priority +

    +

    Priority
    IPTV : The network priority value (higher value = higher priority to use muxes/services from this network). - -
    Streaming Priority +

    +

    Streaming Priority
    IPTV : The network priority value for streamed channels through HTTP or HTSP (higher value = higher priority to use muxes/services from this network). If not set, the standard network priority value is used. diff --git a/docs/html/config_tvadapters.html b/docs/html/config_tvadapters.html index a65428d4..3ace1e45 100644 --- a/docs/html/config_tvadapters.html +++ b/docs/html/config_tvadapters.html @@ -8,79 +8,86 @@ you only have to click once in it.

    - -

    The rows have the following functions

    - +

    + +

    +
    +
    +Rows +
    +The rows have the following functions +

    +
    Basic Settings
    -
    Enabled
    -
    If selected, the IPTV service will be enabled an use for channel - subscriptions.
    - -
    Name
    +
    Enabled
    +
    If selected, this tuner/adapter will be enabled and will become available to receive broadcasts or programmes.
    +

    +

    Name
    The name of this tuner.
    - -
    Over-the-Air EPG
    +

    +

    Over-the-Air EPG
    Enable over-the-air programme guide (EPG) scanning on this input device.
    - -
    Networks
    +

    +

    Networks
    Associate this device with one or more networks.
    - -
    Priority
    +

    +

    Power Save
    +
    If enabled, allows the tuner to go to sleep when idle.
    +

    +

    +
    Advanced Settings
    +
    +
    Priority
    The tuner priority value (higher value = higher priority to use this tuner).
    - -
    Streaming Priority
    +

    +

    Streaming Priority
    The tuner priority value for streamed channels through HTTP or HTSP (higher value = higher priority to use this tuner). If not set (zero), the standard priority value is used.
    -

    - -

    LinuxDVB specific rows

    +

    +
    +
    +SAT>IP Specific Rows +
    -
    Keep FE open
    -
    Enable to not close the LinuxDVB frontend device in the idle state.
    -
    - -

    SAT>IP specific rows

    - -
    -
    Full Mux Rx mode supported
    -
    Enable, if the SAT>IP box supports the full mux rx mode (pids=all) - parameter.
    - -
    Signal scale (240 or 100)
    -
    Some SAT>IP boxes has only 0-100 scale. If your signal is too low, try - value 100 here.
    - -
    Maximum PIDs
    +
    Full Mux Rx mode supported
    +
    Enable if the SAT>IP box supports the full mux rx mode (pids=all)
    + note: no comma after 'Enable'
    +

    +

    Signal scale (240 or 100)
    +
    Some SAT>IP boxes only report a 0-100 (percentage) signal strength. If your signal strength reports as too low, try +setting this to 100.
    +

    +

    Maximum PIDs
    Maximum supported PIDs in the filter of the SAT>IP box.
    - -
    Maximum length of PIDs
    +

    +

    Maximum length of PIDs
    Maximum length in characters for the command setting PIDs to the SAT>IP box.
    - -
    addpids/delpids supported
    -
    Enable, if the SAT>IP box supports the addpids/delpids command. - -
    PIDs in setup
    +

    +

    Addpids/delpids supported
    +
    Enable if the SAT>IP box supports the addpids/delpids command. +

    +

    PIDs in setup
    Enable, if the SAT>IP box requires pids=0 parameter in the SETUP RTSP command.
    - -
    Force pilot for DVB-S2
    +

    +

    Force pilot for DVB-S2
    Enable, if the SAT>IP box requiest plts=on parameter in the SETUP RTSP command for DVB-S2 muxes.
    - -
    UDP RTP Port Number (2 ports)
    +

    +

    UDP RTP Port Number (2 ports)
    Force the local UDP Port number here. The number should be even (RTP port). The next odd number (+1) will be used as the RTCP port.
    - -
    Satellite Positions
    +

    +

    Satellite Positions
    Select the number of satellite positions supported by the SAT>IP hardware and your coaxial cable wiring.
    - -
    Master Tuner
    +

    +

    Master Tuner
    Select the master tuner.

    The signal from the standard universal LNB can be split using a simple coaxial splitter (no multiswitch) to several outputs. @@ -90,17 +97,17 @@ a slave one and tvheadend will assure that this tuner will not use incompatible parameters (position, polarization, lo-hi).

    - -
    Next tune delay in ms (0-2000)
    +

    +

    Next tune delay in ms (0-2000)
    The delay before tuning in milliseconds after tuner stop. If the time after previous start and next start is greater than this value - the delay is not applied. - -
    Send full PLAY cmd
    +

    +

    Send full PLAY cmd
    Send the full RTSP PLAY command after full RTSP SETUP command. Some device firmwares requires this to get MPEG-TS stream.
    - -
    Force teardown delay
    +

    +

    Force teardown delay
    Force the delay between RTSP TEARDOWN and RTSP SETUP command (value from 'Next tune delay in ms' is used). Some devices are not able to handle quick continuous tuning.
    diff --git a/src/webui/static/app/config.js b/src/webui/static/app/config.js index e9338bcf..166dbd3f 100644 --- a/src/webui/static/app/config.js +++ b/src/webui/static/app/config.js @@ -241,7 +241,7 @@ tvheadend.miscconf = function(panel, index) { var mpanel = new Ext.Panel({ title: 'General', - iconCls: 'wrench', + iconCls: 'general', border: false, autoScroll: true, bodyStyle: 'padding:15px', diff --git a/src/webui/static/app/dvr.js b/src/webui/static/app/dvr.js index a9a0f9c4..eba281f3 100644 --- a/src/webui/static/app/dvr.js +++ b/src/webui/static/app/dvr.js @@ -372,7 +372,7 @@ tvheadend.dvr_settings = function(panel, index) { titleS: 'Digital Video Recorder Profile', titleP: 'Digital Video Recorder Profiles', titleC: 'Profile Name', - iconCls: 'drive', + iconCls: 'dvrprofiles', tabIndex: index, add: { url: 'api/dvr/config', diff --git a/src/webui/static/app/ext.css b/src/webui/static/app/ext.css index 3f7bd81b..f9df5485 100644 --- a/src/webui/static/app/ext.css +++ b/src/webui/static/app/ext.css @@ -414,6 +414,34 @@ background-image: url(../icons/accept.png) !important; } +.general{ + background-image: url(../icons/general.png) !important; +} + +.dvrprofiles{ + background-image: url(../icons/dvrprofiles.png) !important; +} + +.recording{ + background-image: url(../icons/recording.png) !important; +} + +.timeshift{ + background-image: url(../icons/timeshift.png) !important; +} + +.stream{ + background-image: url(../icons/stream.png) !important; +} + +.connections{ + background-image: url(../icons/connections.png) !important; +} + +.subscriptions{ + background-image: url(../icons/subscriptions.png) !important; +} + .x-linked { display: inline-block; background-image: url(../icons/linked.gif) !important; diff --git a/src/webui/static/app/status.js b/src/webui/static/app/status.js index 868f4f8f..66f1e013 100644 --- a/src/webui/static/app/status.js +++ b/src/webui/static/app/status.js @@ -179,7 +179,7 @@ tvheadend.status_subs = function(panel, index) header: false, layout: 'fit', title: 'Subscriptions', - iconCls: 'eye' + iconCls: 'subscriptions' }); tvheadend.paneladd(panel, dpanel, index); @@ -425,7 +425,7 @@ tvheadend.status_streams = function(panel, index) header: false, layout: 'fit', title: 'Stream', - iconCls: 'hardware' + iconCls: 'stream' }); tvheadend.paneladd(panel, dpanel, index); @@ -560,7 +560,7 @@ tvheadend.status_conns = function(panel, index) { header: false, layout: 'fit', title: 'Connections', - iconCls: 'eye' + iconCls: 'connections' }); tvheadend.paneladd(panel, dpanel, index); diff --git a/src/webui/static/app/timeshift.js b/src/webui/static/app/timeshift.js index b7085125..017512ce 100644 --- a/src/webui/static/app/timeshift.js +++ b/src/webui/static/app/timeshift.js @@ -130,7 +130,7 @@ tvheadend.timeshift = function(panel, index) { var confpanel = new Ext.form.FormPanel({ title : 'Timeshift', - iconCls : 'clock', + iconCls : 'timeshift', border : false, bodyStyle : 'padding:15px', labelAlign : 'left', diff --git a/src/webui/static/app/tvheadend.js b/src/webui/static/app/tvheadend.js index 7779d906..cb92e758 100644 --- a/src/webui/static/app/tvheadend.js +++ b/src/webui/static/app/tvheadend.js @@ -386,7 +386,7 @@ function accessUpdate(o) { activeTab: 0, autoScroll: true, title: 'Recording', - iconCls: 'drive', + iconCls: 'recording', items: [] }); tvheadend.dvr_settings(tsdvr); diff --git a/src/webui/static/icons/connections.png b/src/webui/static/icons/connections.png new file mode 100644 index 00000000..b335cb11 Binary files /dev/null and b/src/webui/static/icons/connections.png differ diff --git a/src/webui/static/icons/dvrprofiles.png b/src/webui/static/icons/dvrprofiles.png new file mode 100644 index 00000000..0b63f172 Binary files /dev/null and b/src/webui/static/icons/dvrprofiles.png differ diff --git a/src/webui/static/icons/general.png b/src/webui/static/icons/general.png new file mode 100644 index 00000000..0028d78d Binary files /dev/null and b/src/webui/static/icons/general.png differ diff --git a/src/webui/static/icons/recording.png b/src/webui/static/icons/recording.png new file mode 100644 index 00000000..b6c5132d Binary files /dev/null and b/src/webui/static/icons/recording.png differ diff --git a/src/webui/static/icons/stream.png b/src/webui/static/icons/stream.png new file mode 100644 index 00000000..4191f42c Binary files /dev/null and b/src/webui/static/icons/stream.png differ diff --git a/src/webui/static/icons/subscriptions.png b/src/webui/static/icons/subscriptions.png new file mode 100644 index 00000000..10137e55 Binary files /dev/null and b/src/webui/static/icons/subscriptions.png differ diff --git a/src/webui/static/icons/timeshift.png b/src/webui/static/icons/timeshift.png new file mode 100644 index 00000000..d3de8e53 Binary files /dev/null and b/src/webui/static/icons/timeshift.png differ