Commit e0e73b23 authored by Jan Möbius's avatar Jan Möbius

Added option to explicitly set if we want fullscreen mode or not

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@3878 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 7c1036d4
...@@ -667,6 +667,13 @@ void Core::fullscreen() { ...@@ -667,6 +667,13 @@ void Core::fullscreen() {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void Core::fullscreen( bool _state ) {
if ( OpenFlipper::Options::gui() )
coreWidget_->setFullscreen(_state);
}
//-----------------------------------------------------------------------------
void Core::logger() { void Core::logger() {
if ( OpenFlipper::Options::gui() ) if ( OpenFlipper::Options::gui() )
coreWidget_->toggleLogger(); coreWidget_->toggleLogger();
......
...@@ -282,6 +282,9 @@ public slots: ...@@ -282,6 +282,9 @@ public slots:
/// toggle fullscreen mode /// toggle fullscreen mode
void fullscreen(); void fullscreen();
/// set fullscreen mode
void fullscreen( bool _state );
/// Hide or show logging window /// Hide or show logging window
void logger(); void logger();
...@@ -300,7 +303,7 @@ public slots: ...@@ -300,7 +303,7 @@ public slots:
/// set the baseFilename for snapshots (a counter is automatically increased when /// set the baseFilename for snapshots (a counter is automatically increased when
/// snapshot() is called) /// snapshot() is called)
void snapshotBaseFileName(const QString& _fname); void snapshotBaseFileName(const QString& _fname);
/** Trigger a snapshot and increase the snapshot counter. /** Trigger a snapshot and increase the snapshot counter.
Save snapshot to file determined by snapshotBaseFileName() and Save snapshot to file determined by snapshotBaseFileName() and
the current snapshot counter. The \a back buffer will be saved. the current snapshot counter. The \a back buffer will be saved.
...@@ -360,7 +363,7 @@ private: ...@@ -360,7 +363,7 @@ private:
* @param _id id of the object * @param _id id of the object
*/ */
bool saveObject( int _id, QString _filename ); bool saveObject( int _id, QString _filename );
/** Show dialog for saving an object to a new location /** Show dialog for saving an object to a new location
* @param _id id of the object * @param _id id of the object
* @param _filename current filename of the object * @param _filename current filename of the object
...@@ -620,7 +623,7 @@ private: ...@@ -620,7 +623,7 @@ private:
private: private:
QList< SlotInfo > coreSlots_; QList< SlotInfo > coreSlots_;
void setDescriptions(); void setDescriptions();
/** @} */ /** @} */
......
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
</environments> </environments>
</other> </other>
<general> <general>
<activedir>ACG</activedir> <activedir>Plugin-TemplateModeling</activedir>
</general> </general>
</kdevcustomproject> </kdevcustomproject>
<kdevdebugger> <kdevdebugger>
......
<?xml version = '1.0' encoding = 'UTF-8'?> <?xml version = '1.0' encoding = 'UTF-8'?>
<!DOCTYPE KDevPrjSession> <!DOCTYPE KDevPrjSession>
<KDevPrjSession> <KDevPrjSession>
<DocsAndViews NumberOfDocuments="3" > <DocsAndViews NumberOfDocuments="4" >
<Doc0 NumberOfViews="1" URL="file:///data/home1/moebius/projects/OpenFlipper/Plugin-TemplateModeling/TemplateModelingPlugin.cc" > <Doc0 NumberOfViews="1" URL="file:///data/home1/moebius/projects/OpenFlipper/Plugin-TemplateModeling/Init.cc" >
<View0 Encoding="" Type="Source" /> <View0 Encoding="" line="1130" Type="Source" />
</Doc0> </Doc0>
<Doc1 NumberOfViews="1" URL="file:///data/home1/moebius/projects/OpenFlipper/Plugin-TemplateModeling/TemplateBlendingComputation.cc" > <Doc1 NumberOfViews="1" URL="file:///data/home1/moebius/projects/OpenFlipper/Plugin-TemplateModeling/TemplateModelingPlugin.hh" >
<View0 Encoding="" Type="Source" /> <View0 Encoding="" line="157" Type="Source" />
</Doc1> </Doc1>
<Doc2 NumberOfViews="1" URL="file:///data/home1/moebius/projects/OpenFlipper/Plugin-TemplateModeling/Init.cc" > <Doc2 NumberOfViews="1" URL="file:///data/home1/moebius/projects/OpenFlipper/Plugin-TemplateModeling/Matching.cc" >
<View0 Encoding="" line="1041" Type="Source" /> <View0 Encoding="" line="58" Type="Source" />
</Doc2> </Doc2>
<Doc3 NumberOfViews="1" URL="file:///data/home1/moebius/projects/OpenFlipper/Plugin-TemplateModeling/TemplateModelingPlugin.cc" >
<View0 Encoding="" line="410" Type="Source" />
</Doc3>
</DocsAndViews> </DocsAndViews>
<pluginList> <pluginList>
<kdevdebugger> <kdevdebugger>
......
...@@ -294,6 +294,24 @@ CoreWidget::toggleFullscreen() { ...@@ -294,6 +294,24 @@ CoreWidget::toggleFullscreen() {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
/** Enable or disable Fullscreen Mode
*/
void
CoreWidget::setFullscreen(bool _state ) {
if ( _state )
setWindowState( windowState() | Qt::WindowFullScreen);
else {
if ( windowState() & Qt::WindowFullScreen )
setWindowState( windowState() ^ Qt::WindowFullScreen);
}
OpenFlipper::Options::fullScreen( bool( windowState() & Qt::WindowFullScreen) );
show();
}
//-----------------------------------------------------------------------------
/** Hide or show logger /** Hide or show logger
*/ */
void void
......
...@@ -205,6 +205,9 @@ public: ...@@ -205,6 +205,9 @@ public:
/// Set application to Fullscreen and back /// Set application to Fullscreen and back
void toggleFullscreen(); void toggleFullscreen();
/// Enable or disable fullscreen mode
void setFullscreen(bool _state );
/// Hide or show logging area /// Hide or show logging area
void toggleLogger(); void toggleLogger();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment