[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [calligra] active/src: Open a document passed on the command line after some delay
From: Shantanu Tushar <shaan7in () gmail ! com>
Date: 2012-01-28 19:48:03
Message-ID: 20120128194803.468A3A60A6 () git ! kde ! org
[Download RAW message or body]
Git commit dacaf3176e1702d5364aed4a2e79a422e43dce5b by Shantanu Tushar.
Committed on 28/01/2012 at 20:47.
Pushed by shantanu into branch 'master'.
Open a document passed on the command line after some delay
M +14 -5 active/src/MainWindow.cpp
M +4 -0 active/src/MainWindow.h
http://commits.kde.org/calligra/dacaf3176e1702d5364aed4a2e79a422e43dce5b
diff --git a/active/src/MainWindow.cpp b/active/src/MainWindow.cpp
index 5a387b7..f0011b7 100644
--- a/active/src/MainWindow.cpp
+++ b/active/src/MainWindow.cpp
@@ -32,6 +32,7 @@
#include <QDeclarativeContext>
#include <QDeclarativeEngine>
#include <QSettings>
+#include <QTimer>
#include <QFileDialog>
#include <QDesktopServices>
@@ -87,15 +88,13 @@ MainWindow::MainWindow (QWidget* parent)
setCentralWidget (m_view);
connect (m_view, SIGNAL (sceneResized (QSize)), SLOT (adjustWindowSize (QSize)));
resize (800, 600);
+
+ QTimer::singleShot(1000, this, SLOT(checkForAndOpenDocument()));
}
void MainWindow::openFile (const QString& path)
{
- if (path.isEmpty())
- return;
-
- QObject* object = m_view->rootObject();
- QMetaObject::invokeMethod (object, "openDocument", Q_ARG (QVariant, QVariant (path)));
+ documentPath = path;
}
void MainWindow::adjustWindowSize (QSize size)
@@ -118,4 +117,14 @@ MainWindow::~MainWindow()
{
}
+void MainWindow::checkForAndOpenDocument()
+{
+ if (documentPath.isEmpty()) {
+ return;
+ }
+
+ QObject* object = m_view->rootObject();
+ QMetaObject::invokeMethod (object, "openDocument", Q_ARG (QVariant, QVariant (documentPath)));
+}
+
#include "MainWindow.moc"
diff --git a/active/src/MainWindow.h b/active/src/MainWindow.h
index 7d5dae8..121d2bb 100644
--- a/active/src/MainWindow.h
+++ b/active/src/MainWindow.h
@@ -36,12 +36,16 @@ public:
~MainWindow();
void openFile (const QString& path);
+
private:
QDeclarativeView* m_view;
KDeclarative kdeclarative;
+ QString documentPath;
private slots:
void adjustWindowSize (QSize size);
+ void checkForAndOpenDocument();
+
public Q_SLOTS:
void openFileDialog();
};
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic