rpms/kde-plasma-weather/F-10 kde-plasma-weather-1.0.0-rev936021-init-order.patch, NONE, 1.1 kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch, NONE, 1.1 kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch, NONE, 1.1 kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch, NONE, 1.1 kde-plasma-weather.spec, 1.2, 1.3
Kevin Kofler
kkofler at fedoraproject.org
Sun Apr 26 02:52:36 UTC 2009
- Previous message: rpms/kde-plasma-weather/F-11 kde-plasma-weather-1.0.0-rev936021-init-order.patch, NONE, 1.1 kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch, NONE, 1.1 kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch, NONE, 1.1 kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch, NONE, 1.1 kde-plasma-weather.spec, 1.3, 1.4
- Next message: rpms/kde-plasma-weather/F-9 kde-plasma-weather-1.0.0-rev936021-init-order.patch, NONE, 1.1 kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch, NONE, 1.1 kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch, NONE, 1.1 kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch, NONE, 1.1 kde-plasma-weather.spec, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kkofler
Update of /cvs/pkgs/rpms/kde-plasma-weather/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31529/F-10
Modified Files:
kde-plasma-weather.spec
Added Files:
kde-plasma-weather-1.0.0-rev936021-init-order.patch
kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch
kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch
kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch
Log Message:
* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-4
- backport 2 more layout fixes from trunk
- backport patch from trunk to honor preferred browser
- fix configuration issue: PopupApplet is not a city (#495998)
kde-plasma-weather-1.0.0-rev936021-init-order.patch:
--- NEW FILE kde-plasma-weather-1.0.0-rev936021-init-order.patch ---
diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev936021-init-order/weatherapplet.cpp
--- plasma-applet-weather-1.0.0/weatherapplet.cpp 2009-02-03 07:20:28.000000000 +0100
+++ plasma-applet-weather-1.0.0-rev936021-init-order/weatherapplet.cpp 2009-04-26 04:31:00.000000000 +0200
@@ -77,6 +77,8 @@
return m_graphicsWidget;
}
+ m_graphicsWidget = new QGraphicsWidget(this);
+
switch (formFactor()) {
case Plasma::Horizontal:
case Plasma::Vertical:
@@ -198,7 +200,6 @@
setConfigurationRequired(false);
}
- m_graphicsWidget = new QGraphicsWidget(this);
m_graphicsWidget->setLayout(m_layout);
return m_graphicsWidget;
kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch:
--- NEW FILE kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch ---
diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev941138-less-space-at-bottom/weatherapplet.cpp
--- plasma-applet-weather-1.0.0/weatherapplet.cpp 2009-02-03 07:20:28.000000000 +0100
+++ plasma-applet-weather-1.0.0-rev941138-less-space-at-bottom/weatherapplet.cpp 2009-04-26 04:31:48.000000000 +0200
@@ -180,6 +180,8 @@
m_titleFrame->setLayout(m_titlePanel);
m_layout->addItem(m_titleFrame);
+ m_courtesyLabel->nativeWidget()->setWordWrap(false);
+ m_courtesyLabel->nativeWidget()->setAlignment(Qt::AlignRight);
connect(m_courtesyLabel, SIGNAL(linkActivated(QString)), this, SLOT(creditLink(QString)));
// If we have any weather observations set them up here.
@@ -767,7 +769,7 @@
m_courtesyLabel->setText(data["Credit"].toString());
if (!data["Credit Url"].toString().isEmpty()) {
- QString creditUrl = QString("<A HREF=\"%1\">%2</A>").arg(data["Credit Url"].toString()).arg(data["Credit"].toString());
+ QString creditUrl = QString("<A HREF=\"%1\" ><FONT size=\"-0.5\" color=\"%2\">%3</FONT></A>").arg(data["Credit Url"].toString()).arg(Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor).rgb()).arg(data["Credit"].toString());
m_courtesyLabel->nativeWidget()->setTextInteractionFlags(Qt::TextBrowserInteraction);
//m_courtesyLabel->setAcceptHoverEvents(true);
//m_courtesyLabel->nativeWidget()->setMouseTracking(true);
kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch:
--- NEW FILE kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch ---
diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rev947565-ktoolinvocation/weatherapplet.cpp
--- plasma-applet-weather-1.0.0/weatherapplet.cpp 2009-02-03 07:20:28.000000000 +0100
+++ plasma-applet-weather-1.0.0-rev947565-ktoolinvocation/weatherapplet.cpp 2009-04-26 04:33:19.000000000 +0200
@@ -21,7 +21,7 @@
#include "weatherapplet.h"
#include <QCheckBox>
#include <KMessageBox>
-#include <KRun>
+#include <KToolInvocation>
#include <KDialog>
#include <KConfigDialog>
#include <KLocale>
@@ -274,12 +274,12 @@
void WeatherApplet::creditLink(const QString& url)
{
- KRun::runUrl(KUrl(url), "text/html", 0);
+ KToolInvocation::invokeBrowser(url);
}
void WeatherApplet::weatherNoticeLink(const QString& url)
{
- KRun::runUrl(KUrl(url), "text/html", 0);
+ KToolInvocation::invokeBrowser(url);
}
QList<QAction*> WeatherApplet::contextualActions()
kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch:
--- NEW FILE kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch ---
diff -ur plasma-applet-weather-1.0.0/weatherapplet.cpp plasma-applet-weather-1.0.0-rh495998-popupapplet-not-city/weatherapplet.cpp
--- plasma-applet-weather-1.0.0/weatherapplet.cpp 2009-02-03 07:20:28.000000000 +0100
+++ plasma-applet-weather-1.0.0-rh495998-popupapplet-not-city/weatherapplet.cpp 2009-04-26 04:40:59.000000000 +0200
@@ -184,6 +184,9 @@
// If we have any weather observations set them up here.
foreach(const QString& place, generalConfig.groupList()) {
+ if (place == QLatin1String("PopupApplet") {
+ continue; // not a place
+ }
KConfigGroup placeConfig(&generalConfig, place);
m_activePlace = place;
m_activeIon = placeConfig.readEntry("ion");
@@ -1229,6 +1232,9 @@
{
KConfigGroup generalConfig = config();
foreach(const QString& place, generalConfig.groupList()) {
+ if (place == QLatin1String("PopupApplet") {
+ continue; // not a place
+ }
KConfigGroup placeConfig(&generalConfig, place);
placeConfig.deleteGroup();
}
Index: kde-plasma-weather.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-weather/F-10/kde-plasma-weather.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde-plasma-weather.spec 5 Mar 2009 23:47:01 -0000 1.2
+++ kde-plasma-weather.spec 26 Apr 2009 02:52:05 -0000 1.3
@@ -1,6 +1,6 @@
Name: kde-plasma-weather
Version: 1.0.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Plasma applet for weather forecasts
Group: User Interface/Desktops
@@ -8,6 +8,8 @@
URL: http://www.kdedevelopers.org/blog/4267
Source0: ftp://ftp.kde.org/pub/kde/stable/4.2.0/src/extragear/plasma-applet-weather-%{version}.tar.bz2
+# configuration fix: PopupApplet is not a city (#495998)
+Patch0: kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch
# backports from trunk:
# fix rendering issues with Qt 4.5, in particular a bogus icon at the top left
Patch100: kde-plasma-weather-1.0.0-rev924102-qt45.patch
@@ -17,6 +19,14 @@
Patch102: kde-plasma-weather-1.0.0-rev926205-no-update-now.patch
# use only 1 decimal place for the wind gust
Patch103: kde-plasma-weather-1.0.0-rev930258-wind-gust.patch
+# assign m_graphicsWidget ASAP to avoid graphicsWidget() calling itself
+Patch104: kde-plasma-weather-1.0.0-rev936021-init-order.patch
+# less space at the bottom
+Patch105: kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch
+# use KToolInvocation rather than KRun on text/html to run browser
+# honors the setting to use another browser than the text/html file association
+Patch106: kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# The weather dataengine is in kdebase-workspace.
@@ -29,10 +39,14 @@
%prep
%setup -qn plasma-applet-weather-%{version}
+%patch0 -p1 -b .popupapplet-not-city
%patch100 -p1 -b .qt45
%patch101 -p1 -b .qt45-clip
%patch102 -p1 -b .no-update-now
%patch103 -p1 -b .wind-gust
+%patch104 -p1 -b .init-order
+%patch105 -p1 -b .less-space-at-bottom
+%patch106 -p1 -b .ktoolinvocation
%build
mkdir -p %{_target_platform}
@@ -56,6 +70,11 @@
%{_kde4_appsdir}/desktoptheme/default/weather/
%changelog
+* Sun Apr 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-4
+- backport 2 more layout fixes from trunk
+- backport patch from trunk to honor preferred browser
+- fix configuration issue: PopupApplet is not a city (#495998)
+
* Thu Mar 05 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.0-3
- backport 2 fixes for rendering issues with Qt 4.5 from trunk
- don't show the non-functional "Update now" menu entry (backported from trunk)
- Previous message: rpms/kde-plasma-weather/F-11 kde-plasma-weather-1.0.0-rev936021-init-order.patch, NONE, 1.1 kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch, NONE, 1.1 kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch, NONE, 1.1 kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch, NONE, 1.1 kde-plasma-weather.spec, 1.3, 1.4
- Next message: rpms/kde-plasma-weather/F-9 kde-plasma-weather-1.0.0-rev936021-init-order.patch, NONE, 1.1 kde-plasma-weather-1.0.0-rev941138-less-space-at-bottom.patch, NONE, 1.1 kde-plasma-weather-1.0.0-rev947565-ktoolinvocation.patch, NONE, 1.1 kde-plasma-weather-1.0.0-rh495998-popupapplet-not-city.patch, NONE, 1.1 kde-plasma-weather.spec, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list