[kde-plasma-yawp] update geometry patch
nucleo
nucleo at fedoraproject.org
Wed Nov 16 18:55:51 UTC 2011
commit 70c1360bc58e71ff7f914829afb09581bb03a33b
Author: nucleo <nucleo at fedoraproject.org>
Date: Wed Nov 16 20:55:46 2011 +0200
update geometry patch
kde-plasma-yawp-fix-geometry.patch | 80 ++++++++++++++++++++----------------
kde-plasma-yawp.spec | 5 +-
2 files changed, 47 insertions(+), 38 deletions(-)
---
diff --git a/kde-plasma-yawp-fix-geometry.patch b/kde-plasma-yawp-fix-geometry.patch
index c1f5295..402d044 100644
--- a/kde-plasma-yawp-fix-geometry.patch
+++ b/kde-plasma-yawp-fix-geometry.patch
@@ -1,7 +1,7 @@
Index: applet/yawp.cpp
===================================================================
--- applet/yawp.cpp (revision 483)
-+++ applet/yawp.cpp (revision 484)
++++ applet/yawp.cpp (revision 485)
@@ -99,7 +99,7 @@
WeatherDataProcessor * pDataProcessor = new WeatherDataProcessor( &m_storage );
m_pWeatherModel = new WeatherServiceModel( &m_storage, this, pDataProcessor );
@@ -85,16 +85,15 @@ Index: applet/yawp.cpp
dEndFunct();
}
-@@ -326,7 +326,7 @@
+@@ -326,7 +326,6 @@
loadConfig();
loadCustomTheme();
initAppletPainter();
- resize( m_pAppletPainter->getSize(QSize()) );
-+ resize( m_pAppletPainter->getSize(QSize(contentsRect().width(), contentsRect().height())) );
//--- just 4 debug ---
/* CityWeather dummyCity1;
-@@ -347,25 +347,25 @@
+@@ -347,25 +346,32 @@
dummyCity2.setTimeZone("Asia/Shanghai");
m_pWeatherModel->addCity(dummyCity2);
//--- end of debug section ---
@@ -104,15 +103,24 @@ Index: applet/yawp.cpp
setCityIndex( m_configData.iCityIndex );
const bool bHasCities = (m_pWeatherModel->rowCount() > 0);
- m_pManualUpdate->setEnabled( bHasCities );
- m_pCitySubMenu->setEnabled( bHasCities);
+- m_pManualUpdate->setEnabled( bHasCities );
+- m_pCitySubMenu->setEnabled( bHasCities);
-
+
if (bHasCities)
++ {
++ resize( m_pAppletPainter->getSize(QSize(contentsRect().width(), contentsRect().height())) );
m_iIdPendingEngineConnection = startTimer( m_configData.iStartDelay*60*1000 );
++ }
else
++ {
++ resize( m_pAppletPainter->getSize(QSize()) );
QTimer::singleShot(0, this, SLOT(slotConfigurationRequired()) );
-
++ }
++
++ m_pManualUpdate->setEnabled( bHasCities );
++ m_pCitySubMenu->setEnabled( bHasCities);
+
startTraverseLocationTimeout();
-
@@ -125,7 +133,7 @@ Index: applet/yawp.cpp
dEndFunct();
}
-@@ -491,7 +491,7 @@
+@@ -491,7 +497,7 @@
cityInfo.setCountry( QUrl::fromPercentEncoding(lst.at(2).toUtf8()) );
cityInfo.setCountryCode( QUrl::fromPercentEncoding(lst.at(3).toUtf8()) );
cityInfo.setExtraData( QUrl::fromPercentEncoding(lst.at(4).toUtf8()) );
@@ -134,7 +142,7 @@ Index: applet/yawp.cpp
if( lst.count() > 5 )
cityInfo.setTimeZone( QUrl::fromPercentEncoding(lst.at(5).toUtf8()) );
if( !cityInfo.timeZone().isValid() )
-@@ -502,10 +502,10 @@
+@@ -502,10 +508,10 @@
}
if( cityInfo.countryCode().isEmpty() && cityInfo.timeZone().isValid() )
cityInfo.setCountryCode( cityInfo.timeZone().countryCode() );
@@ -147,7 +155,7 @@ Index: applet/yawp.cpp
m_pWeatherModel->addCity( cityInfo );
iCityIndex += 1;
-@@ -528,7 +528,7 @@
+@@ -528,7 +534,7 @@
cfg.writeEntry( "start delay", (int)m_configData.iStartDelay );
cfg.writeEntry( "traverse locations", m_configData.bTraverseLocationsPeriodically );
cfg.writeEntry( "traverse locations timeout", m_configData.iTraverseLocationTimeout );
@@ -156,7 +164,7 @@ Index: applet/yawp.cpp
cfg.writeEntry( "system.distance", (int)m_configData.distanceSystem );
cfg.writeEntry( "system.pressure", (int)m_configData.pressureSystem );
cfg.writeEntry( "system.temperature", (int)m_configData.temperatureSystem );
-@@ -615,11 +615,11 @@
+@@ -615,11 +621,11 @@
YaWP::constraintsEvent(Plasma::Constraints constraints)
{
dStartFunct();
@@ -170,7 +178,7 @@ Index: applet/yawp.cpp
if (m_pAppletPainter->formFactor() == Plasma::Planar)
{
if (m_configData.sBackgroundName == QLatin1String("default") &&
-@@ -632,7 +632,7 @@
+@@ -632,7 +638,7 @@
{
setBackgroundHints(NoBackground);
}
@@ -179,7 +187,7 @@ Index: applet/yawp.cpp
}
else if (m_pAppletPainter->formFactor() == Plasma::Horizontal)
{
-@@ -644,7 +644,7 @@
+@@ -644,7 +650,7 @@
// no backround in vertical panel mode
setBackgroundHints(NoBackground);
}
@@ -188,7 +196,7 @@ Index: applet/yawp.cpp
updateSize();
}
if (constraints.testFlag(Plasma::SizeConstraint))
-@@ -662,12 +662,12 @@
+@@ -662,12 +668,12 @@
YaWP::updateSize()
{
QSize sizeHint = m_pAppletPainter->getSize(size());
@@ -203,7 +211,7 @@ Index: applet/yawp.cpp
setMinimumWidth(sizeHint.width());
setMaximumWidth(sizeHint.width());
}
-@@ -685,7 +685,7 @@
+@@ -685,7 +691,7 @@
setMaximumWidth(QWIDGETSIZE_MAX);
setMinimumHeight(30);
setMaximumHeight(QWIDGETSIZE_MAX);
@@ -212,7 +220,7 @@ Index: applet/yawp.cpp
resize(sizeHint);
}
}
-@@ -773,11 +773,11 @@
+@@ -773,11 +779,11 @@
// handle this events. Therefore there is no way for the user to hide the popup manual,
// unless user is adding at least one city to the applet.
hidePopup();
@@ -226,7 +234,7 @@ Index: applet/yawp.cpp
// to make sure we will change the theme
constraintsEvent( Plasma::FormFactorConstraint | Plasma::SizeConstraint );
initAppletPainter();
-@@ -797,19 +797,19 @@
+@@ -797,19 +803,19 @@
{
return;
}
@@ -249,7 +257,7 @@ Index: applet/yawp.cpp
if (!event->isAccepted() && m_pAppletPainter->formFactor() != Plasma::Planar)
togglePopup();
-@@ -829,7 +829,7 @@
+@@ -829,7 +835,7 @@
else if (event->timerId() == m_iIdTraverseLocations)
{
stopTraverseLocationTimeout();
@@ -258,7 +266,7 @@ Index: applet/yawp.cpp
int iSelectedCityIndex = (m_configData.iCityIndex + 1) % m_pWeatherModel->rowCount();
m_pAppletPainter->initCityChangeAnimation(iSelectedCityIndex);
}
-@@ -842,13 +842,13 @@
+@@ -842,13 +848,13 @@
dStartFunct();
stopPendingEngineConnection();
const CityWeather * const pCity = m_stateMachine.currentCity();
@@ -274,7 +282,7 @@ Index: applet/yawp.cpp
if( updateType.testFlag(WeatherServiceModel::CityInfoUpdate) )
{
updateCitySubMenu();
-@@ -859,7 +859,7 @@
+@@ -859,7 +865,7 @@
//--- update the paneltooltip when we are in panel mode only ---
if (m_pAppletPainter->formFactor() != Plasma::Planar)
createPanelTooltip();
@@ -283,7 +291,7 @@ Index: applet/yawp.cpp
m_pAppletPainter->update();
dEndFunct();
}
-@@ -904,7 +904,7 @@
+@@ -904,7 +910,7 @@
m_stateMachine.setCurrentCityIndex( cityIndex );
m_configData.iCityIndex = m_stateMachine.currentCityIndex();
const CityWeather * city = m_stateMachine.currentCity();
@@ -292,7 +300,7 @@ Index: applet/yawp.cpp
if (city)
{
//--- select the right menuitem in the city-submenu ---
-@@ -912,7 +912,7 @@
+@@ -912,7 +918,7 @@
int iCityIndex = m_stateMachine.currentCityIndex();
if (list.count() > iCityIndex)
list.at(iCityIndex )->setChecked( true );
@@ -301,7 +309,7 @@ Index: applet/yawp.cpp
//--- update the paneltooltip when we are in panel mode only ---
if (m_pAppletPainter->formFactor() != Plasma::Planar)
createPanelTooltip();
-@@ -931,7 +931,7 @@
+@@ -931,7 +937,7 @@
YaWP::slotThemeChanged()
{
setDefaultFontColors();
@@ -310,7 +318,7 @@ Index: applet/yawp.cpp
if (m_pAppletPainter->formFactor() != Plasma::Planar)
createPanelTooltip();
}
-@@ -946,10 +946,10 @@
+@@ -946,10 +952,10 @@
QDir::NoSort,
QDir::Files | QDir::NoSymLinks | QDir::Writable);
QFileInfoList cacheFiles = cacheDir.entryInfoList();
@@ -323,7 +331,7 @@ Index: applet/yawp.cpp
foreach(QFileInfo info, cacheFiles)
{
// When file is older than five days, we add it to the list of files that will be removed.
-@@ -963,7 +963,7 @@
+@@ -963,7 +969,7 @@
dTracing() << "Keeping file" << info.absoluteFilePath();
}
}
@@ -332,7 +340,7 @@ Index: applet/yawp.cpp
// Start job to remove selected files. We hide the progress information,
// because we do not want to bother the user with this stuff.
if (selectedCacheFiles.count() > 0)
-@@ -1022,7 +1022,7 @@
+@@ -1022,7 +1028,7 @@
action->setData( QVariant(i) );
m_pGrpActionCities->addAction( action );
m_pCitySubMenu->addAction( action );
@@ -341,7 +349,7 @@ Index: applet/yawp.cpp
if( i == m_configData.iCityIndex )
action->setChecked( true );
}
-@@ -1033,7 +1033,7 @@
+@@ -1033,7 +1039,7 @@
YaWP::initAppletPainter()
{
const Plasma::FormFactor form = formFactor();
@@ -350,7 +358,7 @@ Index: applet/yawp.cpp
if (m_pAppletPainter == 0 || m_pAppletPainter->formFactor() != form)
{
if (m_pAppletPainter != 0)
-@@ -1041,7 +1041,7 @@
+@@ -1041,7 +1047,7 @@
m_pAppletPainter->disconnect();
this->disconnect(m_pAppletPainter);
this->disconnect(m_pAppletPainter->timeLine());
@@ -359,7 +367,7 @@ Index: applet/yawp.cpp
delete m_pAppletPainter;
}
-@@ -1062,12 +1062,12 @@
+@@ -1062,12 +1068,12 @@
connect(m_pAppletPainter, SIGNAL(signalToggleWeatherIcon(int)), this, SLOT(slotToggleWeatherIcon(int)), Qt::DirectConnection);
connect(m_pAppletPainter->timeLine(), SIGNAL(finished()), this, SLOT(animationFinished()));
}
@@ -374,7 +382,7 @@ Index: applet/yawp.cpp
m_pAppletPainter->setupAnimationTimeLine();
}
-@@ -1077,16 +1077,16 @@
+@@ -1077,16 +1083,16 @@
{
bool itemFound = extender()->hasItem(PANEL_DESKTOP_INTERFACE_NAME);
Plasma::ExtenderItem * item = 0;
@@ -394,7 +402,7 @@ Index: applet/yawp.cpp
if (panelPainter != 0 && popupDesktopInterface != 0)
{
panelPainter->setPopupPainter(popupDesktopInterface->desktopPainter());
-@@ -1121,14 +1121,14 @@
+@@ -1121,14 +1127,14 @@
popupDesktopInterface->setSvg(&m_svg);
popupDesktopInterface->setCustomSvg(&m_customSvg);
popupDesktopInterface->setupAnimationTimeLine();
@@ -412,7 +420,7 @@ Index: applet/yawp.cpp
item->setTitle(i18n("yaWP Desktop Interface"));
item->setIcon("weather-clear");
item->setWidget(popupDesktopInterface);
-@@ -1141,7 +1141,7 @@
+@@ -1141,7 +1147,7 @@
YaWP::destroyExtenderItem()
{
bool itemFound = extender()->hasItem(PANEL_DESKTOP_INTERFACE_NAME);
@@ -421,7 +429,7 @@ Index: applet/yawp.cpp
if (itemFound)
{
extender()->item(PANEL_DESKTOP_INTERFACE_NAME)->deleteLater();
-@@ -1153,7 +1153,7 @@
+@@ -1153,7 +1159,7 @@
{
dStartFunct();
Plasma::ToolTipManager::self()->clearContent(this);
@@ -430,7 +438,7 @@ Index: applet/yawp.cpp
//--- just exit, when we have no city or no weather information ---
const CityWeather * city = m_stateMachine.currentCity();
if( !city || city->days().count() == 0 )
-@@ -1164,7 +1164,7 @@
+@@ -1164,7 +1170,7 @@
Plasma::ToolTipContent toolTipData;
toolTipData.setMainText( city->localizedCityString() );
@@ -439,7 +447,7 @@ Index: applet/yawp.cpp
//--- Create the tooltip pixmap for simple layout and extended tooltip ---
if (!m_configData.bUseExtendedTooltip ||
m_configData.extendedTooltipOptions.testFlag(Yawp::PreviewPage))
-@@ -1172,46 +1172,46 @@
+@@ -1172,46 +1178,46 @@
DesktopPainter toolTipPainter(0, &m_configData, &m_stateMachine);
toolTipPainter.setSvg(&m_svg);
toolTipPainter.setCustomSvg(&m_customSvg);
@@ -495,7 +503,7 @@ Index: applet/yawp.cpp
toolTipText += "<u>"
+ i18n("Forecast for %1 (%2)",
i18nc("Forecast for day",
-@@ -1221,7 +1221,7 @@
+@@ -1221,7 +1227,7 @@
toolTipText += i18n("Day: ")
+ Utils::LocalizedWeatherString(day->weather().description())
+ "<br />";
@@ -504,7 +512,7 @@ Index: applet/yawp.cpp
if (day->hasNightValues())
{
toolTipText += i18n("Night: ")
-@@ -1253,29 +1253,29 @@
+@@ -1253,29 +1259,29 @@
+ "<br />";
}
}
diff --git a/kde-plasma-yawp.spec b/kde-plasma-yawp.spec
index 8592d8b..ec1af33 100644
--- a/kde-plasma-yawp.spec
+++ b/kde-plasma-yawp.spec
@@ -1,6 +1,6 @@
Name: kde-plasma-yawp
Version: 0.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Yet Another Weather Plasmoid
Group: User Interface/Desktops
License: GPLv2+
@@ -8,6 +8,7 @@ URL: http://www.kde-look.org/content/show.php?content=94106
Source0: http://downloads.sourceforge.net/yawp/yawp-%{version}.tar.bz2
# fix geometry settings (#754407)
# http://yawp.svn.sourceforge.net/viewvc/yawp?view=revision&revision=484
+# http://yawp.svn.sourceforge.net/viewvc/yawp?view=revision&revision=485
Patch0: kde-plasma-yawp-fix-geometry.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -66,7 +67,7 @@ rm -rf %{buildroot}
%changelog
-* Wed Nov 16 2011 Alexey Kurov <nucleo at fedoraproject.org> - 0.4.0-3
+* Wed Nov 16 2011 Alexey Kurov <nucleo at fedoraproject.org> - 0.4.0-4
- fix geometry settings (#754407)
* Sun Nov 13 2011 Alexey Kurov <nucleo at fedoraproject.org> - 0.4.0-2
More information about the scm-commits
mailing list