[Scummvm-cvs-logs] scummvm-tools master -> e5fae3afbaddb63fe2077e017d80c311de32563a
fingolfin
max at quendi.de
Fri Apr 8 11:49:31 CEST 2011
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .
Summary:
740f89429f TOOLS: Add Mac OS X Info.plist to update-version.pl
a5e08811bf TOOLS: Update version to 1.3.0git (matching ScummVM master)
22f179342b TOOLS: Add two FIXMEs
e5fae3afba TOOLS: Update GUI icons
Commit: 740f89429f8c8e479cdf8b7dfd5d3d5ebd8af100
https://github.com/scummvm/scummvm-tools/commit/740f89429f8c8e479cdf8b7dfd5d3d5ebd8af100
Author: Max Horn (max at quendi.de)
Date: 2011-04-08T02:14:49-07:00
Commit Message:
TOOLS: Add Mac OS X Info.plist to update-version.pl
Changed paths:
A dist/macosx/Info.plist.in
dist/macosx/Info.plist
update-version.pl
diff --git a/dist/macosx/Info.plist b/dist/macosx/Info.plist
index 30900b2..803c36f 100644
--- a/dist/macosx/Info.plist
+++ b/dist/macosx/Info.plist
@@ -2,29 +2,31 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
<key>CFBundleDisplayName</key>
<string>ScummVM Tools</string>
- <key>CFBundleName</key>
- <string>ScummVM Tools</string>
- <key>LSHasLocalizedDisplayName</key>
- <false/>
<key>CFBundleExecutable</key>
<string>scummvm-tools</string>
+ <key>CFBundleGetInfoString</key>
+ <string>1.2.0svn, Copyright 2001-2011 The ScummVM team</string>
<key>CFBundleIconFile</key>
<string>scummvmtools.icns</string>
<key>CFBundleIdentifier</key>
<string>org.scummvm.toolsgui</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>ScummVM Tools</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.2.0svn</string>
<key>CFBundleVersion</key>
<string>1.2.0svn</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleSignature</key>
- <string>????</string>
<key>NSAppleScriptEnabled</key>
<false/>
<key>NSHumanReadableCopyright</key>
- <string>Copyright 2001-2010 The ScummVM team</string>
+ <string>Copyright 2001-2011 The ScummVM team</string>
</dict>
</plist>
diff --git a/dist/macosx/Info.plist.in b/dist/macosx/Info.plist.in
new file mode 100644
index 0000000..fb1545c
--- /dev/null
+++ b/dist/macosx/Info.plist.in
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleDisplayName</key>
+ <string>ScummVM Tools</string>
+ <key>CFBundleExecutable</key>
+ <string>scummvm-tools</string>
+ <key>CFBundleGetInfoString</key>
+ <string>@VERSION@, Copyright 2001-2011 The ScummVM team</string>
+ <key>CFBundleIconFile</key>
+ <string>scummvmtools.icns</string>
+ <key>CFBundleIdentifier</key>
+ <string>org.scummvm.toolsgui</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>ScummVM Tools</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>@VERSION@</string>
+ <key>CFBundleVersion</key>
+ <string>@VERSION@</string>
+ <key>NSAppleScriptEnabled</key>
+ <false/>
+ <key>NSHumanReadableCopyright</key>
+ <string>Copyright 2001-2011 The ScummVM team</string>
+</dict>
+</plist>
diff --git a/update-version.pl b/update-version.pl
index 5844888..b960f97 100755
--- a/update-version.pl
+++ b/update-version.pl
@@ -32,6 +32,7 @@ print "Setting version to '$VERSION'\n";
# List of the files in which we need to perform substitution.
my @subs_files = qw(
internal_version.h
+ dist/macosx/Info.plist
);
my %subs = (
Commit: a5e08811bff976bbcc60538b05d77ef2bf3e33ca
https://github.com/scummvm/scummvm-tools/commit/a5e08811bff976bbcc60538b05d77ef2bf3e33ca
Author: Max Horn (max at quendi.de)
Date: 2011-04-08T02:15:15-07:00
Commit Message:
TOOLS: Update version to 1.3.0git (matching ScummVM master)
Changed paths:
dist/macosx/Info.plist
internal_version.h
diff --git a/dist/macosx/Info.plist b/dist/macosx/Info.plist
index 803c36f..d04f9ee 100644
--- a/dist/macosx/Info.plist
+++ b/dist/macosx/Info.plist
@@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>scummvm-tools</string>
<key>CFBundleGetInfoString</key>
- <string>1.2.0svn, Copyright 2001-2011 The ScummVM team</string>
+ <string>1.3.0git, Copyright 2001-2011 The ScummVM team</string>
<key>CFBundleIconFile</key>
<string>scummvmtools.icns</string>
<key>CFBundleIdentifier</key>
@@ -21,9 +21,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.2.0svn</string>
+ <string>1.3.0git</string>
<key>CFBundleVersion</key>
- <string>1.2.0svn</string>
+ <string>1.3.0git</string>
<key>NSAppleScriptEnabled</key>
<false/>
<key>NSHumanReadableCopyright</key>
diff --git a/internal_version.h b/internal_version.h
index 3044663..84a735a 100644
--- a/internal_version.h
+++ b/internal_version.h
@@ -2,4 +2,4 @@
#define SCUMMVM_TOOLS_SVN_REVISION
#endif
-#define SCUMMVM_TOOLS_VERSION "1.2.0svn" SCUMMVM_TOOLS_SVN_REVISION
+#define SCUMMVM_TOOLS_VERSION "1.3.0git" SCUMMVM_TOOLS_SVN_REVISION
Commit: 22f179342b9e1cd7793bd883b7a1b166dd232264
https://github.com/scummvm/scummvm-tools/commit/22f179342b9e1cd7793bd883b7a1b166dd232264
Author: Max Horn (max at quendi.de)
Date: 2011-04-08T02:24:36-07:00
Commit Message:
TOOLS: Add two FIXMEs
Changed paths:
gui/pages.cpp
diff --git a/gui/pages.cpp b/gui/pages.cpp
index 53dcfa1..8e820c4 100644
--- a/gui/pages.cpp
+++ b/gui/pages.cpp
@@ -608,6 +608,12 @@ wxWindow *ChooseOutPage::CreatePanel(wxWindow *parent) {
// some help perhaps?
sizer->Add(new wxStaticText(panel, wxID_ANY,
wxT("Select an output directory (using tool ") + _configuration.selectedTool->getName() + wxT(").\n\n") +
+ // FIXME: The following should *NOT* be shown to the user, but rather addressed by
+ // us developers!
+ // Indeed, either always ask for an output dir; or if that is not possible, then at least
+ // show an appropriate hint text depending on whether the user has to select a directory
+ // or something else.
+ // FIXME: Be consistent "directories" vs "folders", pick one.
wxT("Note: Some tools display file picker here, this should perhaps be changed to always ") +
wxT("be directory output, since often don't want to name the output file.)")
),
Commit: e5fae3afbaddb63fe2077e017d80c311de32563a
https://github.com/scummvm/scummvm-tools/commit/e5fae3afbaddb63fe2077e017d80c311de32563a
Author: Max Horn (max at quendi.de)
Date: 2011-04-08T02:46:35-07:00
Commit Message:
TOOLS: Update GUI icons
Seems we never updated the tools GUI icons to our "new" icon,
even though we had a new icon in media :(
Changed paths:
gui/media/scummvmtools.icns
gui/media/scummvmtools.ico
gui/media/scummvmtools_128.png
diff --git a/gui/media/scummvmtools.icns b/gui/media/scummvmtools.icns
index fd8afd4..6cf829a 100644
Binary files a/gui/media/scummvmtools.icns and b/gui/media/scummvmtools.icns differ
diff --git a/gui/media/scummvmtools.ico b/gui/media/scummvmtools.ico
index 2250bdc..c309c15 100644
Binary files a/gui/media/scummvmtools.ico and b/gui/media/scummvmtools.ico differ
diff --git a/gui/media/scummvmtools_128.png b/gui/media/scummvmtools_128.png
index 20097f0..ea9c7dd 100644
Binary files a/gui/media/scummvmtools_128.png and b/gui/media/scummvmtools_128.png differ
More information about the Scummvm-git-logs
mailing list