Commit Graph

110 Commits

Author SHA1 Message Date
vanhofen
ad2c2137c4 dboxinfo: use new marker icons
Origin commit data
------------------
Commit: f7da605281
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-04 (Thu, 04 Jan 2018)

Origin message was:
------------------
- dboxinfo: use new marker icons
2018-01-04 16:07:46 +01:00
Stefan Seyfried
4895797537 dboxinfo: allow to show "neutrino uptime"
Origin commit data
------------------
Commit: a98f94621a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)
2017-12-26 22:58:37 +01:00
vanhofen
904003dede Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/icons/buttons/0.png
	data/icons/buttons/1.png
	data/icons/buttons/2.png
	data/icons/buttons/3.png
	data/icons/buttons/4.png
	data/icons/buttons/5.png
	data/icons/buttons/6.png
	data/icons/buttons/7.png
	data/icons/buttons/8.png
	data/icons/buttons/9.png
	data/icons/buttons/blau.png
	data/icons/buttons/btn_backward.png
	data/icons/buttons/btn_forward.png
	data/icons/buttons/btn_pause.png
	data/icons/buttons/btn_play.png
	data/icons/buttons/btn_record_active.png
	data/icons/buttons/btn_record_inactive.png
	data/icons/buttons/btn_stop.png
	data/icons/buttons/down.png
	data/icons/buttons/gelb.png
	data/icons/buttons/gruen.png
	data/icons/buttons/help.png
	data/icons/buttons/help_small.png
	data/icons/buttons/home.png
	data/icons/buttons/info.png
	data/icons/buttons/info_small.png
	data/icons/buttons/left.png
	data/icons/buttons/menu.png
	data/icons/buttons/menu_small.png
	data/icons/buttons/mute_small.png
	data/icons/buttons/mute_zap_gray.png
	data/icons/buttons/mute_zap_green.png
	data/icons/buttons/ok.png
	data/icons/buttons/power.png
	data/icons/buttons/right.png
	data/icons/buttons/rot.png
	data/icons/buttons/up.png
	data/icons/filetypes/movie.png
	data/icons/filetypes/mp3.png
	data/icons/headers/audio.png
	data/icons/headers/bookmarkmanager.png
	data/icons/headers/colors.png
	data/icons/headers/error.png
	data/icons/headers/features.png
	data/icons/headers/games.png
	data/icons/headers/icon_blue.png
	data/icons/headers/icon_green.png
	data/icons/headers/icon_red.png
	data/icons/headers/icon_yellow.png
	data/icons/headers/information.png
	data/icons/headers/keybinding.png
	data/icons/headers/language.png
	data/icons/headers/lcd.png
	data/icons/headers/mainmenue.png
	data/icons/headers/multimedia.png
	data/icons/headers/network.png
	data/icons/headers/personalize.png
	data/icons/headers/shell.png
	data/icons/headers/softupdate.png
	data/icons/headers/streaming.png
	data/icons/headers/timer.png
	data/icons/headers/upnp.png
	data/icons/headers/video.png
	data/icons/movieplayer/mp_b-skip.png
	data/icons/movieplayer/mp_f-skip.png
	data/icons/movieplayer/mp_pause.png
	data/icons/movieplayer/mp_play.png
	data/icons/movieplayer/mp_play_repeat_all.png
	data/icons/movieplayer/mp_play_repeat_track.png
	data/icons/status/ca/biss_green.png
	data/icons/status/ca/biss_white.png
	data/icons/status/ca/biss_yellow.png
	data/icons/status/ca/conax_green.png
	data/icons/status/ca/conax_white.png
	data/icons/status/ca/conax_yellow.png
	data/icons/status/ca/cw_green.png
	data/icons/status/ca/cw_white.png
	data/icons/status/ca/cw_yellow.png
	data/icons/status/ca/d_green.png
	data/icons/status/ca/d_white.png
	data/icons/status/ca/d_yellow.png
	data/icons/status/ca/ird_green.png
	data/icons/status/ca/ird_white.png
	data/icons/status/ca/ird_yellow.png
	data/icons/status/ca/nagra_green.png
	data/icons/status/ca/nagra_white.png
	data/icons/status/ca/nagra_yellow.png
	data/icons/status/ca/nds_green.png
	data/icons/status/ca/nds_white.png
	data/icons/status/ca/nds_yellow.png
	data/icons/status/ca/powervu_green.png
	data/icons/status/ca/powervu_white.png
	data/icons/status/ca/powervu_yellow.png
	data/icons/status/ca/seca_green.png
	data/icons/status/ca/seca_white.png
	data/icons/status/ca/seca_yellow.png
	data/icons/status/ca/via_green.png
	data/icons/status/ca/via_white.png
	data/icons/status/ca/via_yellow.png
	data/icons/status/ca/x_green.png
	data/icons/status/ca/x_white.png
	data/icons/status/ca/x_yellow.png
	data/icons/status/channel/16_9.png
	data/icons/status/channel/16_9_gray.png
	data/icons/status/channel/ca2.png
	data/icons/status/channel/ca2_gray.png
	data/icons/status/channel/dd.png
	data/icons/status/channel/dd_avail.png
	data/icons/status/channel/dd_gray.png
	data/icons/status/channel/radiotextget.png
	data/icons/status/channel/radiotextoff.png
	data/icons/status/channel/radiotextwait.png
	data/icons/status/channel/res_000.png
	data/icons/status/channel/res_1080.png
	data/icons/status/channel/res_1280.png
	data/icons/status/channel/res_1440.png
	data/icons/status/channel/res_1920.png
	data/icons/status/channel/res_288.png
	data/icons/status/channel/res_352.png
	data/icons/status/channel/res_382.png
	data/icons/status/channel/res_480.png
	data/icons/status/channel/res_528.png
	data/icons/status/channel/res_544.png
	data/icons/status/channel/res_576.png
	data/icons/status/channel/res_704.png
	data/icons/status/channel/res_720.png
	data/icons/status/channel/res_hd.png
	data/icons/status/channel/res_sd.png
	data/icons/status/channel/subt.png
	data/icons/status/channel/subt_gray.png
	data/icons/status/channel/tuner_1.png
	data/icons/status/channel/tuner_2.png
	data/icons/status/channel/tuner_3.png
	data/icons/status/channel/tuner_4.png
	data/icons/status/channel/vtxt.png
	data/icons/status/channel/vtxt_gray.png
	data/icons/status/various/ats.png
	data/icons/status/various/ats_gray.png
	data/icons/status/various/ca.png
	data/icons/status/various/lock.png
	data/icons/status/various/mounted.png
	data/icons/status/various/mute.png
	data/icons/status/various/not_mounted.png
	data/icons/status/various/pip.png
	data/icons/status/various/rec_event_marker.png
	data/icons/status/various/rec_gray.png
	data/icons/status/various/zap.png
	data/locale/Makefile.am
	data/locale/english.locale
	data/pictures/backgrounds/1280x720/start.jpg
	src/driver/fb_accel_sti.cpp
	src/gui/Makefile.am
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/system/settings.cpp
	src/system/settings.h


Origin commit data
------------------
Commit: 4121099dcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)
2017-10-18 09:41:46 +02:00
vanhofen
583f45fad7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Commit: 9e8dd73320
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
2017-10-02 23:19:49 +02:00
Jacek Jendrzej
f4c51e829b Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 7ad4a0e6cc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-02 (Mon, 02 Oct 2017)
2017-10-02 13:56:25 +02:00
Stefan Seyfried
c9d4fdd9cc remove "using namespace std" from header files
"using namespace std" in headers is considered bad practice, so move it
either into the respective cpp files or (for files which have lots of
other std::xxx usage anyway) just write it out explicitly.
Looking at the headers and the affected cpp files, one can actually see
why it is bad practice, as it's spreading very far ;-)


Origin commit data
------------------
Commit: 0d9139054a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)
2017-10-02 13:43:57 +02:00
Jacek Jendrzej
384b18ad8e Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 4fc73acffc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-29 (Fri, 29 Sep 2017)
2017-09-29 10:49:27 +02:00
vanhofen
20451a9be6 rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
Origin commit data
------------------
Commit: 99cc7f850a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)

Origin message was:
------------------
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
2017-09-29 10:34:23 +02:00
vanhofen
1776ae664d rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
Origin commit data
------------------
Commit: ebc621f3b2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)

Origin message was:
------------------
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
2017-09-29 08:27:42 +02:00
Stefan Seyfried
54189f271a Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
2016-10-22 11:37:40 +02:00
vanhofen
91fc1e2528 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Commit: e419a5c3b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)
2016-09-09 10:45:45 +02:00
vanhofen
fa2686a90e add listModeKey() function to simplify these calls
Origin commit data
------------------
Commit: 2911e638c7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- add listModeKey() function to simplify these calls
2016-09-09 10:42:46 +02:00
vanhofen
dffca87dfa minor alignments to cst-git; no binary changes
Origin commit data
------------------
Commit: 750c779f9f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-21 (Sat, 21 May 2016)

