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

qgis · May 26, 2011 · f49be68 · f49be68
2 parents 4be0d71 + 2670283
commit f49be68
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 20 deletions.
diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd
@@ -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

diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -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

diff --git a/src/app/qgscustomization.cpp b/src/app/qgscustomization.cpp
@@ -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