diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2010-08-21 20:31:53 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-08-21 20:31:53 +0000 |
| commit | 47d70afaf482bbd427ce4a1b864ef66255030e32 (patch) | |
| tree | f128f2e1c1b06c60f30cfd69499caebdcc787f28 /kde-base/plasma-workspace | |
| parent | Remove unused files (diff) | |
| download | gentoo-2-47d70afaf482bbd427ce4a1b864ef66255030e32.tar.gz gentoo-2-47d70afaf482bbd427ce4a1b864ef66255030e32.tar.bz2 gentoo-2-47d70afaf482bbd427ce4a1b864ef66255030e32.zip | |
rm
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/plasma-workspace')
| -rw-r--r-- | kde-base/plasma-workspace/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/plasma-workspace/files/4.3.3-progress_indicator.patch | 44 |
2 files changed, 5 insertions, 45 deletions
diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog index dcfe3420fd2a..012066075996 100644 --- a/kde-base/plasma-workspace/ChangeLog +++ b/kde-base/plasma-workspace/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/plasma-workspace # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.80 2010/08/09 17:34:34 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.81 2010/08/21 20:31:53 scarabeus Exp $ + + 21 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org> + -files/4.3.3-progress_indicator.patch: + rm 09 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org> plasma-workspace-4.4.5.ebuild: diff --git a/kde-base/plasma-workspace/files/4.3.3-progress_indicator.patch b/kde-base/plasma-workspace/files/4.3.3-progress_indicator.patch deleted file mode 100644 index 64e6d460bc89..000000000000 --- a/kde-base/plasma-workspace/files/4.3.3-progress_indicator.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- plasma/applets/systemtray/ui/jobwidget.cpp 2009/10/31 23:47:17 1043182 -+++ plasma/applets/systemtray/ui/jobwidget.cpp 2009/10/31 23:48:31 1043183 -@@ -208,6 +208,16 @@ - m_meter->setValue(m_job->percentage()); - - if (m_job) { -+ if (m_job->state() == SystemTray::Job::Running) { -+ //Update the ETA and job speed -+ if (m_job->eta()) { -+ m_eta->setText(i18n("%1 (%2 remaining)", m_job->speed(), -+ KGlobal::locale()->formatDuration(m_job->eta()))); -+ } else { -+ m_eta->setText(QString()); -+ } -+ } -+ - if (m_job->labels().count() > 0) { - labelName0 = m_job->labels().value(0).first; - label0 = m_job->labels().value(0).second; ---- plasma/applets/systemtray/ui/jobwidget.h 2009/10/31 23:47:17 1043182 -+++ plasma/applets/systemtray/ui/jobwidget.h 2009/10/31 23:48:31 1043183 -@@ -61,10 +61,10 @@ - void detailsClicked(); - void destroyExtenderItem(); - void scheduleUpdateJob(); -+ void updateJobState(); - - private: - void updateLabels(); -- void updateJobState(); - void updateJob(); - - Plasma::ExtenderItem *m_extenderItem; ---- plasma/dataengines/applicationjobs/kuiserverengine.cpp 2009/10/31 23:47:17 1043182 -+++ plasma/dataengines/applicationjobs/kuiserverengine.cpp 2009/10/31 23:48:31 1043183 -@@ -178,6 +178,8 @@ - void JobView::setSpeed(qlonglong bytesPerSecond) - { - m_speed = bytesPerSecond; -+ setData("speed", speedString()); -+ scheduleUpdate(); - } - - QString JobView::speedString() const |