diff --git a/src/meshlab/mainwindow_Init.cpp b/src/meshlab/mainwindow_Init.cpp
index f4215d6b9..ef87184ea 100644
--- a/src/meshlab/mainwindow_Init.cpp
+++ b/src/meshlab/mainwindow_Init.cpp
@@ -24,6 +24,9 @@
History
$Log$
+Revision 1.58 2006/07/08 06:37:47 cignoni
+Many small bugs correction (esc crash, info in about, obj loading progress,fullscreen es)
+
Revision 1.57 2006/06/18 21:27:49 cignoni
Progress bar redesigned, now integrated in the workspace window
@@ -221,6 +224,7 @@ void MainWindow::createActions()
//////////////Action Menu View ////////////////////////////////////////////////////////////////////////////
fullScreenAct = new QAction (tr("&FullScreen"), this);
fullScreenAct->setCheckable(true);
+ fullScreenAct->setShortcutContext(Qt::ApplicationShortcut);
fullScreenAct->setShortcut(Qt::ALT+Qt::Key_Return);
connect(fullScreenAct, SIGNAL(triggered()), this, SLOT(fullScreen()));
diff --git a/src/meshlab/mainwindow_RunTime.cpp b/src/meshlab/mainwindow_RunTime.cpp
index 366a38706..3cd7e7be6 100644
--- a/src/meshlab/mainwindow_RunTime.cpp
+++ b/src/meshlab/mainwindow_RunTime.cpp
@@ -24,6 +24,9 @@
History
$Log$
+Revision 1.104 2006/07/08 06:37:47 cignoni
+Many small bugs correction (esc crash, info in about, obj loading progress,fullscreen es)
+
Revision 1.103 2006/06/27 08:07:42 cignoni
Restructured plugins interface for simplifying the server
@@ -333,6 +336,7 @@ void MainWindow::applyFilter()
}
void MainWindow::endEditMode()
{
+ if(!GLA()) return;
if(GLA()->getEditAction())
{
GLA()->getEditAction()->setChecked(false);
@@ -646,7 +650,7 @@ void MainWindow::about()
QDialog *about_dialog = new QDialog();
Ui::aboutDialog temp;
temp.setupUi(about_dialog);
- temp.labelMLName->setText(appName());
+ temp.labelMLName->setText(appName()+" ("+__DATE__+")");
//about_dialog->setFixedSize(566,580);
about_dialog->show();
}
@@ -699,24 +703,27 @@ void MainWindow::renderTexture()
void MainWindow::fullScreen(){
- toolbarState = saveState();
- menuBar()->hide();
- mainToolBar->hide();
- renderToolBar->hide();
- setWindowState(windowState()^Qt::WindowFullScreen);
- bool found=true;
- //Caso di piu' finestre aperte in tile:
- if((workspace->windowList()).size()>1){
- foreach(QWidget *w,workspace->windowList()){if(w->isMaximized()) found=false;}
- if (found)workspace->tile();
- }
-}
-void MainWindow::keyPressEvent(QKeyEvent *e){
- if(e->key()==Qt::Key_Escape && isFullScreen())
- {
- e->accept();
- menuBar()->show();
+ if(!isFullScreen())
+ {
+ toolbarState = saveState();
+ menuBar()->hide();
+ mainToolBar->hide();
+ renderToolBar->hide();
+ globalStatusBar()->hide();
+ setWindowState(windowState()^Qt::WindowFullScreen);
+ bool found=true;
+ //Caso di piu' finestre aperte in tile:
+ if((workspace->windowList()).size()>1){
+ foreach(QWidget *w,workspace->windowList()){if(w->isMaximized()) found=false;}
+ if (found)workspace->tile();
+ }
+ }
+ else
+ {
+ menuBar()->show();
restoreState(toolbarState);
+ globalStatusBar()->show();
+
setWindowState(windowState()^ Qt::WindowFullScreen);
bool found=true;
//Caso di piu' finestre aperte in tile:
@@ -725,7 +732,15 @@ void MainWindow::keyPressEvent(QKeyEvent *e){
if (found){workspace->tile();}
}
fullScreenAct->setChecked(false);
- }
- else
- e->ignore();
+ }
+}
+
+void MainWindow::keyPressEvent(QKeyEvent *e)
+{
+ if(e->key()==Qt::Key_Return && e->modifiers()==Qt::AltModifier)
+ {
+ fullScreen();
+ e->accept();
+ }
+ else e->ignore();
}
\ No newline at end of file
diff --git a/src/meshlab/ui/aboutDialog.ui b/src/meshlab/ui/aboutDialog.ui
index 7dd255501..227eecbd0 100644
--- a/src/meshlab/ui/aboutDialog.ui
+++ b/src/meshlab/ui/aboutDialog.ui
@@ -77,7 +77,7 @@
- :/images/eye_256_splash.png
+ :/images/eye_256_splash.png
@@ -210,7 +210,7 @@
- :/images/logo.png
+ :/images/logo.png
@@ -237,6 +237,23 @@
+
+
+
+ 10
+ 130
+ 181
+ 61
+
+
+
+ Meshlab is supported
+by the Epoch network of excellence
+
+
+ Qt::AlignCenter
+
+
@@ -262,29 +279,12 @@
- :/images/logo_epoch.png
+ :/images/logo_epoch.png
false
-
-
-
- 10
- 130
- 181
- 61
-
-
-
- Meshlab is supported
-by the Epoch network of excellence
-
-
- Qt::AlignCenter
-
-
-
diff --git a/src/meshlabplugins/meshrender/meshrender.h b/src/meshlabplugins/meshrender/meshrender.h
index 289919b48..e7094f630 100644
--- a/src/meshlabplugins/meshrender/meshrender.h
+++ b/src/meshlabplugins/meshrender/meshrender.h
@@ -23,6 +23,9 @@
/****************************************************************************
History
$Log$
+Revision 1.20 2006/07/08 06:37:48 cignoni
+Many small bugs correction (esc crash, info in about, obj loading progress,fullscreen es)
+
Revision 1.19 2006/06/08 08:54:43 zifnab1974
Do not use classname in class definition
@@ -120,12 +123,13 @@ public:
MeshShaderRenderPlugin()
{
- initActionList();
+
supported = false;
sDialog = 0;
}
- QList actions () const {
+ QList actions () {
+ if(actionList.isEmpty()) initActionList();
return actionList;
}