Origin message was:
------------------
- minor alignments to cst-git; no binary changes
2016-05-21 22:21:08 +02:00
vanhofen
4cf2b60722 NI \o/
Origin commit data
------------------
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)
2016-05-19 22:59:54 +02:00
[CST] Focus
38ede6dfb0 neutrino: add webtv channel list mode
Origin commit data
------------------
Commit: 302642cee7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-23 (Wed, 23 Mar 2016)
2016-03-23 16:36:00 +03:00
Thilo Graf
694fea40ad CDBoxInfoWidget: remove superfluous paint of header
Origin commit data
------------------
Commit: d8e3ecfa1d
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-03-22 (Tue, 22 Mar 2016)
2016-03-22 13:15:19 +01:00
[CST] Focus
f7997cb6dc gui/dboxinfo.cpp: try to fix missing s/n digits,
fix x position


Origin commit data
------------------
Commit: c796891165
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-01-29 (Fri, 29 Jan 2016)
2016-01-29 14:41:09 +03:00
Stefan Seyfried
e38e24e2c6 Revert "gui/dboxinfo.cpp: add serial number to title"
This reverts commit 87c2b3ed74.


Origin commit data
------------------
Commit: 530da9abeb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
2015-12-13 17:45:06 +01:00
Stefan Seyfried
17880c4125 Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...


Origin commit data
------------------
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
2015-12-13 17:41:55 +01:00
[CST] Focus
87c2b3ed74 gui/dboxinfo.cpp: add serial number to title
Origin commit data
------------------
Commit: 6bcb85fa07
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-24 (Wed, 24 Jun 2015)
2015-09-24 12:28:23 +03:00
Stefan Seyfried
d1e2143fd6 Merge remote-tracking branch 'check/cst-next'
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)
2014-12-28 12:32:12 +01:00
Stefan Seyfried
b22bf6f543 dboxinfo: fix buffer size, avoid overflow
Origin commit data
------------------
Commit: a91a27900c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-26 (Fri, 26 Dec 2014)
2014-12-26 22:13:59 +01:00
Stefan Seyfried
ec1a9fce17 Merge remote-tracking branch 'check/cst-next'
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
2014-12-25 18:03:08 +01:00
Jacek Jendrzej
3905eb0fda fix some possible errors
Origin commit data
------------------
Commit: d5d6c4de62
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-06 (Thu, 06 Nov 2014)
2014-11-06 14:40:44 +01:00
Jacek Jendrzej
526acd76d9 dboxinfo.cpp: fix progressbar offset
Origin commit data
------------------
Commit: 8055c0fbe2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
2014-09-27 16:21:26 +04:00
martii
547d900fee system/settings: move theme colors to dedicated struct
Conflicts:
	src/driver/pictureviewer/pictureviewer.cpp
	src/gui/epgview.cpp
	src/gui/osd_setup.cpp
	src/gui/pluginlist.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: b21cb152b5
Author: martii <m4rtii@gmx.de>
Date: 2014-01-06 (Mon, 06 Jan 2014)
2014-09-12 18:29:21 +04:00
vanhofen
f24d3bd2d5 dboxinfo: align color of time/load headers to other headers
Origin commit data
------------------
Commit: 0d236b39c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-11 (Thu, 11 Sep 2014)

Origin message was:
------------------
- dboxinfo: align color of time/load headers to other headers
2014-09-11 16:19:00 +02:00
[CST] Focus
3cbffe06f1 gui/dboxinfo: fixes
Origin commit data
------------------
Commit: d3c4b4f199
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-11 (Thu, 11 Sep 2014)
2014-09-11 18:12:09 +04:00
martii
bb0239bd4c gui/dboxinfo: localize (partially based on patch from Benny -- thanks!)
Conflicts:
	src/gui/dboxinfo.cpp


Origin commit data
------------------
Commit: 742760dbd3
Author: martii <m4rtii@gmx.de>
Date: 2014-05-24 (Sat, 24 May 2014)
2014-09-11 18:12:06 +04:00
[CST] Focus
3e2c460cc0 gui/dboxinfo.cpp: do not paint empty line
Origin commit data
------------------
Commit: 6857f616c2
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-09 (Tue, 09 Sep 2014)
2014-09-09 15:28:35 +04:00
[CST] Focus
17c40a5d6e merge neutrino-mp progressbar code, (C) martii
Origin commit data
------------------
Commit: 416646bbff
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)
2014-07-17 17:02:37 +04:00
Thilo Graf
f271c801de COSDFader: rename member functions, adapt implementations
Stop() is not exactly attributable if fader class used as inherited and
Fade() don't tell really what done and related to return value 'bool'...
especially as the fader class members have been not documented.


