projects
/
qtmeetings
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings
[qtmeetings]
/
src
/
UserInterface
/
WindowManager.cpp
diff --git
a/src/UserInterface/WindowManager.cpp
b/src/UserInterface/WindowManager.cpp
index
218f984
..
feef534
100644
(file)
--- a/
src/UserInterface/WindowManager.cpp
+++ b/
src/UserInterface/WindowManager.cpp
@@
-190,7
+190,8
@@
void WindowManager::showProgressBar( const QString &aText, bool aCancellable )
iProgressBar = new ProgressBar( aText, aCancellable );
iProgressBar->setFixedSize( 600, 125 );
iProgressBar->show();
iProgressBar = new ProgressBar( aText, aCancellable );
iProgressBar->setFixedSize( 600, 125 );
iProgressBar->show();
- connect( iProgressBar, SIGNAL( cancel() ), this, SIGNAL( progressBarCancelled() ) );
+ if( aCancellable )
+ connect( iProgressBar, SIGNAL( cancel() ), this, SIGNAL( progressBarCancelled() ) );
}
//TODO connect connect( iWeeklyView, SIGNAL( observedEventDetected() ), this, SIGNAL( observedEventDetected() ) );
}
//TODO connect connect( iWeeklyView, SIGNAL( observedEventDetected() ), this, SIGNAL( observedEventDetected() ) );