El Dijous, 17 de juliol de 2014, a les 07:20:34, Torsten Rahn va escriure:
> What kinds of conflicts? :-)
Attached.
Cheers,
Albert
>
>
> -----Original-Nachricht-----
> Betreff: Does 4.14 contain all the code it should?
> Datum: Thu, 17 Jul 2014 00:56:28 +0200
> Von: Albert Astals Cid <[email protected]>
> An: marble-devel <[email protected]>, Dennis Nienhüser
> <[email protected]>, Torsten Rahn <[email protected]>
>
>
> Hi guys, i tried merging 4.13 into 4.14 to make sure that all the code that
> was in 4.13 is in 4.14 but i got a huge conflict (i guess you don't like
> merging (you should makes things like this very easy)) so i can't be sure
> 4.14 contains everything that was in 4.13 too.
>
> Can anyone confirm that 4.14 indeed contains everything it should?
>
> Cheers,
> Albert
diff --cc marble.nsi
index 2bfc01b,3911d5d..0000000
--- a/marble.nsi
+++ b/marble.nsi
@@@ -167,8 -173,18 +173,23 @@@ File /a /r
/x "marble-touch.exe" \
/x "marble-mobile.exe" \
/x "RoutinoPlugin.dll" \
++<<<<<<< HEAD
+ "${srcdir}\*.*"
+
++=======
+ "${srcdir}\*.*" \
+ "${qtdir}\QtCore4.dll" \
+ "${qtdir}\QtDeclarative4.dll" \
+ "${qtdir}\QtGui4.dll" \
+ "${qtdir}\QtNetwork4.dll" \
+ "${qtdir}\QtScript4.dll" \
+ "${qtdir}\QtSql4.dll" \
+ "${qtdir}\QtSvg4.dll" \
+ "${qtdir}\QtWebkit4.dll" \
+ "${qtdir}\QtXml4.dll" \
+ "${qtdir}\phonon4.dll"
+
++>>>>>>> origin/KDE/4.13
!ifdef licensefile
File /a "${srcdir}\data\licenses\${licensefile}"
!endif
diff --cc src/apps/marble-ui/ControlView.cpp
index 31294fc,073e156..0000000
--- a/src/apps/marble-ui/ControlView.cpp
+++ b/src/apps/marble-ui/ControlView.cpp
@@@ -108,7 -105,7 +108,11 @@@ ControlView::~ControlView(
QString ControlView::applicationVersion()
{
++<<<<<<< HEAD
+ return "1.8.20 (1.9 Alpha)";
++=======
+ return "1.8.3 (stable relase)";
++>>>>>>> origin/KDE/4.13
}
MapThemeManager *ControlView::mapThemeManager()
diff --cc src/lib/marble/CMakeLists.txt
index a016307,58b3ad0..0000000
--- a/src/lib/marble/CMakeLists.txt
+++ b/src/lib/marble/CMakeLists.txt
@@@ -43,8 -43,8 +43,13 @@@ INCLUDE(geodata/CMakeLists.txt
INCLUDE(graphicsview/CMakeLists.txt)
INCLUDE(layers/CMakeLists.txt)
++<<<<<<< HEAD
+set(GENERIC_LIB_VERSION "0.18.20")
+set(GENERIC_LIB_SOVERSION "19")
++=======
+ set(GENERIC_LIB_VERSION "0.18.3")
+ set(GENERIC_LIB_SOVERSION "18")
++>>>>>>> origin/KDE/4.13
if (QTONLY)
# ce: don't know why this is needed here - on win32 'O2' is activated by default in release mode
diff --cc src/lib/marble/MarbleGlobal.h
index 69a96f3,4053c0e..0000000
--- a/src/lib/marble/MarbleGlobal.h
+++ b/src/lib/marble/MarbleGlobal.h
@@@ -239,14 -229,14 +239,22 @@@ const qreal SEC2HOUR = 1.0 / HOUR2SEC
// String for about dialog and http user agent
// FIXME: check if blanks are allowed in user agent version numbers
++<<<<<<< HEAD
+const QString MARBLE_VERSION_STRING = QString::fromLatin1( "0.18.21 (0.19 Alpha)" );
++=======
+ const QString MARBLE_VERSION_STRING = QString::fromLatin1( "0.18.3 (stable release)" );
++>>>>>>> origin/KDE/4.13
// API Version id:
// form : 0xMMmmpp
// MM = major revision.
// mm = minor revision.
// pp = patch revision.
++<<<<<<< HEAD
+#define MARBLE_VERSION 0x001215
++=======
+ #define MARBLE_VERSION 0x001203
++>>>>>>> origin/KDE/4.13
static const char NOT_AVAILABLE[] = QT_TR_NOOP("not available");
diff --cc src/lib/marble/layers/PopupLayer.cpp
index b7abd97,018bfbd..0000000
--- a/src/lib/marble/layers/PopupLayer.cpp
+++ b/src/lib/marble/layers/PopupLayer.cpp
@@@ -138,12 -119,64 +138,72 @@@ void PopupLayer::setCoordinates( const
void PopupLayer::setUrl( const QUrl &url )
{
++<<<<<<< HEAD
+ d->m_popupItem->setUrl( url );
++=======
+ m_popupItem->setUrl( url );
}
void PopupLayer::setContent( const QString &html, const QUrl &baseUrl )
{
+ m_popupItem->setContent( html, baseUrl );
+ emit repaintNeeded();
++>>>>>>> origin/KDE/4.13
+ }
+
-void PopupLayer::setPlacemark( const GeoDataPlacemark *placemark )
++void PopupLayer::setContent( const QString &html, const QUrl &baseUrl )
+ {
++<<<<<<< HEAD
+ d->m_popupItem->setContent( html, baseUrl );
++=======
+ bool isSatellite = (placemark->visualCategory() == GeoDataFeature::Satellite);
+ bool isCity (placemark->visualCategory() >= GeoDataFeature::SmallCity &&
+ placemark->visualCategory() <= GeoDataFeature::LargeNationCapital);
+ bool isNation = (placemark->visualCategory() == GeoDataFeature::Nation);
+ bool isSky = false;
+ if ( m_widget->model()->mapTheme() ) {
+ isSky = m_widget->model()->mapTheme()->head()->target() == "sky";
+ }
+ setSize(QSizeF(400, 400));
+ if (isSatellite) {
+ setupDialogSatellite( placemark );
+ } else if (isCity) {
+ setupDialogCity( placemark );
+ } else if (isNation) {
+ setupDialogNation( placemark );
+ } else if (isSky) {
+ setupDialogSkyPlaces( placemark );
+ } else if ( placemark->role().isEmpty() ) {
+ setContent( placemark->description() );
+ } else {
+ setupDialogGeoPlaces( placemark );
+ }
+
+ if (placemark->style() == 0) {
+ m_popupItem->setBackgroundColor(QColor(Qt::white));
+ m_popupItem->setTextColor(QColor(Qt::black));
+ return;
+ }
+ if (placemark->style()->balloonStyle().displayMode() == GeoDataBalloonStyle::Hide) {
+ setVisible(false);
+ return;
+ }
+ QString content = placemark->style()->balloonStyle().text();
+ if (content.length() > 0) {
+ content = content.replace("$[name]", placemark->name(), Qt::CaseInsensitive);
+ content = content.replace("$[description]", placemark->description(), Qt::CaseInsensitive);
+ content = content.replace("$[address]", placemark->address(), Qt::CaseInsensitive);
+ // @TODO: implement the line calculation, so that snippet().maxLines actually has effect.
+ content = content.replace("$[snippet]", placemark->snippet().text(), Qt::CaseInsensitive);
+ content = content.replace("$[id]", QString::number(placemark->id()), Qt::CaseInsensitive);
+ QString const basePath = placemark->resolvePath(".");
+ QUrl const baseUrl = basePath != "." ? QUrl::fromLocalFile( basePath + "/" ) : QUrl();
+ m_popupItem->setContent(content, baseUrl );
+ }
+ m_popupItem->setBackgroundColor(placemark->style()->balloonStyle().backgroundColor());
+ m_popupItem->setTextColor(placemark->style()->balloonStyle().textColor());
+ emit repaintNeeded();
++>>>>>>> origin/KDE/4.13
}
void PopupLayer::setBackgroundColor(const QColor &color)
diff --cc src/lib/marble/layers/PopupLayer.h
index ff18366,b426b88..0000000
--- a/src/lib/marble/layers/PopupLayer.h
+++ b/src/lib/marble/layers/PopupLayer.h
@@@ -118,6 -128,16 +118,19 @@@ public
* @param html content (in html format)
*/
void setContent( const QString &html, const QUrl & baseUrl = QUrl() );
++<<<<<<< HEAD
++=======
+
+ /**
+ * @brief Sets style and content of the browser
+ *
+ * Sets the bgColor, textColor, displayMode and Content.
+ * Replaces $[*] by their values.
+ *
+ * @param placemark the placemark which invoked this popup
+ */
+ void setPlacemark( const GeoDataPlacemark *placemark );
++>>>>>>> origin/KDE/4.13
/**
* @brief Sets background color of the header
_______________________________________________
Marble-devel mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/marble-devel
