For Frederic Gladhorn and FYI.
This patch adds/changes a lot of features to the marble plasma wallpaper in
playground.
Re-enabled the stars plugin as current Marble trunk doesn't seem to crash on
it any further.
Moved to a more generic support for globe rotation schemes to allow something
like "hover on home location" or free rotation (with the marble navigation
plugin).
Mouse interaction was removed completely, this caused all sort of weird
troubles when interacting with plasma widgets (instead rotates the globe or
vice versa). Mouse scrolling previously used for zooming the globe is also
otherwise reserved for switching workspaces. Instead the user can enable the
marble navigation widget to zoom/rotate the globe.
Reworked the configuration screen to show only options which make sense
together. This means some values are shown and hidden based on selected globe
rotation behavior, marble theme etc. More generic "show placemarks" instead
of "show night, show citylights, show places" to not present too much config
detail to the user.
Maybe we should also change the name from "The Earth" to something more
descriptive or just "Marble globe" to advertise this great technology ^^
There still remains some work on tweaking zoom/rotate/pan to stop the user
from scrolling over the maps _edges_ on flat map projections (looks not too
nice currently). The patch mixes code cleanup and feature changes, but being
in playground and in early development stage, I was just too lazy to produce
distinct patches :-)
Affected files:
playground/base/plasma/wallpapers/marble/config.ui
playground/base/plasma/wallpapers/marble/marble.cpp
playground/base/plasma/wallpapers/marble/marble.h
playground/base/plasma/wallpapers/marble/CMakeLists.txt
playground/base/plasma/wallpapers/CMakeLists.txt
--
Sascha Peilicke
http://saschpe.wordpress.com
Index: wallpapers/marble/config.ui
===================================================================
--- wallpapers/marble/config.ui (Revision 897233)
+++ wallpapers/marble/config.ui (Arbeitskopie)
@@ -1,11 +1,11 @@
<ui version="4.0" >
- <class>PatternSettingsWidget</class>
- <widget class="QWidget" name="PatternSettingsWidget" >
+ <class>MarbleSettingsWidget</class>
+ <widget class="QWidget" name="MarbleSettingsWidget" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
- <width>357</width>
+ <width>358</width>
<height>331</height>
</rect>
</property>
@@ -115,27 +115,44 @@
</item>
</widget>
</item>
- <item row="3" column="1" >
- <widget class="QRadioButton" name="followSun" >
+ <item row="5" column="0" >
+ <widget class="QLabel" name="label_7" >
<property name="text" >
- <string>&Follow sun position</string>
+ <string>Rotation:</string>
</property>
- <property name="checked" >
- <bool>true</bool>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
- <item row="4" column="1" >
- <widget class="QRadioButton" name="rotateAutomatically" >
- <property name="text" >
- <string>&Rotate automatically</string>
- </property>
+ <item row="5" column="1" >
+ <widget class="KComboBox" name="movement" >
+ <item>
+ <property name="text" >
+ <string>Follow the sun</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Hover above home location</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Custom rotation</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Custom placement</string>
+ </property>
+ </item>
</widget>
</item>
- <item row="5" column="1" >
+ <item row="8" column="1" >
<layout class="QGridLayout" name="gridLayout" >
<item row="0" column="0" >
- <widget class="QLabel" name="label_3" >
+ <widget class="QLabel" name="labelRotationLon" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
<horstretch>0</horstretch>
@@ -149,7 +166,7 @@
</size>
</property>
<property name="text" >
- <string>L&ongitude Rotation:</string>
+ <string>Longitude rotation:</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -161,21 +178,12 @@
</item>
<item row="0" column="1" >
<widget class="QDoubleSpinBox" name="rotationLon" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
<property name="wrapping" >
<bool>true</bool>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
- <property name="specialValueText" >
- <string>No rotation</string>
- </property>
<property name="suffix" >
<string>°</string>
</property>
@@ -194,7 +202,7 @@
</widget>
</item>
<item row="1" column="0" >
- <widget class="QLabel" name="label_6" >
+ <widget class="QLabel" name="labelRotationLat" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
<horstretch>0</horstretch>
@@ -208,7 +216,7 @@
</size>
</property>
<property name="text" >
- <string>L&atitude Rotation:</string>
+ <string>Latitude rotation:</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -220,21 +228,12 @@
</item>
<item row="1" column="1" >
<widget class="QDoubleSpinBox" name="rotationLat" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
<property name="wrapping" >
<bool>true</bool>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
- <property name="specialValueText" >
- <string>No rotation</string>
- </property>
<property name="suffix" >
<string>°</string>
</property>
@@ -252,8 +251,22 @@
</property>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QLabel" name="label_4" >
+ <item row="2" column="0" colspan="2" >
+ <widget class="KPushButton" name="homeLocation" >
+ <property name="text" >
+ <string>Set current position as home</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0" colspan="2" >
+ <widget class="QCheckBox" name="navigationEnabled" >
+ <property name="text" >
+ <string>Enable navigation widget</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0" >
+ <widget class="QLabel" name="labelTimeout" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
<horstretch>0</horstretch>
@@ -267,7 +280,7 @@
</size>
</property>
<property name="text" >
- <string>Update &Interval:</string>
+ <string>Update every:</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -277,64 +290,42 @@
</property>
</widget>
</item>
- <item row="2" column="1" >
+ <item row="4" column="1" >
<widget class="KIntNumInput" name="timeout" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="focusPolicy" >
- <enum>Qt::WheelFocus</enum>
- </property>
<property name="value" >
<number>10</number>
</property>
<property name="minimum" >
- <number>0</number>
+ <number>1</number>
</property>
<property name="maximum" >
- <number>100000</number>
+ <number>3600</number>
</property>
<property name="suffix" >
- <string>s</string>
+ <string> seconds</string>
</property>
- <property name="specialValueText" >
- <string>No updates</string>
- </property>
</widget>
</item>
</layout>
</item>
- <item row="6" column="1" >
- <widget class="QCheckBox" name="showCities" >
- <property name="text" >
- <string>Show &cities</string>
+ <item row="9" column="1" >
+ <widget class="Line" name="line" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
- <item row="7" column="1" >
- <widget class="QCheckBox" name="showNight" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <item row="13" column="1" >
+ <widget class="QCheckBox" name="showPlacemarks" >
+ <property name="toolTip" >
+ <string>Determines whether all kind of placemarks are shown or not.</string>
</property>
<property name="text" >
- <string>Shade the night half of the earth</string>
+ <string>Show &placemarks</string>
</property>
</widget>
</item>
- <item row="8" column="1" >
- <widget class="QCheckBox" name="showClouds" >
- <property name="text" >
- <string>Show c&louds</string>
- </property>
- </widget>
- </item>
- <item row="9" column="0" colspan="2" >
+ <item row="14" column="1" >
<spacer name="verticalSpacer" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
@@ -360,18 +351,19 @@
<extends>QWidget</extends>
<header>knuminput.h</header>
</customwidget>
+ <customwidget>
+ <class>KPushButton</class>
+ <extends>QPushButton</extends>
+ <header>kpushbutton.h</header>
+ </customwidget>
</customwidgets>
<tabstops>
<tabstop>themeList</tabstop>
<tabstop>projection</tabstop>
<tabstop>quality</tabstop>
- <tabstop>followSun</tabstop>
- <tabstop>rotateAutomatically</tabstop>
<tabstop>rotationLon</tabstop>
<tabstop>rotationLat</tabstop>
<tabstop>timeout</tabstop>
- <tabstop>showCities</tabstop>
- <tabstop>showClouds</tabstop>
</tabstops>
<resources/>
<connections/>
Index: wallpapers/marble/marble.cpp
===================================================================
--- wallpapers/marble/marble.cpp (Revision 897233)
+++ wallpapers/marble/marble.cpp (Arbeitskopie)
@@ -1,5 +1,6 @@
/*
Copyright 2008 Frederik Gladhorn <gladh...@kde.org>
+ Sascha Peilicke <sasch...@gmx.de>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -20,41 +21,37 @@
#include "marble.h"
-#include <KDebug>
+#include <marble/GeoPainter.h>
+#include <marble/MapThemeManager.h>
+#include <marble/MarbleAbstractFloatItem.h>
+#include <marble/MarbleMap.h>
+#include <marble/MarbleRenderPlugin.h>
+#include <marble/SunLocator.h>
+#include <marble/ViewParams.h>
-#include <GeoPainter.h>
-#include <ViewParams.h>
-#include <ViewportParams.h>
-#include <MarbleModel.h>
-#include <MarbleRenderPlugin.h>
-#include <SunLocator.h>
-#include <MapThemeManager.h>
-
-#include <QGraphicsSceneWheelEvent>
+#include <QGraphicsSceneMouseEvent>
#include <QStandardItemModel>
-#include <KDebug>
-
-#define DRAGTHRESHOLD 3
-
-#define MAP_THEME_CONFIG_KEY "mapTheme"
#define DISTANCE_CONFIG_KEY "distance"
-#define PROJECTION_CONFIG_KEY "projection"
-#define TIMEOUT_CONFIG_KEY "timeout"
-#define FOLLOW_SUN_CONFIG_KEY "followSun"
-#define ROTATION_LON_CONFIG_KEY "rotateLon"
-#define ROTATION_LAT_CONFIG_KEY "rotateLat"
+#define HOME_LON_CONFIG_KEY "homeLon"
+#define HOME_LAT_CONFIG_KEY "homeLat"
+#define HOME_ZOOM_CONFIG_KEY "homeZoom"
+#define MAP_THEME_CONFIG_KEY "mapTheme"
+#define NAVIGATION_CONFIG_KEY "navigationEnabled"
+#define MOVEMENT_CONFIG_KEY "movement"
#define POSITION_LON_CONFIG_KEY "positionLon"
#define POSITION_LAT_CONFIG_KEY "positionLat"
-#define SHOW_CITIES_CONFIG_KEY "showCities"
-#define SHOW_CLOUDS_CONFIG_KEY "showClouds"
-#define SHOW_NIGHT_CONFIG_KEY "showNight"
+#define PROJECTION_CONFIG_KEY "projection"
#define QUALITY_CONFIG_KEY "quality"
+#define ROTATION_LON_CONFIG_KEY "rotateLon"
+#define ROTATION_LAT_CONFIG_KEY "rotateLat"
+#define SHOW_PLACEMARKS_CONFIG_KEY "showPlacemarks"
+#define TIMEOUT_CONFIG_KEY "timeout"
namespace Marble {
-MarbleWallpaper::MarbleWallpaper(QObject * parent, const QVariantList & args )
- : Plasma::Wallpaper(parent, args), m_timer(0), m_map(0), m_leftPressed(false), m_dirty(true)
+MarbleWallpaper::MarbleWallpaper(QObject *parent, const QVariantList &args)
+ : Plasma::Wallpaper(parent, args), m_map(0), m_navItem(0), m_timer(0), m_dirty(true)
{
KGlobal::locale()->insertCatalog("Marble");
}
@@ -64,74 +61,72 @@
delete m_map;
}
-void MarbleWallpaper::init(const KConfigGroup & config)
+void MarbleWallpaper::init(const KConfigGroup &config)
{
+ m_movement = static_cast<Movement>(config.readEntry(MOVEMENT_CONFIG_KEY, static_cast<int>(FollowSun)));
+ m_mapTheme = config.readEntry(MAP_THEME_CONFIG_KEY, QString::fromLatin1("earth/bluemarble/bluemarble.dgml"));
+ m_navigationEnabled = config.readEntry(NAVIGATION_CONFIG_KEY, false);
+ m_projection = static_cast<Projection>(config.readEntry(PROJECTION_CONFIG_KEY, static_cast<int>(Spherical)));
+ m_quality = static_cast<MapQuality>(config.readEntry(QUALITY_CONFIG_KEY, static_cast<int>(Normal)));
+ m_rotationLat = config.readEntry(ROTATION_LAT_CONFIG_KEY, 0.0);
+ m_rotationLon = config.readEntry(ROTATION_LON_CONFIG_KEY, 0.10);
+ m_showPlacemarks = config.readEntry(SHOW_PLACEMARKS_CONFIG_KEY, true);
+ m_timeout = config.readEntry(TIMEOUT_CONFIG_KEY, 10000);
+
m_map = new MarbleMap();
- m_mapTheme=config.readEntry(MAP_THEME_CONFIG_KEY, QString::fromLatin1("earth/bluemarble/bluemarble.dgml"));
m_map->setMapThemeId(m_mapTheme);
+ m_map->setProjection(m_projection);
+ m_map->setShowCompass(false);
+ m_map->setShowGrid(false);
+ m_map->setShowScaleBar(false);
+ m_map->sunLocator()->setCitylights(true);
+ m_map->sunLocator()->setShow(true);
- m_projection = static_cast<Projection>(config.readEntry(PROJECTION_CONFIG_KEY,
- static_cast<int>(Spherical)));
- m_map->setProjection( m_projection );
- m_showCities = config.readEntry(SHOW_CITIES_CONFIG_KEY, false);
- m_showClouds = config.readEntry(SHOW_CLOUDS_CONFIG_KEY, false);
- m_showNight = config.readEntry(SHOW_NIGHT_CONFIG_KEY, false);
-
- m_followSun = config.readEntry(FOLLOW_SUN_CONFIG_KEY, true);
- if (m_followSun) {
+ if (m_movement == FollowSun) {
m_map->centerOn(m_map->sunLocator()->getLon(), m_map->sunLocator()->getLat());
- } else {
- //Set how we want the map to look
- m_map->centerOn(config.readEntry(POSITION_LON_CONFIG_KEY, 0.0), config.readEntry(POSITION_LAT_CONFIG_KEY, 0.0));
+ m_map->setDistance(config.readEntry(DISTANCE_CONFIG_KEY, 5000.0));
+ } else if (m_movement == HoverAboveHome) {
+ m_map->centerOn(config.readEntry(HOME_LON_CONFIG_KEY, 0.0),
+ config.readEntry(HOME_LAT_CONFIG_KEY, 0.0));
+ m_map->zoomView(config.readEntry(HOME_ZOOM_CONFIG_KEY, 8));
+ } else if (m_movement == CustomRotate) {
+ // Set how we want the map to look
+ m_map->centerOn(config.readEntry(POSITION_LON_CONFIG_KEY, 0.0),
+ config.readEntry(POSITION_LAT_CONFIG_KEY, 0.0));
+ m_map->setDistance(config.readEntry(DISTANCE_CONFIG_KEY, 5000.0));
}
- m_map->setShowCompass ( false );
- m_map->setShowScaleBar ( false );
- m_map->setShowGrid ( false );
- m_map->sunLocator()->setShow(true);
- m_map->sunLocator()->setCitylights(true);
-
- m_map->setDistance(config.readEntry(DISTANCE_CONFIG_KEY, 5000.0));
- m_rotationLon = config.readEntry(ROTATION_LON_CONFIG_KEY, 0.10);
- m_rotationLat = config.readEntry(ROTATION_LAT_CONFIG_KEY, 0.0);
- m_timeout = config.readEntry(TIMEOUT_CONFIG_KEY, 10000);
- m_quality = static_cast<MapQuality>(config.readEntry(QUALITY_CONFIG_KEY,
- static_cast<int>(Normal)));
-
- foreach( MarbleRenderPlugin* item, m_map->model()->renderPlugins() ) {
- /* //FIXME:stars plugin crashes
- if(item->nameId() == "stars") {
- item->setVisible( true );
- } else {
- item->setVisible( false );
- } */
- item->setVisible( false );
+ foreach (MarbleAbstractFloatItem *item, m_map->floatItems()) {
+ if (m_navigationEnabled && item->nameId() == "navigation") {
+ m_navItem = item;
+ // Note: Try to make the marble navigation float item look nicer and
+ // visually slim to not interfere with other Plasma content.
+ m_navItem->setBackground(Qt::NoBrush);
+ m_navItem->setBorderStyle(Qt::NoPen);
+ }
}
+ updateRenderPlugins();
widgetChanged();
}
-QWidget * MarbleWallpaper::createConfigurationInterface(QWidget * parent)
+QWidget *MarbleWallpaper::createConfigurationInterface(QWidget *parent)
{
- QWidget * configWidget = new QWidget(parent);
+ QWidget *configWidget = new QWidget(parent);
m_ui.setupUi(configWidget);
- m_ui.timeout->setValue(m_timeout/1000);
- m_ui.rotationLon->setValue(m_rotationLon);
- m_ui.rotationLat->setValue(m_rotationLat);
- m_ui.showCities->setChecked(m_showCities);
- m_ui.showClouds->setChecked(m_showClouds);
- m_ui.showNight-> setChecked(m_showNight);
- m_ui.rotateAutomatically-> setChecked(!m_followSun);
- m_ui.rotationLon->setEnabled(!m_followSun);
- m_ui.rotationLat->setEnabled(!m_followSun);
+ m_ui.navigationEnabled->setChecked(m_navigationEnabled);
m_ui.projection->setCurrentIndex(static_cast<int>(m_projection));
- //the first MapQuality value is wireframe, which we don't show in the list
+ // The first MapQuality value is wireframe, which we don't show in the list
m_ui.quality->setCurrentIndex(static_cast<int>(m_quality) - 1);
+ m_ui.rotationLon->setValue(m_rotationLon);
+ m_ui.rotationLat->setValue(m_rotationLat);
+ m_ui.showPlacemarks->setChecked(m_showPlacemarks);
+ m_ui.timeout->setValue(m_timeout / 1000);
MapThemeManager themeManager;
themeManager.updateMapThemeModel();
int rows = themeManager.mapThemeModel()->rowCount();
- for (int i = 0; i< rows; i++) {
+ for (int i = 0; i < rows; i++) {
QModelIndex index = themeManager.mapThemeModel()->index(i, 0, QModelIndex());
QString theme = themeManager.mapThemeModel()->data(index, Qt::DisplayRole).toString();
QIcon icon = qvariant_cast<QIcon>(themeManager.mapThemeModel()->data(index, Qt::DecorationRole));
@@ -142,234 +137,215 @@
m_ui.themeList->setCurrentIndex(i);
}
}
- connect(m_ui.themeList, SIGNAL(currentIndexChanged(int)), SLOT(changeTheme(int)));
+ // Trigger setting right movement configuration once
+ m_ui.movement->setCurrentIndex(static_cast<int>(m_movement));
+ updateMovement(static_cast<int>(m_movement));
+ connect(m_ui.homeLocation, SIGNAL(clicked(int)), SLOT(updateHomeLocation()));
+ connect(m_ui.navigationEnabled, SIGNAL(stateChanged(int)), SLOT(updateSettings()));
+ connect(m_ui.movement, SIGNAL(currentIndexChanged(int)), SLOT(updateMovement(int)));
connect(m_ui.projection, SIGNAL(currentIndexChanged(int)), SLOT(updateSettings()));
connect(m_ui.quality, SIGNAL(currentIndexChanged(int)), SLOT(updateSettings()));
- connect(m_ui.timeout, SIGNAL(valueChanged(int)), SLOT(updateSettings()));
connect(m_ui.rotationLon, SIGNAL(valueChanged(double)), SLOT(updateSettings()));
connect(m_ui.rotationLat, SIGNAL(valueChanged(double)), SLOT(updateSettings()));
- connect(m_ui.showCities, SIGNAL(stateChanged(int)), SLOT(updateSettings()));
- connect(m_ui.showClouds, SIGNAL(stateChanged(int)), SLOT(updateSettings()));
- connect(m_ui.showNight, SIGNAL(stateChanged(int)), SLOT(updateSettings()));
- connect(m_ui.followSun, SIGNAL(toggled(bool)), SLOT(updateSettings()));
+ connect(m_ui.showPlacemarks, SIGNAL(stateChanged(int)), SLOT(updateSettings()));
+ connect(m_ui.themeList, SIGNAL(currentIndexChanged(int)), SLOT(changeTheme(int)));
+ connect(m_ui.timeout, SIGNAL(valueChanged(int)), SLOT(updateSettings()));
return configWidget;
}
-void MarbleWallpaper::save(KConfigGroup & config)
+void MarbleWallpaper::save(KConfigGroup &config)
{
if (!m_map) {
- // when switching the background containment, this is called with m_map==0 for some reason
+ // When switching the background containment, this is called with m_map==0 for some reason
return;
}
+ config.writeEntry(DISTANCE_CONFIG_KEY, m_map->distance());
+
+ qreal lon, lat;
+ int zoom;
+ m_map->home(lon, lat, zoom);
+ config.writeEntry(HOME_LAT_CONFIG_KEY, lat);
+ config.writeEntry(HOME_LON_CONFIG_KEY, lon);
+ config.writeEntry(HOME_ZOOM_CONFIG_KEY, zoom);
+ config.writeEntry(NAVIGATION_CONFIG_KEY, m_navigationEnabled);
config.writeEntry(MAP_THEME_CONFIG_KEY, m_map->mapThemeId());
+ config.writeEntry(MOVEMENT_CONFIG_KEY, static_cast<int>(m_movement));
+ config.writeEntry(POSITION_LAT_CONFIG_KEY, m_map->centerLatitude());
+ config.writeEntry(POSITION_LON_CONFIG_KEY, m_map->centerLongitude());
config.writeEntry(PROJECTION_CONFIG_KEY, static_cast<int>(m_projection));
config.writeEntry(QUALITY_CONFIG_KEY, static_cast<int>(m_quality));
- config.writeEntry(TIMEOUT_CONFIG_KEY, m_timeout);
- config.writeEntry(FOLLOW_SUN_CONFIG_KEY, m_followSun);
- config.writeEntry(POSITION_LON_CONFIG_KEY, m_map->centerLongitude());
- config.writeEntry(POSITION_LAT_CONFIG_KEY, m_map->centerLatitude());
- config.writeEntry(DISTANCE_CONFIG_KEY, m_map->distance());
- config.writeEntry(ROTATION_LON_CONFIG_KEY, m_rotationLon);
config.writeEntry(ROTATION_LAT_CONFIG_KEY, m_rotationLat);
- config.writeEntry(SHOW_CITIES_CONFIG_KEY, m_showCities);
- config.writeEntry(SHOW_CLOUDS_CONFIG_KEY, m_showClouds);
- config.writeEntry(SHOW_NIGHT_CONFIG_KEY, m_showNight);
+ config.writeEntry(ROTATION_LON_CONFIG_KEY, m_rotationLon);
+ config.writeEntry(SHOW_PLACEMARKS_CONFIG_KEY, m_showPlacemarks);
+ config.writeEntry(TIMEOUT_CONFIG_KEY, m_timeout);
}
-void MarbleWallpaper::paint(QPainter * painter, const QRectF & exposedRect)
+void MarbleWallpaper::paint(QPainter *painter, const QRectF &exposedRect)
{
- // check if geometry changed
+ // Check if geometry changed
if (m_pixmap.size() != boundingRect().size().toSize()) {
m_dirty = true;
}
- // update the pixmap
- if(m_dirty) {
+ // Update the pixmap
+ if (m_dirty) {
renderPixmap();
}
- // draw the requested part of the pixmap
- painter->drawPixmap( exposedRect, m_pixmap, exposedRect );
+ // Draw the requested part of the pixmap
+ painter->drawPixmap(exposedRect, m_pixmap, exposedRect);
}
-void MarbleWallpaper::renderPixmap()
+void MarbleWallpaper::mousePressEvent(QGraphicsSceneMouseEvent *event)
{
- if (m_pixmap.size() != boundingRect().size().toSize()) {
- m_pixmap = QPixmap(boundingRect().size().toSize());
- renderPixmap();
+ if (event->buttons() == Qt::LeftButton && m_navigationEnabled && m_movement == FreeMovement) {
+ //TODO: Implement mouse interaction with navigation float item
+ //TODO: Make sure the user scrolls not to far!
+ event->accept();
}
- if (m_pixmap.size().isEmpty()) {
- return;
+}
+
+void MarbleWallpaper::widgetChanged()
+{
+ m_map->setProjection(m_projection);
+ m_map->setShowCities(m_showPlacemarks);
+ m_map->setShowOtherPlaces(m_showPlacemarks);
+ m_map->setShowPlaces(m_showPlacemarks);
+
+ if (m_timer) {
+ m_timer->stop();
+ disconnect(m_timer);
}
- m_map->setSize(m_pixmap.size());
- m_pixmap.fill(QColor( 0x00, 0x00, 0x00, 0xFF ));
- GeoPainter gp( &m_pixmap, m_map->viewParams()->viewport(),
- m_quality, true );
- QRect mapRect( 0, 0, m_map->width(), m_map->height() );
- m_map->paint(gp, mapRect );
- m_dirty = false;
+ if (m_timeout && (m_rotationLon || m_rotationLat) && (m_movement == FollowSun || m_movement == CustomRotate)) {
+ if (!m_timer) {
+ m_timer = new QTimer(this);
+ }
+ m_timer->setInterval(m_timeout);
+ connect(m_timer, SIGNAL(timeout()), SLOT(rotate()));
+ m_timer->start();
+ }
+
+ updateRenderPlugins();
+ m_dirty = true;
+ emit update(boundingRect());
}
void MarbleWallpaper::rotate()
{
- m_map->sunLocator()->update();
- if (m_followSun) {
+ if (m_movement == FollowSun) {
+ m_map->sunLocator()->update();
if (m_map->sunLocator()->getLon() == m_map->centerLongitude()) {
return;
}
m_map->centerOn(m_map->sunLocator()->getLon(), m_map->sunLocator()->getLat());
- } else {
+ } else if (m_movement == CustomRotate) {
m_map->rotateBy(m_rotationLon, m_rotationLat);
+ } else {
+ return;
}
m_dirty = true;
emit update(boundingRect());
}
-void MarbleWallpaper::changeTheme(int index)
-{
- m_mapTheme = m_ui.themeList->itemData(index).toString();
- m_map->setMapThemeId(m_mapTheme);
-
- foreach( MarbleRenderPlugin* item, m_map->model()->renderPlugins() ) {
- //FIXME: only have one place to switch off themes
- item->setVisible( false );
- }
-
- m_dirty = true;
- emit update(boundingRect());
-}
-
void MarbleWallpaper::updateSettings()
{
+ m_navigationEnabled = m_ui.navigationEnabled->isChecked();
m_projection = static_cast<Projection>(m_ui.projection->currentIndex());
- //the first MapQuality value is wireframe, which we don't show in the list
- m_quality = static_cast<MapQuality>(m_ui.quality->currentIndex() + 1);
- m_timeout = m_ui.timeout->value()*1000;
m_rotationLon = m_ui.rotationLon->value();
m_rotationLat = m_ui.rotationLat->value();
- m_showCities = m_ui.showCities->isChecked();
- m_showClouds = m_ui.showClouds->isChecked();
- m_showNight = m_ui.showNight-> isChecked();
- m_followSun = m_ui.followSun->isChecked();
- m_ui.rotationLon->setEnabled(!m_followSun);
- m_ui.rotationLat->setEnabled(!m_followSun);
+ // The first MapQuality value is wireframe, which we don't show in the list
+ m_quality = static_cast<MapQuality>(m_ui.quality->currentIndex() + 1);
+ m_showPlacemarks = m_ui.showPlacemarks->isChecked();
+ m_timeout = m_ui.timeout->value() * 1000;
widgetChanged();
}
-void MarbleWallpaper::widgetChanged()
+void MarbleWallpaper::changeTheme(int index)
{
- m_map->setShowPlaces ( m_showCities );
- m_map->setShowCities ( m_showCities );
- m_map->setShowOtherPlaces( m_showCities );
- m_map->setShowClouds ( m_showClouds );
- m_map->setProjection( m_projection );
-
- if(m_showNight) {
- m_map->sunLocator()->setShow(true);
- m_map->sunLocator()->setCitylights(true);
- } else {
- m_map->sunLocator()->setShow(false);
- m_map->sunLocator()->setCitylights(false);
- }
-
- if (m_timer) {
- m_timer->stop();
- disconnect(m_timer);
- }
-
- if (m_timeout && (m_rotationLon || m_rotationLat || m_followSun || m_showNight)) {
- if (!m_timer) {
- m_timer = new QTimer(this);
- }
- m_timer->setInterval(m_timeout);
- connect(m_timer, SIGNAL(timeout()), SLOT(rotate()));
- m_timer->start();
- }
+ m_mapTheme = m_ui.themeList->itemData(index).toString();
+ m_map->setMapThemeId(m_mapTheme);
+ updateRenderPlugins();
m_dirty = true;
emit update(boundingRect());
}
-void MarbleWallpaper::wheelEvent(QGraphicsSceneWheelEvent *event)
+void MarbleWallpaper::updateRenderPlugins()
{
- // dispatch the event
- event->accept();
- m_map->zoomViewBy( (int)(event->delta() / 3) );
- m_dirty = true;
- emit update(boundingRect());
+ foreach (MarbleRenderPlugin *item, m_map->renderPlugins()) {
+ if (item->nameId() == "stars") {
+ item->setVisible(true); item->setEnabled(true);
+ } else if (m_navigationEnabled && m_movement == FreeMovement && item->nameId() == "navigation") {
+ item->setVisible(true); item->setEnabled(true);
+ } else {
+ item->setVisible(false); item->setEnabled(false);
+ }
+ }
}
-void MarbleWallpaper::mouseMoveEvent (QGraphicsSceneMouseEvent *event)
+void MarbleWallpaper::updateMovement(int index)
{
- if ( m_leftPressed == true ) {
- event->accept();
- int polarity = m_map->viewParams()->viewport()->polarity();
-
- qreal radius = (qreal)(m_map->radius());
- int deltax = event->screenPos().x() - m_leftPressedX;
- int deltay = event->screenPos().y() - m_leftPressedY;
-
- // only start dragging after a certain distance
- if ( abs(deltax) <= DRAGTHRESHOLD
- && abs(deltay) <= DRAGTHRESHOLD ) {
- return;
- }
-
- qreal direction = 1;
- // Choose spin direction by taking into account whether we
- // drag above or below the visible pole.
- if ( m_projection == Spherical ) {
- if ( polarity > 0 ) {
-
- if ( event->screenPos().y() < ( - m_map->northPoleY()
- + m_map->height() / 2 ) )
- direction = -1;
- }
- else {
- if (event->screenPos().y() > ( + m_map->northPoleY()
- + m_map->height() / 2 ) )
- direction = -1;
- }
- }
- m_map->centerOn( RAD2DEG * (qreal)(m_leftPressedTranslationX)
- - 90.0 * direction * deltax / radius,
- RAD2DEG * (qreal)(m_leftPressedTranslationY)
- + 90.0 * deltay / radius );
-
- m_dirty = true;
- emit update(boundingRect());
+ switch (index) {
+ case 0: // Movement::FollowSun
+ m_ui.homeLocation->setVisible(false);
+ m_ui.navigationEnabled->setVisible(false);
+ m_ui.rotationLat->setVisible(false); m_ui.labelRotationLat->setVisible(false);
+ m_ui.rotationLon->setVisible(false); m_ui.labelRotationLon->setVisible(false);
+ m_ui.timeout->setVisible(true); m_ui.labelTimeout->setVisible(true);
+ m_movement = FollowSun;
+ break;
+ case 1: // Movement::HoverAboveHome:
+ m_ui.navigationEnabled->setVisible(false);
+ m_ui.rotationLat->setVisible(false); m_ui.labelRotationLat->setVisible(false);
+ m_ui.rotationLon->setVisible(false); m_ui.labelRotationLon->setVisible(false);
+ m_ui.timeout->setVisible(false); m_ui.labelTimeout->setVisible(false);
+ m_ui.homeLocation->setVisible(true);
+ m_movement = HoverAboveHome;
+ m_map->goHome();
+ break;
+ case 2: // Movement::CustomRotate
+ m_ui.homeLocation->setVisible(false);
+ m_ui.navigationEnabled->setVisible(false);
+ m_ui.rotationLat->setVisible(true); m_ui.labelRotationLat->setVisible(true);
+ m_ui.rotationLon->setVisible(true); m_ui.labelRotationLon->setVisible(true);
+ m_ui.timeout->setVisible(true); m_ui.labelTimeout->setVisible(true);
+ m_movement = CustomRotate;
+ break;
+ case 3: // Movement::FreeMovement
+ m_ui.rotationLat->setVisible(false); m_ui.labelRotationLat->setVisible(false);
+ m_ui.rotationLon->setVisible(false); m_ui.labelRotationLon->setVisible(false);
+ m_ui.homeLocation->setVisible(false);
+ m_ui.timeout->setVisible(false); m_ui.labelTimeout->setVisible(false);
+ m_ui.navigationEnabled->setVisible(true);
+ m_movement = FreeMovement;
+ break;
}
}
-void MarbleWallpaper::mousePressEvent (QGraphicsSceneMouseEvent *event)
+void MarbleWallpaper::updateHomeLocation()
{
- if (event->buttons() == Qt::LeftButton)
- {
- m_leftPressed = true;
-
- // On the single event of a mouse button press these
- // values get stored, to enable us to e.g. calculate the
- // distance of a mouse drag while the mouse button is
- // still down.
- m_leftPressedX = event->screenPos().x();
- m_leftPressedY = event->screenPos().y();
-
- // Calculate translation of center point
- m_leftPressedTranslationX = m_map->centerLongitude() * DEG2RAD;
- m_leftPressedTranslationY = m_map->centerLatitude() * DEG2RAD;
-
- event->accept();
- }
+ m_map->setHome(m_map->centerLongitude(), m_map->centerLatitude(), m_map->zoom());
}
-void MarbleWallpaper::mouseReleaseEvent (QGraphicsSceneMouseEvent *event)
+void MarbleWallpaper::renderPixmap()
{
- m_leftPressed = false;
- event->accept();
+ if (m_pixmap.size() != boundingRect().size().toSize()) {
+ m_pixmap = QPixmap(boundingRect().size().toSize());
+ renderPixmap();
+ }
+ if (m_pixmap.size().isEmpty()) {
+ return;
+ }
+ m_map->setSize(m_pixmap.size());
+ m_pixmap.fill(QColor(0x00, 0x00, 0x00, 0xFF));
+ GeoPainter gp(&m_pixmap, m_map->viewParams()->viewport(), m_quality, true);
+ QRect mapRect(0, 0, m_map->width(), m_map->height());
+ m_map->paint(gp, mapRect);
+ m_dirty = false;
}
-} // Marble
+} // Marble namespace
-#include "marble.moc"
+#include "moc_marble.cpp"
// vim: sw=4 sts=4 et tw=100
Index: wallpapers/marble/marble.h
===================================================================
--- wallpapers/marble/marble.h (Revision 897233)
+++ wallpapers/marble/marble.h (Arbeitskopie)
@@ -1,5 +1,6 @@
/*
Copyright 2008 Frederik Gladhorn <gladh...@kde.org>
+ Sascha Peilicke <sasch...@gmx.de>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -18,94 +19,88 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef MARBLE_H
-#define MARBLE_H
+#ifndef MARBLE_WALLPAPER_H
+#define MARBLE_WALLPAPER_H
-#include <marble/MarbleMap.h>
#include <marble/global.h>
#include <Plasma/Wallpaper>
-#include <QColor>
#include "ui_config.h"
namespace Marble {
+class MarbleAbstractFloatItem;
+class MarbleMap;
+
+/**
+ *
+ */
class MarbleWallpaper : public Plasma::Wallpaper
{
-Q_OBJECT
+ Q_OBJECT
public:
- MarbleWallpaper(QObject * parent, const QVariantList & args);
+ enum Movement {
+ FollowSun = 0, //< Rotate by following the sun
+ HoverAboveHome, //< Hover above home location
+ CustomRotate, //< Rotate by configured values
+ FreeMovement, //< Rotate not
+ };
+
+ MarbleWallpaper(QObject *parent, const QVariantList &args);
~MarbleWallpaper();
- void setBoundingRect(const QRectF &boundingRect);
- QWidget * createConfigurationInterface(QWidget * parent);
- void save(KConfigGroup & config);
- void paint(QPainter * painter, const QRectF & exposedRect);
- virtual void wheelEvent (QGraphicsSceneWheelEvent *event);
- virtual void mouseMoveEvent (QGraphicsSceneMouseEvent *event);
- virtual void mousePressEvent (QGraphicsSceneMouseEvent *event);
- virtual void mouseReleaseEvent (QGraphicsSceneMouseEvent *event);
+ QWidget *createConfigurationInterface(QWidget *parent);
+ void save(KConfigGroup &config);
+ void paint(QPainter *painter, const QRectF &exposedRect);
+ virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
+
protected:
- void init(const KConfigGroup & config);
+ void init(const KConfigGroup &config);
private slots:
- /// redraw
+ /// Redraw
void widgetChanged();
- /// called by the timer for rotation
+ /// Called by the timer for rotation
void rotate();
- /// changes from the settings dialog
+ /// Changes from the settings dialog
void updateSettings();
- /// change the map theme
- void changeTheme(int index);
+ /// Change the map theme
+ void changeTheme(int);
+ /// Updates marble render plugins
+ void updateRenderPlugins();
+ /// Updates configuration screen based on current 'movement'
+ void updateMovement(int);
+ /// Updates the 'home' location
+ void updateHomeLocation();
private:
void renderPixmap();
- Ui_PatternSettingsWidget m_ui;
+ Ui_MarbleSettingsWidget m_ui;
- // type of projection
- Projection m_projection;
+ MarbleMap *m_map; // Marble parameters for GeoPainter
+ Projection m_projection; // Type of projection
+ MapQuality m_quality; // Painting quality
+ MarbleAbstractFloatItem *m_navItem;
- // painting quality
- MapQuality m_quality;
+ QTimer *m_timer; // Rotation timer
+ int m_timeout; // Timer timeout interval
- QTimer *m_timer;
- int m_timeout;
-
- // if true, always update with the sun's position
- bool m_followSun;
+ Movement m_movement; // Current movement/rotation scheme
qreal m_rotationLon;
qreal m_rotationLat;
- bool m_showCities;
- bool m_showClouds;
- bool m_showNight;
+ bool m_navigationEnabled; // Visibility flag for navig. widget
+ bool m_showPlacemarks; // Visibility flag for all placemarks
- // size of the background
- QSize m_size;
- // marble parameters for GeoPainter
- MarbleMap *m_map;
-
- // cached wallpaper
- QPixmap m_pixmap;
- // theme of the map
- QString m_mapTheme;
-
- // flag - left mouse button is pressed
- bool m_leftPressed;
- // position of last button press
- int m_leftPressedX;
- int m_leftPressedY;
- qreal m_leftPressedTranslationX;
- qreal m_leftPressedTranslationY;
-
- // flag to keep track of dirty state to update m_pixmap
- bool m_dirty;
+ QPixmap m_pixmap; // Cached wallpaper
+ QString m_mapTheme; // Theme of the map
+ bool m_dirty; // Dirty state flag to update m_pixmap
};
K_EXPORT_PLASMA_WALLPAPER(marble, MarbleWallpaper)
-}
+} // Marble namespace
#endif
Index: wallpapers/marble/plasma-wallpaper-marble.desktop
===================================================================
--- wallpapers/marble/plasma-wallpaper-marble.desktop (Revision 897233)
+++ wallpapers/marble/plasma-wallpaper-marble.desktop (Arbeitskopie)
@@ -19,7 +19,7 @@
X-KDE-PluginInfo-Author=Frederik Gladhorn
x-kde-plugininfo-email=gladh...@kde.org
X-KDE-PluginInfo-Name=marble
-X-KDE-PluginInfo-Version=pre0.1
+X-KDE-PluginInfo-Version=0.2
X-KDE-PluginInfo-Website=http://plasma.kde.org/
X-KDE-PluginInfo-Depends=
X-KDE-PluginInfo-License=GPL
Index: wallpapers/marble/CMakeLists.txt
===================================================================
--- wallpapers/marble/CMakeLists.txt (Revision 897233)
+++ wallpapers/marble/CMakeLists.txt (Arbeitskopie)
@@ -1,15 +1,12 @@
project(plasma-wallpaper-marble)
-include_directories(
- ${MARBLE_INCLUDE_DIR}
- )
+include_directories(${MARBLE_INCLUDE_DIR})
set(marble_SRCS
marble.cpp
)
kde4_add_ui_files(marble_SRCS config.ui)
-
kde4_add_plugin(plasma_wallpaper_marble ${marble_SRCS})
target_link_libraries(plasma_wallpaper_marble
Index: wallpapers/CMakeLists.txt
===================================================================
--- wallpapers/CMakeLists.txt (Revision 897233)
+++ wallpapers/CMakeLists.txt (Arbeitskopie)
@@ -1,6 +1,17 @@
+project(playground-plasma-wallpapers)
+
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+
+find_package(KDE4 REQUIRED)
+find_package(Plasma REQUIRED)
find_package(Marble)
+include(KDE4Defaults)
+include(MacroOptionalAddSubdirectory)
+add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+
add_subdirectory(mandelbrot)
add_subdirectory(pattern)
if( NOT WIN32 )
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Plasma-devel mailing list Plasma-devel@kde.org https://mail.kde.org/mailman/listinfo/plasma-devel
