lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-16 01:24:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Many small bugs correction (esc crash, info in about, obj loading progress,fullscreen es)

Browse Source
This commit is contained in:
Paolo Cignoni cignoni 2006-07-08 06:37:48 +00:00
parent e886913a50
commit 925e23ab28
4 changed files with 66 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/meshlab/mainwindow_Init.cpp
View File

@ -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()));

57
src/meshlab/mainwindow_RunTime.cpp
View File

@ -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();
}

40
src/meshlab/ui/aboutDialog.ui
View File

@ -77,7 +77,7 @@
<string/>
</property>
<property name="pixmap" >
<pixmap resource="../meshlab.qrc" >:/images/eye_256_splash.png</pixmap>
<pixmap resource="..\meshlab.qrc" >:/images/eye_256_splash.png</pixmap>
</property>
</widget>
</item>
@ -210,7 +210,7 @@
<string/>
</property>
<property name="pixmap" >
<pixmap resource="../meshlab.qrc" >:/images/logo.png</pixmap>
<pixmap resource="..\meshlab.qrc" >:/images/logo.png</pixmap>
</property>
</widget>
</item>
@ -237,6 +237,23 @@
<property name="title" >
<string/>
</property>
<widget class="QLabel" name="label" >
<property name="geometry" >
<rect>
<x>10</x>
<y>130</y>
<width>181</width>
<height>61</height>
</rect>
</property>
<property name="text" >
<string>Meshlab is supported
by the Epoch network of excellence</string>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
</widget>
<widget class="QLabel" name="labelVCGLogo_2" >
<property name="geometry" >
<rect>
@ -262,29 +279,12 @@
<string/>
</property>
<property name="pixmap" >
<pixmap resource="../meshlab.qrc" >:/images/logo_epoch.png</pixmap>
<pixmap resource="..\meshlab.qrc" >:/images/logo_epoch.png</pixmap>
</property>
<property name="scaledContents" >
<bool>false</bool>
</property>
</widget>
<widget class="QLabel" name="label" >
<property name="geometry" >
<rect>
<x>10</x>
<y>130</y>
<width>181</width>
<height>61</height>
</rect>
</property>
<property name="text" >
<string>Meshlab is supported
by the Epoch network of excellence</string>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
</widget>
</widget>
</item>
<item>

8
src/meshlabplugins/meshrender/meshrender.h
View File

@ -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<QAction *> actions () const {
QList<QAction *> actions () {
if(actionList.isEmpty()) initActionList();
return actionList;
}