Skip to content
This repository has been archived by the owner on May 30, 2019. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
FIX: Adapted (not used) DefaultPlatformManager code to interface.
  • Loading branch information
till213 committed Feb 9, 2011
1 parent af4ebef commit 0f50060
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 13 deletions.
21 changes: 16 additions & 5 deletions src/Screenie/src/MainWindow.cpp
Expand Up @@ -154,20 +154,32 @@ void MainWindow::showNormal()

void MainWindow::closeEvent(QCloseEvent *event)
{
if (proceedWithModifiedScene()) {
Settings::WindowGeometry windowGeometry;
DocumentManager &documentManager = DocumentManager::getInstance();
Settings::WindowGeometry windowGeometry;
int nofModified = documentManager.getModifiedCount();
switch (nofModified)
{
case 0:
windowGeometry.fullScreen = isFullScreen();
windowGeometry.position = pos();
windowGeometry.size = size();
Settings::getInstance().setWindowGeometry(windowGeometry);
event->accept();
} else {
event->ignore();
break;
case 1:
/*\todo Implement this: ask to save, cancel or quit */
event->accept();
break;
default:
/*\todo Implement this: more than one document modified: ask force quit or handle unsaved documents */
event->accept();
break;
}
}

void MainWindow::changeEvent(QEvent *event)
{
/*!\todo Move this into the platform manager, use an event filter there */
QMainWindow::changeEvent(event);
switch (event->type()) {
case QEvent::ActivationChange:
Expand Down Expand Up @@ -439,7 +451,6 @@ void MainWindow::updateDocumentManager(MainWindow &mainWindow)

}


MainWindow *MainWindow::createMainWindow()
{
MainWindow *result = new MainWindow();
Expand Down
3 changes: 0 additions & 3 deletions src/Screenie/src/MainWindow.h
Expand Up @@ -148,9 +148,6 @@ private slots:
void handleFileSaveAsSelected(const QString &filePath);
void handleFileSaveAsTemplateSelected(const QString &filePath);
void handleConfirm(int result);



};

#endif // MAINWINDOW_H
8 changes: 4 additions & 4 deletions src/Screenie/src/PlatformManager/DefaultPlatformManager.cpp
Expand Up @@ -47,11 +47,11 @@ DefaultPlatformManager::~DefaultPlatformManager()
}
}

void DefaultPlatformManager::initialize(Ui::MainWindow &mainWindow)
void DefaultPlatformManager::initialize(QMainWindow &mainWindow, Ui::MainWindow &mainWindowUi)
{
d = new DefaultPlatformManagerPrivate(mainWindow);
AbstractPlatformManager::initialize(mainWindow);
mainWindow.toggleFullScreenAction->setShortcut(QKeySequence(Qt::Key_F11));
d = new DefaultPlatformManagerPrivate(mainWindowUi);
AbstractPlatformManager::initialize(mainWindow, mainWindowUi);
mainWindowUi.toggleFullScreenAction->setShortcut(QKeySequence(Qt::Key_F11));
}

void DefaultPlatformManager::handleWindowActivation(bool active)
Expand Down
4 changes: 3 additions & 1 deletion src/Screenie/src/PlatformManager/DefaultPlatformManager.h
Expand Up @@ -21,6 +21,8 @@
#ifndef DEFAULTPLATFORMMANAGER_H
#define DEFAULTPLATFORMMANAGER_H

class QMainWindow;

#include "AbstractPlatformManager.h"

class DefaultPlatformManagerPrivate;
Expand All @@ -35,7 +37,7 @@ class DefaultPlatformManager : public AbstractPlatformManager
DefaultPlatformManager();
virtual ~DefaultPlatformManager();

virtual void initialize(Ui::MainWindow &mainWindow);
virtual void initialize(QMainWindow &mainWindow, Ui::MainWindow &mainWindowUi);
virtual void handleWindowActivation(bool active);

private:
Expand Down

0 comments on commit 0f50060

Please sign in to comment.