Fixed Bug 10586: "Script ColorChart.py misbehaves with 2 or more opened documents."

git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17395 11d20701-8431-0410-a711-e3c959e3b870

8 files changed, 8 insertions, 8 deletions

diff --git a/scribus/plugins/scriptplugin/scripts/Autoquote.py b/scribus/plugins/scriptplugin/scripts/Autoquote.py
index daa58f9..ac8e42a 100644
--- a/scribus/plugins/scriptplugin/scripts/Autoquote.py
+++ b/scribus/plugins/scriptplugin/scripts/Autoquote.py
@@ -17,7 +17,7 @@ Detected errors shut down the script with an appropriate message.
 """
 import scribus
 
-if scribus.haveDoc():
+if scribus.haveDoc() > 0:
     c = 0
     lang = scribus.valueDialog("Choose by language or country", 'Language: af, be, ch, cs, de, en, es, et, fi, fr,\n hu, is, lt, mk, nl, pl, ru, se, sk, sl, sq and uk\n are current choices','en')
     if (lang == 'en'):
diff --git a/scribus/plugins/scriptplugin/scripts/CalendarWizard.py b/scribus/plugins/scriptplugin/scripts/CalendarWizard.py
index 8b46eba..a1436be 100644
--- a/scribus/plugins/scriptplugin/scripts/CalendarWizard.py
+++ b/scribus/plugins/scriptplugin/scripts/CalendarWizard.py
@@ -660,7 +660,7 @@ def main():
         app = TkCalendar(root)
         root.mainloop()
     finally:
-        if haveDoc():
+        if haveDoc() > 0:
             redrawAll()
         statusMessage('Done.')
         progressReset()
diff --git a/scribus/plugins/scriptplugin/scripts/ColorChart.py b/scribus/plugins/scriptplugin/scripts/ColorChart.py
index 46946d3..3168918 100644
--- a/scribus/plugins/scriptplugin/scripts/ColorChart.py
+++ b/scribus/plugins/scriptplugin/scripts/ColorChart.py
@@ -129,7 +129,7 @@ def getColorsFromDocument():
         return list
 
     #check if we have a document - otherwise display open file dialog
-    if scribus.haveDoc() == 1:
+    if scribus.haveDoc() > 0:
         pass
         list=getColors()
         return list
diff --git a/scribus/plugins/scriptplugin/scripts/DirectImageImport.py b/scribus/plugins/scriptplugin/scripts/DirectImageImport.py
index 369a7ad..5aa95a6 100644
--- a/scribus/plugins/scriptplugin/scripts/DirectImageImport.py
+++ b/scribus/plugins/scriptplugin/scripts/DirectImageImport.py
@@ -88,7 +88,7 @@ def main():
 
     
 if __name__ == '__main__':
-    if haveDoc():
+    if haveDoc() > 0:
         main()
     else:
         messageBox("Image Import", "You need to have a document open <i>before</i> you can run this script succesfully.", ICON_INFORMATION)
\ No newline at end of file
diff --git a/scribus/plugins/scriptplugin/scripts/FontSample.py b/scribus/plugins/scriptplugin/scripts/FontSample.py
index 62bdcfc..0219a32 100644
--- a/scribus/plugins/scriptplugin/scripts/FontSample.py
+++ b/scribus/plugins/scriptplugin/scripts/FontSample.py
@@ -1564,7 +1564,7 @@ def main_wrapper(argv):
         # Exit neatly even if the script terminated with an exception,
         # so we leave the progress bar and status bar blank and make sure
         # drawing is enabled.
-        if scribus.haveDoc():
+        if scribus.haveDoc() > 0:
             scribus.setRedraw(True)
         scribus.statusMessage('')
         scribus.progressReset()
diff --git a/scribus/plugins/scriptplugin/scripts/color2csv.py b/scribus/plugins/scriptplugin/scripts/color2csv.py
index d4bf10f..35b587d 100644
--- a/scribus/plugins/scriptplugin/scripts/color2csv.py
+++ b/scribus/plugins/scriptplugin/scripts/color2csv.py
@@ -103,7 +103,7 @@ def writeColorCsvFile(filename, colorlist):
 
 def main(argv):
     """Main method - here we check if we have a doc - else we open one. we get all the colors and write them to a csv file."""
-    if scribus.haveDoc():  #DOC OPEN
+    if scribus.haveDoc() > 0:  #DOC OPEN
     #get colors, get filename, write stuff
         cols = getColorsFromDoc()
         filename = scribus.fileDialog("color2csv: Save csv color file", defaultname="colors.csv",  issave=True ,  haspreview=False)
diff --git a/scribus/plugins/scriptplugin/scripts/csv2color.py b/scribus/plugins/scriptplugin/scripts/csv2color.py
index 0c4011d..09e1196 100644
--- a/scribus/plugins/scriptplugin/scripts/csv2color.py
+++ b/scribus/plugins/scriptplugin/scripts/csv2color.py
@@ -175,7 +175,7 @@ def main_wrapper(argv):
         # Exit neatly even if the script terminated with an exception,
         # so we leave the progress bar and status bar blank and make sure
         # drawing is enabled.
-        if scribus.haveDoc():
+        if scribus.haveDoc() > 0:
             scribus.setRedraw(True)
         scribus.statusMessage("")
         scribus.progressReset()
diff --git a/scribus/plugins/scriptplugin/scripts/importcsv2table.py b/scribus/plugins/scriptplugin/scripts/importcsv2table.py
index 5c628b1..30d0d50 100644
--- a/scribus/plugins/scriptplugin/scripts/importcsv2table.py
+++ b/scribus/plugins/scriptplugin/scripts/importcsv2table.py
@@ -196,7 +196,7 @@ def main_wrapper(argv):
         # Exit neatly even if the script terminated with an exception,
         # so we leave the progress bar and status bar blank and make sure
         # drawing is enabled.
-        if scribus.haveDoc():
+        if scribus.haveDoc() > 0:
             scribus.setRedraw(True)
         scribus.statusMessage("")
         scribus.progressReset()