Sun, 06 May 2012 11:23:54 +0200
Merged remote changes.
--- a/APIs/Python3/eric5.api Sat May 05 19:23:18 2012 +0200 +++ b/APIs/Python3/eric5.api Sun May 06 11:23:54 2012 +0200 @@ -7184,7 +7184,7 @@ eric5.Utilities.Startup.loaded_translators?7 eric5.Utilities.Startup.makeAppInfo?4(argv, name, arg, description, options=[]) eric5.Utilities.Startup.setLibraryPaths?4() -eric5.Utilities.Startup.simpleAppStartup?4(argv, appinfo, mwFactory, quitOnLastWindowClosed=True, app=None) +eric5.Utilities.Startup.simpleAppStartup?4(argv, appinfo, mwFactory, quitOnLastWindowClosed=True, app=None, raiseIt=True) eric5.Utilities.Startup.usage?4(appinfo, optlen=12) eric5.Utilities.Startup.version?4(appinfo) eric5.Utilities._escape?8
--- a/APIs/Python3/eric5.bas Sat May 05 19:23:18 2012 +0200 +++ b/APIs/Python3/eric5.bas Sun May 06 11:23:54 2012 +0200 @@ -59,7 +59,7 @@ ChangeBookmarkCommand QUndoCommand ChatWidget QWidget Ui_ChatWidget ChromeImporter BookmarksImporter -Class ClbrBaseClasses.Class VisibilityMixin +Class ClbrBase ClassItem UMLItem ClassScope Scope ClbrBase _ClbrBase
--- a/Documentation/Source/eric5.Utilities.Startup.html Sat May 05 19:23:18 2012 +0200 +++ b/Documentation/Source/eric5.Utilities.Startup.html Sun May 06 11:23:54 2012 +0200 @@ -184,7 +184,7 @@ <hr /><hr /> <a NAME="simpleAppStartup" ID="simpleAppStartup"></a> <h2>simpleAppStartup</h2> -<b>simpleAppStartup</b>(<i>argv, appinfo, mwFactory, quitOnLastWindowClosed=True, app=None</i>) +<b>simpleAppStartup</b>(<i>argv, appinfo, mwFactory, quitOnLastWindowClosed=True, app=None, raiseIt=True</i>) <p> Module function to start up an application that doesn't need a specialized start up. </p><p> @@ -211,6 +211,9 @@ </dd><dt><i>app=</i></dt> <dd> reference to the application object (QApplication or None) +</dd><dt><i>raiseIt=</i></dt> +<dd> +flag indicating to raise the generated application window (boolean) </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/UI/SearchWidget.py Sat May 05 19:23:18 2012 +0200 +++ b/UI/SearchWidget.py Sun May 06 11:23:54 2012 +0200 @@ -40,6 +40,12 @@ if spacer: spacerItem = QSpacerItem(20, 1, QSizePolicy.Minimum, QSizePolicy.Expanding) self.verticalLayout.addItem(spacerItem) + else: + # change the size policy of the search combo if the spacer is not wanted, + # i.e. it is below the to be searched widget + sizePolicy = self.findtextCombo.sizePolicy() + sizePolicy.setHorizontalPolicy(QSizePolicy.Expanding) + self.findtextCombo.setSizePolicy(sizePolicy) self.__mainWindow = mainWindow self.__findBackwards = True
--- a/Utilities/Startup.py Sat May 05 19:23:18 2012 +0200 +++ b/Utilities/Startup.py Sun May 06 11:23:54 2012 +0200 @@ -203,7 +203,7 @@ def simpleAppStartup(argv, appinfo, mwFactory, quitOnLastWindowClosed=True, - app=None): + app=None, raiseIt=True): """ Module function to start up an application that doesn't need a specialized start up. @@ -220,6 +220,7 @@ @keyparam quitOnLastWindowClosed flag indicating to quit the application, if the last window was closed (boolean) @keyparam app reference to the application object (QApplication or None) + @keyparam raiseIt flag indicating to raise the generated application window (boolean) """ handleArgs(argv, appinfo) if app is None: @@ -243,6 +244,7 @@ if quitOnLastWindowClosed: app.lastWindowClosed.connect(app.quit) w.show() - w.raise_() + if raiseIt: + w.raise_() return app.exec_()
--- a/eric5_tray.py Sat May 05 19:23:18 2012 +0200 +++ b/eric5_tray.py Sun May 06 11:23:54 2012 +0200 @@ -52,7 +52,8 @@ res = Startup.simpleAppStartup(sys.argv, appinfo, createMainWidget, - quitOnLastWindowClosed=False) + quitOnLastWindowClosed=False, + raiseIt=False) sys.exit(res) if __name__ == '__main__':