small cosmetic improvements

diff --git a/installer/installer.c b/installer/installer.c
index b62721d..d22efd5 100644 (file)
--- a/installer/installer.c
+++ b/installer/installer.c
@@ -534,7 +534,7 @@ BOOL CALLBACK PropertySheetFunc3(HWND hwnd, UINT message, WPARAM wParam, LPARAM
        SetDlgItemText(hwnd, IDC_SPACE2, "");
        PropSheet_SetWizButtons(dialog, 0);
        SendMessage(dialog, PSM_CANCELTOCLOSE, 0, 0); //makes wine display a warning
        SetDlgItemText(hwnd, IDC_SPACE2, "");
        PropSheet_SetWizButtons(dialog, 0);
        SendMessage(dialog, PSM_CANCELTOCLOSE, 0, 0); //makes wine display a warning

-       SetDlgItemText(hwnd, IDC_TITLE, "Installing files...");
+       SetDlgItemText(hwnd, IDC_TITLE, "Installing...");

        statuswnd = hwnd;
        status_t status;
        status.status = PropertyArchiveStatus;
        statuswnd = hwnd;
        status_t status;
        status.status = PropertyArchiveStatus;

diff --git a/wx/Makefile b/wx/Makefile
index 3ed15ef..9a690d2 100644 (file)
--- a/wx/Makefile
+++ b/wx/Makefile
@@ -6,8 +6,9 @@ include ../Makefile.common
 all: pdf2swf_gui.exe
 
 pdf2swf_gui.exe: gpdf2swf.py gui/*.py viewers/*.py
 all: pdf2swf_gui.exe
 
 pdf2swf_gui.exe: gpdf2swf.py gui/*.py viewers/*.py

-       cp gpdf2swf.py /xpython/main.py
-       cp -R viewers gui lib /xpython/
+       cp -a ../installer/swftools.ico /xpython/xpython.ico
+       cp -a gpdf2swf.py /xpython/main.py
+       cp -a -R viewers gui lib /xpython/

        cd /xpython/swftools;git pull
        cd /xpython;make xpython.exe
        ln -f /xpython/xpython.exe ./gpdf2swf.exe
        cd /xpython/swftools;git pull
        cd /xpython;make xpython.exe
        ln -f /xpython/xpython.exe ./gpdf2swf.exe

diff --git a/wx/gui/options/viewer.py b/wx/gui/options/viewer.py
index e36eacc..0432cac 100644 (file)
--- a/wx/gui/options/viewer.py
+++ b/wx/gui/options/viewer.py
@@ -104,6 +104,8 @@ class ViewerBook(wx.Listbook):
 
             win = self.makePanel(mod)
             self.AddPage(win, mod, imageId=idx)
 
             win = self.makePanel(mod)
             self.AddPage(win, mod, imageId=idx)

+            if hasattr(mod, "default"):
+                self.SetSelection(idx)

 
 
     def makePanel(self, mod):
 
 
     def makePanel(self, mod):

diff --git a/wx/viewers/flexpaper.py b/wx/viewers/flexpaper.py
index 4f1d1f6..79177e1 100644 (file)
--- a/wx/viewers/flexpaper.py
+++ b/wx/viewers/flexpaper.py
@@ -24,7 +24,7 @@
 
 from gui.fields import Choose, ChooseAndInt
 
 
 from gui.fields import Choose, ChooseAndInt
 

-order = 3
+order = 2

 type = "custom"
 name = u"Flex Paper Viewer"
 desc = u"""Provides a light weight document viewer with:
 type = "custom"
 name = u"Flex Paper Viewer"
 desc = u"""Provides a light weight document viewer with:

diff --git a/wx/viewers/raw.py b/wx/viewers/raw.py
index 8a92849..7e92457 100644 (file)
--- a/wx/viewers/raw.py
+++ b/wx/viewers/raw.py
@@ -24,7 +24,7 @@
 
 from gui.fields import Choose
 
 
 from gui.fields import Choose
 

-order = 0
+order = 4

 type = "core"
 name = u"No Viewer"
 desc = (u'The SWF will be in "raw" format, with each page a seperate frame. '
 type = "core"
 name = u"No Viewer"
 desc = (u'The SWF will be in "raw" format, with each page a seperate frame. '

diff --git a/wx/viewers/rfx.py b/wx/viewers/rfx.py
index 610b5a5..adcb9cf 100644 (file)
--- a/wx/viewers/rfx.py
+++ b/wx/viewers/rfx.py
@@ -24,7 +24,8 @@
 
 from gui.fields import Choose, ChooseAndInt
 
 
 from gui.fields import Choose, ChooseAndInt
 

-order = 2
+order = 0
+default = True

 type = "custom"
 name = u"rfx Viewer"
 desc = u"A more sophisticated viewer with zooming and scrolling."
 type = "custom"
 name = u"rfx Viewer"
 desc = u"A more sophisticated viewer with zooming and scrolling."

diff --git a/wx/viewers/simple.py b/wx/viewers/simple.py
index dd59332..443c620 100644 (file)
--- a/wx/viewers/simple.py
+++ b/wx/viewers/simple.py
@@ -24,7 +24,7 @@
 
 from gui.fields import Hidden, Choose
 
 
 from gui.fields import Hidden, Choose
 

-order = 1
+order = 3

 type = "core"
 name = u"Simple Viewer"
 desc = (u"A tiny viewer, which attaches directly to the SWF, "
 type = "core"
 name = u"Simple Viewer"
 desc = (u"A tiny viewer, which attaches directly to the SWF, "

diff --git a/wx/viewers/technoargia.py b/wx/viewers/technoargia.py
index f19e9e9..52cc488 100644 (file)
--- a/wx/viewers/technoargia.py
+++ b/wx/viewers/technoargia.py
@@ -24,7 +24,7 @@
 
 from gui.fields import Choose, ChooseAndInt, Hidden
 
 
 from gui.fields import Choose, ChooseAndInt, Hidden
 

-order = 4
+order = 1

 type = "custom"
 name = u"technoargia Viewer"
 desc = (u"Simple viewer with home link from Laurent Lalanne"
 type = "custom"
 name = u"technoargia Viewer"
 desc = (u"Simple viewer with home link from Laurent Lalanne"