X-Git-Url: https://vaikene.ee/gitweb/pswgen11.html?a=blobdiff_plain;ds=inline;f=src%2Fplugins%2FSdiWindow%2Fsdiwindow.cpp;h=d0294d8c83c1e18fddee8cc105170a9020de20eb;hb=f443e47f50a5d12f592aaae6a4e553e4a125ee1c;hp=b63ab978606f0b27329b7302f1f33673992eaf21;hpb=06f9c5336ba8a2200b68f636520707693eb5ada7;p=evaf
diff --git a/src/plugins/SdiWindow/sdiwindow.cpp b/src/plugins/SdiWindow/sdiwindow.cpp
index b63ab97..d0294d8 100644
--- a/src/plugins/SdiWindow/sdiwindow.cpp
+++ b/src/plugins/SdiWindow/sdiwindow.cpp
@@ -22,6 +22,7 @@
#include
#include
+#include
#include
@@ -62,6 +63,10 @@ MainWindow::MainWindow(QWidget * parent, Qt::WindowFlags flags)
// Apply the size specified in a) properties; or b) on the command line
setWindowSize();
+ // Create the default layout
+ mLayout = new QVBoxLayout;
+ setLayout(mLayout);
+
EVAF_INFO("%s created", qPrintable(objectName()));
}
@@ -75,6 +80,8 @@ MainWindow::~MainWindow()
bool MainWindow::init()
{
+ setWindowTitle(Common::iApp::instance()->name());
+
show();
EVAF_INFO("%s initialized", qPrintable(objectName()));
@@ -86,13 +93,32 @@ void MainWindow::done()
{
close();
+ // Delete all the items added to the main window
+ while (mItemsAdded.count() > 0) {
+ QPointer item = mItemsAdded.takeAt(0);
+ if (item)
+ delete item.data();
+ }
+
EVAF_INFO("%s finalized", qPrintable(objectName()));
}
+void MainWindow::addWidget(QWidget * widget)
+{
+ mLayout->addWidget(widget);
+ mItemsAdded.append(widget);
+}
+
+void MainWindow::addLayout(QLayout * layout)
+{
+ mLayout->addLayout(layout);
+ mItemsAdded.append(layout);
+}
+
void MainWindow::saveSettings()
{
static int ver[4] = {VER_FILE_VERSION};
- QSettings settings(VER_COMPANY_NAME_STR, VER_PRODUCT_NAME_STR);
+ QSettings settings(VER_COMPANY_NAME_STR, Common::iApp::instance()->name());
settings.setValue(QString("%1/version/major").arg(objectName()), ver[0]);
settings.setValue(QString("%1/version/minor").arg(objectName()), ver[1]);
settings.setValue(QString("%1/geometry").arg(objectName()), saveGeometry());
@@ -101,7 +127,7 @@ void MainWindow::saveSettings()
void MainWindow::restoreSettings()
{
static int ver[4] = {VER_FILE_VERSION};
- QSettings settings(VER_COMPANY_NAME_STR, VER_PRODUCT_NAME_STR);
+ QSettings settings(VER_COMPANY_NAME_STR, Common::iApp::instance()->name());
// Ignore saved settings if the version number is not the same
// More intelligent checks can be implemented to allow upgrading from previous versions