X-Git-Url: https://vaikene.ee/gitweb/pswgen11.html?a=blobdiff_plain;ds=inline;f=src%2Fplugins%2FSdiWindow%2Fsdiwindow.cpp;h=c0e3587711afa35e00cbab88a421d4c38b634e47;hb=5dd5f367dfcecab75077c3cb4ca1f01113fc1561;hp=aba9ce2041502ac51fed5f2a5aa04d9cc4be01bf;hpb=ad70660919cd7b0e821e35548b6d1f5efa181c4c;p=evaf
diff --git a/src/plugins/SdiWindow/sdiwindow.cpp b/src/plugins/SdiWindow/sdiwindow.cpp
index aba9ce2..c0e3587 100644
--- a/src/plugins/SdiWindow/sdiwindow.cpp
+++ b/src/plugins/SdiWindow/sdiwindow.cpp
@@ -23,8 +23,10 @@
#include
#include
#include
+#include
#include
+#include
namespace eVaf {
namespace SdiWindow {
@@ -40,28 +42,25 @@ using namespace eVaf;
//-------------------------------------------------------------------
-using namespace eVaf::SdiWindow;
-
-iSdiWindow * iSdiWindow::instance()
+SdiWindow::iSdiWindow * SdiWindow::iSdiWindow::instance()
{
- return Internal::mSdiWindow;
+ return SdiWindow::Internal::mSdiWindow;
}
//-------------------------------------------------------------------
-using namespace eVaf::SdiWindow::Internal;
-
-MainWindow::MainWindow(QWidget * parent, Qt::WindowFlags flags)
+SdiWindow::Internal::MainWindow::MainWindow(QWidget * parent, Qt::WindowFlags flags)
: QWidget(parent, flags)
, mReady(false)
+ , mTimerId(0)
{
setObjectName(QString("%1-%2").arg(VER_MODULE_NAME_STR).arg(__FUNCTION__));
// Restore geometry
restoreSettings();
- // Apply the size specified in a) properties; or b) on the command line
+ // Apply the size specified in a) properties; or b) on the command line (overwrites stored geometry)
setWindowSize();
// Create the default layout
@@ -73,7 +72,7 @@ MainWindow::MainWindow(QWidget * parent, Qt::WindowFlags flags)
EVAF_INFO("%s created", qPrintable(objectName()));
}
-MainWindow::~MainWindow()
+SdiWindow::Internal::MainWindow::~MainWindow()
{
mSdiWindow = 0;
@@ -83,14 +82,30 @@ MainWindow::~MainWindow()
EVAF_INFO("%s destroyed", qPrintable(objectName()));
}
-bool MainWindow::init(QString const & args)
+QString SdiWindow::Internal::MainWindow::getMainPanelName(QString const & args) const
{
- Q_UNUSED(args);
+ QXmlStreamReader xml(args);
+ while (!xml.atEnd()) {
+ xml.readNext();
+ if (xml.isStartElement() && xml.name() == "attributes") {
+ if (xml.attributes().hasAttribute("mainPanelName"))
+ return xml.attributes().value("mainPanelName").toString();
+ }
+ }
+ return QString();
+}
+
+bool SdiWindow::Internal::MainWindow::init(QString const & args)
+{
+ mMainPanelName = getMainPanelName(args);
Common::iRegistry::instance()->registerInterface("iSdiWindow", this);
setWindowTitle(Common::iApp::instance()->name());
+ // Start the garbage collector timer
+ mTimerId = startTimer(60 * 1000);
+
show();
mReady = true;
@@ -100,35 +115,73 @@ bool MainWindow::init(QString const & args)
return true;
}
-void MainWindow::done()
+void SdiWindow::Internal::MainWindow::done()
{
mReady = false;
close();
- // Delete all the items added to the main window
- while (mItemsAdded.count() > 0) {
- QWeakPointer item = mItemsAdded.takeAt(0);
- if (!item.isNull())
- delete item.data();
+ if (mTimerId) {
+ killTimer(mTimerId);
+ mTimerId = 0;
}
+ // Delete all the panels
+ for (int i = mPanels.size() - 1; i >= 0; --i) {
+ QWeakPointer p = mPanels.at(i);
+ if (p)
+ delete p.data();
+ }
+ mPanels.clear();
+ mMinimizedPanels.clear();
+ mPanelNames.clear();
+ mMainPanel.clear();
+ mMainPanelName.clear();
+
EVAF_INFO("%s finalized", qPrintable(objectName()));
}
-void MainWindow::addWidget(QWidget * widget)
+void SdiWindow::Internal::MainWindow::addPanel(QString const & name, Gui::Panel * panel)
+{
+ mPanels.append(panel);
+ mPanelNames.insert(name, panel);
+
+ // If this is the predefined main panel, add it to this window
+ if (!mMainPanelName.isEmpty()) {
+ if (name == mMainPanelName) {
+ mMainPanel = panel;
+ mLayout->addWidget(panel);
+ }
+ }
+
+ // If the predefined main panel name is not set, use the first panel
+ else {
+ if (!mMainPanel) {
+ mMainPanel = panel;
+ mLayout->addWidget(panel);
+ }
+ }
+}
+
+Gui::Panel * SdiWindow::Internal::MainWindow::panel(QString const & name) const
{
- mLayout->addWidget(widget);
- mItemsAdded.append(widget);
+ QHash >::const_iterator it = mPanelNames.constFind(name);
+ if (it != mPanelNames.constEnd())
+ return it.value().data();
+ return 0;
}
-void MainWindow::addLayout(QLayout * layout)
+bool SdiWindow::Internal::MainWindow::showPanel(QString const & name)
{
- mLayout->addLayout(layout);
- mItemsAdded.append(layout);
+ Gui::Panel * p = panel(name);
+ if (p) {
+ p->show();
+ return true;
+ }
+ return false;
}
-void MainWindow::saveSettings()
+void SdiWindow::Internal::MainWindow::saveSettings()
{
static int ver[4] = {VER_FILE_VERSION};
QSettings settings(VER_COMPANY_NAME_STR, Common::iApp::instance()->name());
@@ -137,7 +190,7 @@ void MainWindow::saveSettings()
settings.setValue(QString("%1/geometry").arg(objectName()), saveGeometry());
}
-void MainWindow::restoreSettings()
+void SdiWindow::Internal::MainWindow::restoreSettings()
{
static int ver[4] = {VER_FILE_VERSION};
QSettings settings(VER_COMPANY_NAME_STR, Common::iApp::instance()->name());
@@ -155,11 +208,11 @@ void MainWindow::restoreSettings()
restoreGeometry(settings.value(QString("%1/geometry").arg(objectName())).toByteArray());
}
-void MainWindow::setWindowSize()
+void SdiWindow::Internal::MainWindow::setWindowSize()
{
// a) Get window size from properties
- int w = 0;
- int h = 0;
+ int w = Common::iProp::instance()->getValue("windowWidth", 0).toInt();
+ int h = Common::iProp::instance()->getValue("windowHeight", 0).toInt();
// b) Use command line arguments
QStringList args = QApplication::arguments();
@@ -190,10 +243,90 @@ void MainWindow::setWindowSize()
}
}
+void SdiWindow::Internal::MainWindow::closeEvent(QCloseEvent * e)
+{
+ // Try to close all the managed panels; ignore the event if one of the managed panels refuses to close
+ foreach (QWeakPointer p, mPanels) {
+ if (p) {
+ if (!p.data()->close()) {
+ e->ignore();
+ return;
+ }
+ }
+ }
+
+ QWidget::closeEvent(e);
+}
+
+void SdiWindow::Internal::MainWindow::changeEvent(QEvent * e)
+{
+ if (e->type() == QEvent::WindowStateChange) {
+ QWindowStateChangeEvent * wse = static_cast(e);
+
+ if (windowState() == Qt::WindowNoState && wse->oldState() == Qt::WindowMinimized) {
+
+ // Restore all the managed panels that were previously minimized
+ foreach (QWeakPointer p, mMinimizedPanels) {
+ if (p && p.data()->isVisible())
+ p.data()->showNormal();
+ }
+ mMinimizedPanels.clear();
+ }
+
+ else if (windowState() == Qt::WindowMinimized && wse->oldState() != Qt::WindowMinimized) {
+
+ // Minimize all the managed panels that are not minimized yet
+ mMinimizedPanels.clear();
+ foreach (QWeakPointer p, mPanels) {
+ if (!p)
+ continue;
+
+ if (p.data()->windowState() != Qt::WindowMinimized && p.data()->isVisible()) {
+ mMinimizedPanels.append(p);
+ p.data()->showMinimized();
+ }
+ }
+ }
+ }
+ QWidget::changeEvent(e);
+}
+
+void SdiWindow::Internal::MainWindow::timerEvent(QTimerEvent * e)
+{
+ if (e->timerId() == mTimerId) {
+
+ // Remove panels that are deleted
+ {
+ QList >::iterator it = mPanels.begin();
+ while (it != mPanels.end()) {
+ QWeakPointer p = *it;
+ if (!p)
+ it = mPanels.erase(it);
+ else
+ ++it;
+ }
+ }
+
+ // Do the same with panel names
+ {
+ QHash >::iterator it = mPanelNames.begin();
+ while (it != mPanelNames.end()) {
+ QWeakPointer p = it.value();
+ if (!p)
+ it = mPanelNames.erase(it);
+ else
+ ++it;
+ }
+ }
+ }
+ else
+ QWidget::timerEvent(e);
+}
+
//-------------------------------------------------------------------
-SdiWindowPlugin::SdiWindowPlugin()
+SdiWindow::Internal::SdiWindowPlugin::SdiWindowPlugin()
: Plugins::iPlugin()
{
setObjectName(VER_MODULE_NAME_STR);
@@ -203,14 +336,14 @@ SdiWindowPlugin::SdiWindowPlugin()
EVAF_INFO("%s created", qPrintable(objectName()));
}
-SdiWindowPlugin::~SdiWindowPlugin()
+SdiWindow::Internal::SdiWindowPlugin::~SdiWindowPlugin()
{
delete mWindow;
EVAF_INFO("%s destroyed", qPrintable(objectName()));
}
-bool SdiWindowPlugin::init(const QString & args)
+bool SdiWindow::Internal::SdiWindowPlugin::init(const QString & args)
{
if (!mWindow->init(args))
return false;
@@ -220,7 +353,7 @@ bool SdiWindowPlugin::init(const QString & args)
return true;
}
-void SdiWindowPlugin::done()
+void SdiWindow::Internal::SdiWindowPlugin::done()
{
mWindow->done();