The branch, eden has been updated
       via  fdd01aa4dbed99e02280d877cb383268bd63e5c9 (commit)
      from  da0c9e4ea6bdb5668f373b1242050933a6536836 (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=fdd01aa4dbed99e02280d877cb383268bd63e5c9

commit fdd01aa4dbed99e02280d877cb383268bd63e5c9
Author: ronie <[email protected]>
Date:   Wed Apr 11 22:40:25 2012 +0200

    [script.globalsearch] -v0.2.4
    
    add searchstring window property

diff --git a/script.globalsearch/README.txt b/script.globalsearch/README.txt
index 75e5cd5..1a73bd2 100644
--- a/script.globalsearch/README.txt
+++ b/script.globalsearch/README.txt
@@ -5,12 +5,13 @@ INFORMATION FOR SKINNERS
 
 
 CONTENTS:
-0. Running the addon 
-I. Infolabels available in script-globalsearch-main.xml
-II. Infolabels available in script-globalsearch-infodialog.xml
+0.   Running the addon 
+I.   Infolabels available in script-globalsearch-main.xml
+II.  Infolabels available in script-globalsearch-infodialog.xml
 III. Control id's used in script-globalsearch-main.xml
-IV. Control id's used in script-globalsearch-infodialog.xml
-V. Control id's used in script-globalsearch-contextmenu.xml
+IV.  Control id's used in script-globalsearch-infodialog.xml
+V.   Control id's used in script-globalsearch-contextmenu.xml
+VI.  Available window properties
 
 
 
@@ -266,3 +267,9 @@ If you want to get rid of some of them, just position them 
outside of the screen
 
 Any id not mentioned above, but used in the default xml files, can safely be 
changed or removed.
 
+
+
+VI.  Available window properties
+--------------------------------
+Window.Property(GlobalSearch.SearchString) - the string the user is searching 
for
+
diff --git a/script.globalsearch/addon.xml b/script.globalsearch/addon.xml
index 92f5d35..ab4e04d 100644
--- a/script.globalsearch/addon.xml
+++ b/script.globalsearch/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.globalsearch" name="Global Search" version="0.2.3" 
provider-name="ronie">
+<addon id="script.globalsearch" name="Global Search" version="0.2.4" 
provider-name="ronie">
        <requires>
                <import addon="xbmc.python" version="2.0"/>
                <import addon="script.module.simplejson" version="2.0.10"/>
diff --git a/script.globalsearch/changelog.txt 
b/script.globalsearch/changelog.txt
index 39e2883..4a34a25 100644
--- a/script.globalsearch/changelog.txt
+++ b/script.globalsearch/changelog.txt
@@ -1,3 +1,7 @@
+v0.2.4
+- add searchstring window property
+- allow dialogfullscreeninfo to be used
+
 v0.2.3
 - use label for seasons
 - sort by label instead of title
diff --git a/script.globalsearch/resources/lib/gui.py 
b/script.globalsearch/resources/lib/gui.py
index 211c87a..83eed22 100644
--- a/script.globalsearch/resources/lib/gui.py
+++ b/script.globalsearch/resources/lib/gui.py
@@ -32,6 +32,8 @@ class GUI( xbmcgui.WindowXMLDialog ):
         if self.searchstring == '':
             self._close()
         else:
+            self.window_id = xbmcgui.getCurrentWindowDialogId()
+            
xbmcgui.Window(self.window_id).setProperty('GlobalSearch.SearchString', 
self.searchstring)
             self._hide_controls()
             if not self.nextsearch:
                 self._parse_argv()
@@ -962,9 +964,13 @@ class GUI( xbmcgui.WindowXMLDialog ):
                 self.Player.stop()
                 self._trailerstopped()
         elif action in ACTION_SHOW_INFO:
-            self._showInfo()
+            if self.playingtrailer == 'true' and 
xbmc.getCondVisibility('videoplayer.isfullscreen'):
+                xbmc.executebuiltin("ActivateWindow(142)")
+            else:
+                self._showInfo()
 
     def _close( self ):
+            
xbmcgui.Window(self.window_id).clearProperty('GlobalSearch.SearchString')
             log('script stopped')
             self.close()
 

-----------------------------------------------------------------------

Summary of changes:
 script.globalsearch/README.txt           |   17 ++++++++++++-----
 script.globalsearch/addon.xml            |    2 +-
 script.globalsearch/changelog.txt        |    4 ++++
 script.globalsearch/resources/lib/gui.py |    8 +++++++-
 4 files changed, 24 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Scripts

------------------------------------------------------------------------------
Better than sec? Nothing is better than sec when it comes to
monitoring Big Data applications. Try Boundary one-second 
resolution app monitoring today. Free.
http://p.sf.net/sfu/Boundary-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to