Origin commit data
------------------
Commit: 69e2debb02
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-05-30 (Fri, 30 May 2014)
2014-06-23 18:43:47 +02:00
vanhofen
3bba3094e2 change getRenderWidth() default to UTF8
Origin commit data
------------------
Commit: 8b91cda918
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)

Origin message was:
------------------
- change getRenderWidth() default to UTF8
2014-06-11 23:07:00 +02:00
Stefan Seyfried
3f36062fe7 Merge remote-tracking branch 'check/next-cc'
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
2014-04-27 19:14:06 +02:00
Jacek Jendrzej
1242b47e67 dboxinfo.cpp: shov inactive rec icon, if no rec is run
Origin commit data
------------------
Commit: 5764f3fc2c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-04-01 (Tue, 01 Apr 2014)
2014-04-01 14:44:09 +02:00
Stefan Seyfried
4f7ac90359 dboxinfo: fix format strings for uint64_t
Origin commit data
------------------
Commit: ecf430ba97
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)
2014-01-13 20:56:56 +01:00
Stefan Seyfried
69aa77b445 dboxinfo: fix format strings for uint64_t
Origin commit data
------------------
Commit: f23b9074f6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)
2014-01-12 14:45:48 +01:00
Stefan Seyfried
ddeef54bcf Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Commit: a92141d147
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)
2014-01-12 14:41:44 +01:00
martii
c8f556138f gui/dboxinfo: minor clean-up
Origin commit data
------------------
Commit: 341b75ccd9
Author: martii <m4rtii@gmx.de>
Date: 2014-01-07 (Tue, 07 Jan 2014)
2014-01-07 02:00:56 +01:00
martii
51223a5e37 gui/dboxinfo: fix bytes2string()
Origin commit data
------------------
Commit: 8839256793
Author: martii <m4rtii@gmx.de>
Date: 2014-01-06 (Mon, 06 Jan 2014)
2014-01-06 14:04:50 +01:00
Stefan Seyfried
63023ed83e fix sign
Origin commit data
------------------
Commit: 6a158066d0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-01 (Wed, 01 Jan 2014)
2014-01-06 00:34:06 +01:00
Stefan Seyfried
0acf55d8e6 dboxinfo: avoid unnecessary 64bit math
The kernel uses 'unsigned long' for those values anyway,
so there is no need for 'long long' in userspace.


Origin commit data
------------------
Commit: 34a2d55385
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-05 (Sun, 05 Jan 2014)
2014-01-05 21:12:20 +01:00
Stefan Seyfried
9b89414d7d dboxinfo: remove impossible case
The kernel does (and has always) report memory in
kib units, so there is no need to check this.


Origin commit data
------------------
Commit: 75e14b90e5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-05 (Sun, 05 Jan 2014)
2014-01-05 21:11:59 +01:00
Stefan Seyfried
cb983803ab dboxinfo: fix partition size display
Origin commit data
------------------
Commit: 171324fb95
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-05 (Sun, 05 Jan 2014)
2014-01-05 21:10:42 +01:00
Stefan Seyfried
bc811dabe8 dboxinfo: avoid unnecessary 64bit math
The kernel uses 'unsigned long' for those values anyway,
so there is no need for 'long long' in userspace.


Origin commit data
------------------
Commit: 77c07386e6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-05 (Sun, 05 Jan 2014)
2014-01-05 19:01:59 +01:00
Stefan Seyfried
9f88583a81 dboxinfo: remove impossible case
The kernel does (and has always) report memory in
kib units, so there is no need to check this.


Origin commit data
------------------
Commit: 5d157456ed
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-05 (Sun, 05 Jan 2014)
2014-01-05 18:53:23 +01:00
Stefan Seyfried
736d0c47f0 dboxinfo: fix partition size display
Origin commit data
------------------
Commit: 8946c6ebf8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-05 (Sun, 05 Jan 2014)
2014-01-05 18:34:51 +01:00
Stefan Seyfried
16942ab183 Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Commit: 56a7262d5d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-05 (Sun, 05 Jan 2014)
2014-01-05 18:31:31 +01:00
vanhofen
f240261210 dboxinfo: show uptime even more human readable
Origin commit data
------------------
Commit: 621a712e81
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-04 (Sat, 04 Jan 2014)

Origin message was:
------------------
- dboxinfo: show uptime even more human readable
2014-01-04 12:26:08 +01:00
martii
491c0fe537 gui/dboxinfo: show remote volumes, too
Origin commit data
------------------
Commit: 535f5dfc67
Author: martii <m4rtii@gmx.de>
Date: 2014-01-04 (Sat, 04 Jan 2014)
2014-01-04 12:26:08 +01:00