[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [calligra] active: Fetch Calligra version from calligraversion.h
From: Shantanu Tushar <shaan7in () gmail ! com>
Date: 2012-08-18 12:43:24
Message-ID: 20120818124324.0702CA6094 () git ! kde ! org
[Download RAW message or body]
Git commit ca9ea16b4ab2916a2224ef3de0f84e4a5d7942dc by Shantanu Tushar.
Committed on 18/08/2012 at 14:42.
Pushed by shantanu into branch 'master'.
Fetch Calligra version from calligraversion.h
M +1 -1 active/qml/AboutCalligraActive.qml
M +3 -0 active/src/MainWindow.cpp
http://commits.kde.org/calligra/ca9ea16b4ab2916a2224ef3de0f84e4a5d7942dc
diff --git a/active/qml/AboutCalligraActive.qml b/active/qml/AboutCalligraActive.qml
index f5cb3c9..cbadd55 100644
--- a/active/qml/AboutCalligraActive.qml
+++ b/active/qml/AboutCalligraActive.qml
@@ -66,7 +66,7 @@ Rectangle {
width: parent.width
anchors.horizontalCenter: parent.horizontalCenter
wrapMode: Text.WordWrap
- text: "<p>Calligra Active 1.0 Beta using Calligra Engine 2.4</p> \
+ text: "<p>Calligra Active 1.0 Beta using Calligra Engine " + \
_calligra_version_string + "</p> \
<p>Calligra Active is a office document viewer for touch based \
tablets especially tailored for the Plasma Active platform.</p> \
<p><a \
href=\"http://www.calligra.org/\">http://www.calligra.org</a></p>" color: \
theme.textColor
diff --git a/active/src/MainWindow.cpp b/active/src/MainWindow.cpp
index 99309ca..16706d6 100644
--- a/active/src/MainWindow.cpp
+++ b/active/src/MainWindow.cpp
@@ -25,6 +25,8 @@
#include "CADocumentController.h"
#include "calligra_active_global.h"
+#include <libs/main/calligraversion.h>
+
#include <KDE/KGlobal>
#include <KDE/KStandardDirs>
#include <KDE/KDebug>
@@ -76,6 +78,7 @@ MainWindow::MainWindow (QWidget* parent)
}
m_view->rootContext()->setContextProperty ("mainwindow", this);
+ m_view->rootContext()->setContextProperty("_calligra_version_string", \
CALLIGRA_VERSION_STRING); loadMetadataModel();
m_view->setSource (QUrl::fromLocalFile (CalligraActive::Global::installPrefix()
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic