Skip to content
Permalink
Browse files

Merge branch 'master' of github.com:qgis/Quantum-GIS

  • Loading branch information
timlinux committed May 26, 2011
2 parents 4be0d71 + 2670283 commit f49be68c667312b06fa61cb5e272e12a22ca4ab9
Showing with 14 additions and 20 deletions.
  1. +1 −0 ms-windows/osgeo4w/package-nightly.cmd
  2. +1 −0 ms-windows/osgeo4w/package.cmd
  3. +12 −20 src/app/qgscustomization.cpp
@@ -151,6 +151,7 @@ tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 ^
--exclude-from exclude ^
apps/%PACKAGENAME% ^
bin/%PACKAGENAME%.bat.tmpl ^
bin/%PACKAGENAME%-browser.bat.tmpl ^
etc/postinstall/%PACKAGENAME%.bat ^
etc/preremove/%PACKAGENAME%.bat ^
>>%LOG% 2>&1
@@ -159,6 +159,7 @@ tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 ^
--exclude "apps/%PACKAGENAME%/plugins/grassprovider.dll" ^
apps/%PACKAGENAME% ^
bin/%PACKAGENAME%.bat.tmpl ^
bin/%PACKAGENAME%-browser.bat.tmpl ^
etc/postinstall/%PACKAGENAME%.bat ^
etc/preremove/%PACKAGENAME%.bat ^
>>%LOG% 2>&1
@@ -838,30 +838,22 @@ void QgsCustomization::removeFromLayout( QLayout *theLayout, QWidget * theWidget

void QgsCustomization::preNotify( QObject * receiver, QEvent * event, bool * done )
{
QWidget *widget = qobject_cast<QWidget*>( receiver );

if ( mEnabled && widget && event->type() == QEvent::Show )
if ( event->type() == QEvent::Show || event->type() == QEvent::MouseButtonPress )
{
QgsCustomization::customizeWidget( widget, event );
if ( widget->inherits( "QDialog" ) && pDialog && pDialog->isVisible() )
QWidget *widget = qobject_cast<QWidget*>( receiver );

if ( mEnabled && widget && event->type() == QEvent::Show )
{
// TODO?
QgsCustomization::customizeWidget( widget, event );
}
}
else if ( mEnabled && widget && ( event->type() == QEvent::Hide || event->type() == QEvent::Close ) )
{
if ( widget->inherits( "QDialog" ) && pDialog && pDialog->isVisible() )
else if ( widget && event->type() == QEvent::MouseButtonPress )
{
// TODO?
}
}
else if ( widget && event->type() == QEvent::MouseButtonPress )
{
QgsDebugMsg( "click" );
if ( pDialog && pDialog->isVisible() )
{
QMouseEvent *e = static_cast<QMouseEvent*>( event );
*done = pDialog->switchWidget( widget, e );
QgsDebugMsg( "click" );
if ( pDialog && pDialog->isVisible() )
{
QMouseEvent *e = static_cast<QMouseEvent*>( event );
*done = pDialog->switchWidget( widget, e );
}
}
}
// Shortcut arrives only if it is defined and used in main app

0 comments on commit f49be68

Please sign in to comment.
You can’t perform that action at this time.