Menu
▾
▴
skim-app-commit — This tracks source code changes in Subversion.
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
(23) |
Apr
(254) |
May
(252) |
Jun
(209) |
Jul
(198) |
Aug
(192) |
Sep
(207) |
Oct
(120) |
Nov
(179) |
Dec
(52) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(48) |
Feb
(69) |
Mar
(129) |
Apr
(250) |
May
(113) |
Jun
(177) |
Jul
(228) |
Aug
(155) |
Sep
(218) |
Oct
(185) |
Nov
(109) |
Dec
(88) |
| 2009 |
Jan
(83) |
Feb
(39) |
Mar
(70) |
Apr
(47) |
May
(48) |
Jun
(67) |
Jul
(61) |
Aug
(97) |
Sep
(221) |
Oct
(141) |
Nov
(70) |
Dec
(61) |
| 2010 |
Jan
(45) |
Feb
(76) |
Mar
(178) |
Apr
(106) |
May
(57) |
Jun
(32) |
Jul
(64) |
Aug
(98) |
Sep
(96) |
Oct
(19) |
Nov
(34) |
Dec
(117) |
| 2011 |
Jan
(55) |
Feb
(48) |
Mar
(64) |
Apr
(21) |
May
(39) |
Jun
(53) |
Jul
(99) |
Aug
(56) |
Sep
(39) |
Oct
(26) |
Nov
(19) |
Dec
(69) |
| 2012 |
Jan
(17) |
Feb
(40) |
Mar
(17) |
Apr
|
May
(2) |
Jun
(8) |
Jul
(2) |
Aug
(10) |
Sep
(10) |
Oct
(38) |
Nov
(48) |
Dec
(70) |
| 2013 |
Jan
(43) |
Feb
(47) |
Mar
(39) |
Apr
(37) |
May
(25) |
Jun
(6) |
Jul
(20) |
Aug
(49) |
Sep
(33) |
Oct
(34) |
Nov
(75) |
Dec
(6) |
| 2014 |
Jan
(32) |
Feb
(10) |
Mar
(17) |
Apr
|
May
|
Jun
(26) |
Jul
(5) |
Aug
|
Sep
(4) |
Oct
(23) |
Nov
(80) |
Dec
(48) |
| 2015 |
Jan
(80) |
Feb
(50) |
Mar
(58) |
Apr
(20) |
May
(11) |
Jun
(16) |
Jul
(24) |
Aug
(27) |
Sep
(56) |
Oct
(30) |
Nov
(16) |
Dec
(6) |
| 2016 |
Jan
(31) |
Feb
(14) |
Mar
(23) |
Apr
(17) |
May
(40) |
Jun
(12) |
Jul
(17) |
Aug
(9) |
Sep
(32) |
Oct
(36) |
Nov
(23) |
Dec
(9) |
| 2017 |
Jan
(37) |
Feb
(23) |
Mar
(65) |
Apr
(22) |
May
(6) |
Jun
(3) |
Jul
|
Aug
|
Sep
(3) |
Oct
(22) |
Nov
(63) |
Dec
(71) |
| 2018 |
Jan
(83) |
Feb
(21) |
Mar
(35) |
Apr
(44) |
May
(14) |
Jun
(12) |
Jul
(8) |
Aug
(18) |
Sep
(10) |
Oct
(145) |
Nov
(144) |
Dec
(76) |
| 2019 |
Jan
(18) |
Feb
(28) |
Mar
(5) |
Apr
(208) |
May
(291) |
Jun
(158) |
Jul
(27) |
Aug
(8) |
Sep
(10) |
Oct
(83) |
Nov
(41) |
Dec
(31) |
| 2020 |
Jan
(16) |
Feb
(46) |
Mar
(100) |
Apr
(78) |
May
(69) |
Jun
(71) |
Jul
(28) |
Aug
(131) |
Sep
(176) |
Oct
(89) |
Nov
(147) |
Dec
(19) |
| 2021 |
Jan
(19) |
Feb
(25) |
Mar
(91) |
Apr
(98) |
May
(14) |
Jun
(44) |
Jul
(8) |
Aug
(3) |
Sep
(38) |
Oct
(57) |
Nov
(97) |
Dec
(74) |
| 2022 |
Jan
(89) |
Feb
(47) |
Mar
(15) |
Apr
(50) |
May
(54) |
Jun
(56) |
Jul
(80) |
Aug
(12) |
Sep
(11) |
Oct
(60) |
Nov
(48) |
Dec
(4) |
| 2023 |
Jan
(75) |
Feb
(49) |
Mar
(84) |
Apr
(24) |
May
(13) |
Jun
(74) |
Jul
(32) |
Aug
(66) |
Sep
(50) |
Oct
(38) |
Nov
(105) |
Dec
(181) |
| 2024 |
Jan
(21) |
Feb
(49) |
Mar
(77) |
Apr
(84) |
May
(20) |
Jun
(71) |
Jul
(53) |
Aug
(33) |
Sep
(54) |
Oct
(124) |
Nov
(151) |
Dec
(73) |
| 2025 |
Jan
(61) |
Feb
(17) |
Mar
(136) |
Apr
(72) |
May
(200) |
Jun
(238) |
Jul
(91) |
Aug
(8) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ho...@us...> - 2007-08-18 17:05:17
|
Revision: 2681
http://skim-app.svn.sourceforge.net/skim-app/?rev=2681&view=rev
Author: hofman
Date: 2007-08-18 10:05:16 -0700 (Sat, 18 Aug 2007)
Log Message:
-----------
Echo build comment after setting variable.
Modified Paths:
--------------
trunk/Skim.xcodeproj/project.pbxproj
Modified: trunk/Skim.xcodeproj/project.pbxproj
===================================================================
--- trunk/Skim.xcodeproj/project.pbxproj 2007-08-18 16:42:03 UTC (rev 2680)
+++ trunk/Skim.xcodeproj/project.pbxproj 2007-08-18 17:05:16 UTC (rev 2681)
@@ -1339,7 +1339,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "TARGET=\"${DERIVED_FILE_DIR}/Skim Help\"\n\nINPUT=\"Skim Help/skim.texi\"\nTOOLS=\"Skim Help\"\nDEST=\"Skim Help\"\nPREFIX=\"Skim Help\";\n\ncd \"${SOURCE_ROOT}\"\n\n[ -d \"${TARGET}\" ] || /bin/mkdir -p \"${TARGET}\";\n\nfor LOC_DIR in *.lproj; do \\\n\tLOC_TARGET=\"${TARGET}/${LOC_DIR}/${DEST}\"; \\\n\t[ -d \"${LOC_TARGET}\" ] && /bin/rm -rf \"${LOC_TARGET}\"/* || /bin/mkdir -p \"${LOC_TARGET}\"; \\\n\techo \"*** Creating help files in ${LOC_TARGET} ***\"; \\\n\t\"${TOOLS}/texi2html\" \"${LOC_DIR}/${INPUT}\" --init-file=\"${TOOLS}/applehelp.init\" --prefix=\"${PREFIX}\" --output=\"${LOC_TARGET}\" --split=node --nonumber && \\\n\tpython \"${TOOLS}/postprocess-nontitle.py\" \"${LOC_TARGET}/${PREFIX}_\"*.html; \\\ndone;\n";
+ shellScript = "HELP_NAME=\"Skim Help\"\n\nINPUT=\"${HELP_NAME}/skim.texi\"\nTOOLS=\"${HELP_NAME}\"\nDEST=\"${HELP_NAME}\"\nPREFIX=\"${HELP_NAME}\";\n\nTARGET=\"${DERIVED_FILE_DIR}/${HELP_NAME}\"\n\ncd \"${SOURCE_ROOT}\"\n\n[ -d \"${TARGET}\" ] || /bin/mkdir -p \"${TARGET}\";\n\nfor LOC_DIR in *.lproj; do \\\n\tLOC_TARGET=\"${TARGET}/${LOC_DIR}/${DEST}\"; \\\n\t[ -d \"${LOC_TARGET}\" ] && /bin/rm -rf \"${LOC_TARGET}\"/* || /bin/mkdir -p \"${LOC_TARGET}\"; \\\n\techo \"*** Creating help files in ${LOC_TARGET} ***\"; \\\n\t\"${TOOLS}/texi2html\" \"${LOC_DIR}/${INPUT}\" --init-file=\"${TOOLS}/applehelp.init\" --prefix=\"${PREFIX}\" --output=\"${LOC_TARGET}\" --split=node --nonumber && \\\n\tpython \"${TOOLS}/postprocess-nontitle.py\" \"${LOC_TARGET}/${PREFIX}_\"*.html; \\\ndone;\n";
};
CEF82CAD0C772A4200A3AD51 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@@ -1360,7 +1360,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "TARGET=\"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\";\nDEST=\"Skim Help\";\n\ncd \"${DERIVED_FILE_DIR}/Skim Help\";\n\nfor LOC_DIR in *.lproj; do \\\n\techo \"*** Copying help files from ${LOC_DIR}/${DEST} to ${LOC_TARGET} ***\"; \\\n\tLOC_TARGET=\"${TARGET}/${LOC_DIR}/${DEST}\"; \\\n\t/bin/rm -rf \"${LOC_TARGET}/\"*.html; \\\n\t/bin/cp -Rf \"${LOC_DIR}/${DEST}/\"*.html \"${LOC_TARGET}\"; \\\ndone;\n";
+ shellScript = "HELP_NAME=\"Skim Help\"\n\nSOURCE=\"${DERIVED_FILE_DIR}/${HELP_NAME}\";\nTARGET=\"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\";\nDEST=\"${HELP_NAME}\";\n\ncd \"${SOURCE}\";\n\nfor LOC_DIR in *.lproj; do \\\n\tLOC_TARGET=\"${TARGET}/${LOC_DIR}/${DEST}\"; \\\n\techo \"*** Copying help files from ${SOURCE}/${LOC_DIR}/${DEST} to ${LOC_TARGET} ***\"; \\\n\t/bin/rm -rf \"${LOC_TARGET}/\"*.html; \\\n\t/bin/cp -Rf \"${LOC_DIR}/${DEST}/\"*.html \"${LOC_TARGET}\"; \\\ndone;\n";
};
/* End PBXShellScriptBuildPhase section */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-18 16:42:05
|
Revision: 2680
http://skim-app.svn.sourceforge.net/skim-app/?rev=2680&view=rev
Author: hofman
Date: 2007-08-18 09:42:03 -0700 (Sat, 18 Aug 2007)
Log Message:
-----------
Write some comments when creating help.
Modified Paths:
--------------
trunk/Skim.xcodeproj/project.pbxproj
Modified: trunk/Skim.xcodeproj/project.pbxproj
===================================================================
--- trunk/Skim.xcodeproj/project.pbxproj 2007-08-18 13:49:47 UTC (rev 2679)
+++ trunk/Skim.xcodeproj/project.pbxproj 2007-08-18 16:42:03 UTC (rev 2680)
@@ -150,7 +150,6 @@
CEAA55F10C6DE5AE006BD633 /* DownloadsWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = CEAA55EF0C6DE5AE006BD633 /* DownloadsWindow.nib */; };
CEAA56D40C6DEE83006BD633 /* Cancel.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CEAA56D20C6DEE83006BD633 /* Cancel.tiff */; };
CEAA56D50C6DEE83006BD633 /* Delete.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CEAA56D30C6DEE83006BD633 /* Delete.tiff */; };
- CEAA67250C70A882006BD633 /* NSURL_SKExtensions.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CEAA67230C70A882006BD633 /* NSURL_SKExtensions.h */; };
CEAA67260C70A882006BD633 /* NSURL_SKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CEAA67240C70A882006BD633 /* NSURL_SKExtensions.m */; };
CEAA68EB0C71242F006BD633 /* Resume.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CEAA68EA0C71242F006BD633 /* Resume.tiff */; };
CEAF079D0C4139EB00C3ECBB /* SKStatusBar.m in Sources */ = {isa = PBXBuildFile; fileRef = CEAF079B0C4139EB00C3ECBB /* SKStatusBar.m */; };
@@ -254,7 +253,6 @@
dstSubfolderSpec = 10;
files = (
CE2BD8450BD4135600A5F4DB /* Sparkle.framework in CopyFiles */,
- CEAA67250C70A882006BD633 /* NSURL_SKExtensions.h in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1341,7 +1339,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "TARGET=\"${DERIVED_FILE_DIR}/Skim Help\"\n\nINPUT=\"Skim Help/skim.texi\"\nTOOLS=\"Skim Help\"\nDEST=\"Skim Help\"\nPREFIX=\"Skim Help\";\n\ncd \"${SOURCE_ROOT}\"\n\n[ -d \"${TARGET}\" ] || /bin/mkdir -p \"${TARGET}\";\n\nfor LOC_DIR in *.lproj; do \\\n\tLOC_TARGET=\"${TARGET}/${LOC_DIR}/${DEST}\"; \\\n\t[ -d \"${LOC_TARGET}\" ] && /bin/rm -rf \"${LOC_TARGET}\"/* || /bin/mkdir -p \"${LOC_TARGET}\"; \\\n\t\"${TOOLS}/texi2html\" \"${LOC_DIR}/${INPUT}\" --init-file=\"${TOOLS}/applehelp.init\" --prefix=\"${PREFIX}\" --output=\"${LOC_TARGET}\" --split=node --nonumber && \\\n\tpython \"${TOOLS}/postprocess-nontitle.py\" \"${LOC_TARGET}/${PREFIX}_\"*.html; \\\ndone;\n";
+ shellScript = "TARGET=\"${DERIVED_FILE_DIR}/Skim Help\"\n\nINPUT=\"Skim Help/skim.texi\"\nTOOLS=\"Skim Help\"\nDEST=\"Skim Help\"\nPREFIX=\"Skim Help\";\n\ncd \"${SOURCE_ROOT}\"\n\n[ -d \"${TARGET}\" ] || /bin/mkdir -p \"${TARGET}\";\n\nfor LOC_DIR in *.lproj; do \\\n\tLOC_TARGET=\"${TARGET}/${LOC_DIR}/${DEST}\"; \\\n\t[ -d \"${LOC_TARGET}\" ] && /bin/rm -rf \"${LOC_TARGET}\"/* || /bin/mkdir -p \"${LOC_TARGET}\"; \\\n\techo \"*** Creating help files in ${LOC_TARGET} ***\"; \\\n\t\"${TOOLS}/texi2html\" \"${LOC_DIR}/${INPUT}\" --init-file=\"${TOOLS}/applehelp.init\" --prefix=\"${PREFIX}\" --output=\"${LOC_TARGET}\" --split=node --nonumber && \\\n\tpython \"${TOOLS}/postprocess-nontitle.py\" \"${LOC_TARGET}/${PREFIX}_\"*.html; \\\ndone;\n";
};
CEF82CAD0C772A4200A3AD51 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@@ -1362,7 +1360,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "TARGET=\"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\";\nDEST=\"Skim Help\";\n\ncd \"${DERIVED_FILE_DIR}/Skim Help\";\n\nfor LOC_DIR in *.lproj; do \\\n\tLOC_TARGET=\"${TARGET}/${LOC_DIR}/${DEST}\"; \\\n\t/bin/rm -rf \"${LOC_TARGET}/\"*.html; \\\n\t/bin/cp -Rf \"${LOC_DIR}/${DEST}/\"*.html \"${LOC_TARGET}\"; \\\ndone;\n";
+ shellScript = "TARGET=\"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\";\nDEST=\"Skim Help\";\n\ncd \"${DERIVED_FILE_DIR}/Skim Help\";\n\nfor LOC_DIR in *.lproj; do \\\n\techo \"*** Copying help files from ${LOC_DIR}/${DEST} to ${LOC_TARGET} ***\"; \\\n\tLOC_TARGET=\"${TARGET}/${LOC_DIR}/${DEST}\"; \\\n\t/bin/rm -rf \"${LOC_TARGET}/\"*.html; \\\n\t/bin/cp -Rf \"${LOC_DIR}/${DEST}/\"*.html \"${LOC_TARGET}\"; \\\ndone;\n";
};
/* End PBXShellScriptBuildPhase section */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-18 13:49:55
|
Revision: 2679
http://skim-app.svn.sourceforge.net/skim-app/?rev=2679&view=rev
Author: hofman
Date: 2007-08-18 06:49:47 -0700 (Sat, 18 Aug 2007)
Log Message:
-----------
Build the help files in DERIVED_FILE_DIR rather than the source directory, so it won't interfere with SVN. This is now done in a build phase of the main target rather than a separate target, because the DERIVED_FILE_DIR depends on the target.
Modified Paths:
--------------
trunk/Skim.xcodeproj/project.pbxproj
Modified: trunk/Skim.xcodeproj/project.pbxproj
===================================================================
--- trunk/Skim.xcodeproj/project.pbxproj 2007-08-17 23:26:25 UTC (rev 2678)
+++ trunk/Skim.xcodeproj/project.pbxproj 2007-08-18 13:49:47 UTC (rev 2679)
@@ -7,17 +7,6 @@
objects = {
/* Begin PBXAggregateTarget section */
- CE4DA8D60B9E16100039E89C /* Skim Help */ = {
- isa = PBXAggregateTarget;
- buildConfigurationList = CE4DA8D90B9E16370039E89C /* Build configuration list for PBXAggregateTarget "Skim Help" */;
- buildPhases = (
- CE4DA8D70B9E16190039E89C /* ShellScript */,
- );
- dependencies = (
- );
- name = "Skim Help";
- productName = "Skim Help";
- };
CE592C5D0B9239C500C113DF /* DiskImage */ = {
isa = PBXAggregateTarget;
buildConfigurationList = CE592C5E0B9239C600C113DF /* Build configuration list for PBXAggregateTarget "DiskImage" */;
@@ -206,13 +195,6 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
- CE157D880B9F89CE00D5B03F /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 2A37F4A9FDCFA73011CA2CEA /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = CE4DA8D60B9E16100039E89C;
- remoteInfo = "Skim Help";
- };
CE1E39870BDBCC930011D9DD /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 2A37F4A9FDCFA73011CA2CEA /* Project object */;
@@ -1087,6 +1069,8 @@
buildPhases = (
CEE1383C0BCEA63F00BF2D3E /* ShellScript */,
8D15AC2B0486D014006FF6A4 /* Resources */,
+ CEF82CA50C77286200A3AD51 /* ShellScript */,
+ CEF82CAD0C772A4200A3AD51 /* ShellScript */,
8D15AC300486D014006FF6A4 /* Sources */,
8D15AC330486D014006FF6A4 /* Frameworks */,
CEE112760BCBF52500BF2D3E /* CopyFiles */,
@@ -1099,7 +1083,6 @@
buildRules = (
);
dependencies = (
- CE157D890B9F89CE00D5B03F /* PBXTargetDependency */,
CE2BD8610BD4144000A5F4DB /* PBXTargetDependency */,
CE1E39880BDBCC930011D9DD /* PBXTargetDependency */,
CEFD68710C01D3E50027B933 /* PBXTargetDependency */,
@@ -1156,7 +1139,6 @@
projectRoot = "";
targets = (
8D15AC270486D014006FF6A4 /* Skim */,
- CE4DA8D60B9E16100039E89C /* Skim Help */,
CE592C5D0B9239C500C113DF /* DiskImage */,
CEF3BF740B99CA2900E12E3D /* skimnotes */,
);
@@ -1280,33 +1262,35 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ ${BUILD_STYLE} = \"Debug\" ]; then\nexit 0\nfi\n\necho \"*** stripping header files from frameworks ***\"\nfind \"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}\" -type file -name \"*.h\" -delete\n\n#echo \"*** stripping IB files from NIBs ***\"\n#find \"${BUILT_PRODUCTS_DIR}\" -type file \\( -name \"classes.nib\" -or -name \"info.nib\" -or -name \"data.dependency\" \\) -delete\n\nexit 0";
+ shellScript = "if [ ${BUILD_STYLE} = \"Debug\" ]; then\nexit 0\nfi\n\necho \"*** stripping header files from frameworks ***\"\nfind \"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}\" -type file -name \"*.h\" -delete\n\n#echo \"*** stripping IB files from NIBs ***\"\n#find \"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\" -type file \\( -name \"classes.nib\" -or -name \"info.nib\" -or -name \"data.dependency\" \\) -delete\n\necho \"*** removing .DS_Store files ***\"\nfind \"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\" -type file -name \".DS_Store\" -delete\n\nexit 0";
};
- CE4DA8D70B9E16190039E89C /* ShellScript */ = {
+ CE4DA9060B9E17890039E89C /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
+ buildActionMask = 12;
+ files = (
+ );
+ inputPaths = (
+ );
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "if [ ${BUILD_STYLE} = \"Debug\" ]; then\nexit 0\nfi\nif [ -d \"${SYSTEM_DEVELOPER_UTILITIES_DIR}/Help Indexer.app/\" ]; then\necho \"*** Indexing Tiger Help ***\"\ncd \"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\"\nfor LOC_DIR in *.lproj; do \\\nif [ \"${LOC_DIR}\" = \"French.lproj\" ]; then LANG=\"fr\"; \\\nelif [ \"${LOC_DIR}\" = \"German.lproj\" ]; then LANG=\"de\"; \\\nelif [ \"${LOC_DIR}\" = \"Hungarian.lproj\" ]; then LANG=\"hu\"; \\\nelif [ \"${LOC_DIR}\" = \"Italian.lproj\" ]; then LANG=\"it\"; \\\nelif [ \"${LOC_DIR}\" = \"Spanish.lproj\" ]; then LANG=\"es\"; \\\nelif [ \"${LOC_DIR}\" = \"Swedish.lproj\" ]; then LANG=\"sv\"; \\\nelse LANG=\"en\"; \\\nfi; \\\n\"${SYSTEM_DEVELOPER_UTILITIES_DIR}/Help Indexer.app/Contents/MacOS/Help Indexer\" \\\n\"${LOC_DIR}/Skim Help\" \\\n-Tokenizer 1 \\\n-ShowProgress NO \\\n-LogStyle 2 \\\n-IndexAnchors YES \\\n-TigerIndexing YES \\\n-GenerateSummaries YES \\\n-Stopwords \"${LANG}\" \\\n-MinTermLength 3;\\\ndone\nfi\nexit 0";
+ };
+ CE592C630B9239E300C113DF /* ShellScript */ = {
+ isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
- "$(SRCROOT)/Skim Help/applehelp.init",
- "$(SRCROOT)/Skim Help/postprocess-nontitle.py",
- "$(SRCROOT)/English.lproj/Skim Help/skim.texi",
- "$(SRCROOT)/English.lproj/Skim Help/version.texi",
- "$(SRCROOT)/Dutch.lproj/Skim Help/skim.texi",
- "$(SRCROOT)/Dutch.lproj/Skim Help/version.texi",
- "$(SRCROOT)/Italian.lproj/Skim Help/skim.texi",
- "$(SRCROOT)/Italian.lproj/Skim Help/version.texi",
- "$(SRCROOT)/French.lproj/Skim Help/skim.texi",
- "$(SRCROOT)/French.lproj/Skim Help/version.texi",
);
outputPaths = (
- "$(SRCROOT)/English.lproj/Skim Help/Skim Help.html",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "cd ${SOURCE_ROOT}/Skim\\ Help;\ntexi2html=./texi2html\n\nINPUT='Skim Help/skim.texi'\nDEST='Skim Help'\n\nfor LOC_DIR in ${SOURCE_ROOT}/*.lproj; do \\\n\t/bin/rm -f \"${LOC_DIR}/${DEST}\"/Skim\\ Help*.html; \\\n\t${texi2html} \"${LOC_DIR}/${INPUT}\" --init-file=applehelp.init --prefix=\"Skim Help\" --output=\"${LOC_DIR}/${DEST}\" --split=node --nonumber && \\\n\tpython postprocess-nontitle.py \"${LOC_DIR}/${DEST}\"/Skim\\ Help_*.html;\\\ndone;\n";
+ shellScript = "rm -f /tmp/Skim.dmg\nunzip ${SOURCE_ROOT}/Skim.dmg.zip\n/bin/cp ${SOURCE_ROOT}/Skim.dmg /tmp\n/usr/bin/hdiutil attach /tmp/Skim.dmg\n${SYSTEM_DEVELOPER_TOOLS}/CpMac -r ${BUILT_PRODUCTS_DIR}/Skim.app /Volumes/Skim\nosascript -e \"tell application \\\"Finder\\\" to set the position of application file \\\"Skim.app\\\" of disk named \\\"Skim\\\" to {90, 206}\" && \\\nsleep 7; \\\n/usr/sbin/diskutil eject /Volumes/Skim\n/usr/bin/hdiutil resize -size `/usr/bin/hdiutil resize /tmp/Skim.dmg | cut -f -1 -d \" \" -`b /tmp/Skim.dmg\n/usr/bin/hdiutil convert /tmp/Skim.dmg -format UDZO -imagekey zlib-level=9 -o $HOME/Desktop/Skim.dmg\n/usr/bin/hdiutil internet-enable -YES $HOME/Desktop/Skim.dmg\nexit 0";
};
- CE4DA9060B9E17890039E89C /* ShellScript */ = {
+ CEE1383C0BCEA63F00BF2D3E /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 12;
files = (
@@ -1317,9 +1301,9 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ ${BUILD_STYLE} = \"Debug\" ]; then\nexit 0\nfi\nif [ -d \"${SYSTEM_DEVELOPER_UTILITIES_DIR}/Help Indexer.app/\" ]; then\necho \"*** Indexing Tiger Help ***\"\ncd \"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\"\nfor LOC_DIR in *.lproj; do \\\nif [ \"${LOC_DIR}\" = \"French.lproj\" ]; then LANG=\"fr\"; \\\nelif [ \"${LOC_DIR}\" = \"German.lproj\" ]; then LANG=\"de\"; \\\nelif [ \"${LOC_DIR}\" = \"Hungarian.lproj\" ]; then LANG=\"hu\"; \\\nelif [ \"${LOC_DIR}\" = \"Italian.lproj\" ]; then LANG=\"it\"; \\\nelif [ \"${LOC_DIR}\" = \"Spanish.lproj\" ]; then LANG=\"es\"; \\\nelif [ \"${LOC_DIR}\" = \"Swedish.lproj\" ]; then LANG=\"sv\"; \\\nelse LANG=\"en\"; \\\nfi; \\\n\"${SYSTEM_DEVELOPER_UTILITIES_DIR}/Help Indexer.app/Contents/MacOS/Help Indexer\" \\\n\"${LOC_DIR}/Skim Help\" \\\n-Tokenizer 1 \\\n-ShowProgress NO \\\n-LogStyle 2 \\\n-IndexAnchors YES \\\n-TigerIndexing YES \\\n-GenerateSummaries YES \\\n-Stopwords \"${LANG}\" \\\n-MinTermLength 3;\\\ndone\nfi\nexit 0";
+ shellScript = "#\n# Run the genstrings build phase\n# This takes a while to generate, so it's not worth\n# the wait for development builds.\n#\nif [ ${BUILD_STYLE} = \"Debug\" ]; then\n# Check to see if a previous version exists and create it\n# if not, or else pbxcp will complain.\nif [ -f \"English.lproj/Localizable.strings\" ]; then\nexit 0\nfi\n#\n# Run the genstrings build phase\n#\nfi\ncd ${SOURCE_ROOT}\nif [ -f \"English.lproj/Localizable.strings\" ]; then\nmv English.lproj/Localizable.strings English.lproj/Localizable.strings.bak \nfi\n/usr/bin/genstrings -o ${SOURCE_ROOT}/English.lproj -skipTable Sparkle `/usr/bin/find . -type file -name \"*.[mh]\"`";
};
- CE592C630B9239E300C113DF /* ShellScript */ = {
+ CEE22EA50BFB8691002B746B /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
@@ -1330,33 +1314,55 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "rm -f /tmp/Skim.dmg\nunzip ${SOURCE_ROOT}/Skim.dmg.zip\n/bin/cp ${SOURCE_ROOT}/Skim.dmg /tmp\n/usr/bin/hdiutil attach /tmp/Skim.dmg\n${SYSTEM_DEVELOPER_TOOLS}/CpMac -r ${BUILT_PRODUCTS_DIR}/Skim.app /Volumes/Skim\nosascript -e \"tell application \\\"Finder\\\" to set the position of application file \\\"Skim.app\\\" of disk named \\\"Skim\\\" to {90, 206}\" && \\\nsleep 7; \\\n/usr/sbin/diskutil eject /Volumes/Skim\n/usr/bin/hdiutil resize -size `/usr/bin/hdiutil resize /tmp/Skim.dmg | cut -f -1 -d \" \" -`b /tmp/Skim.dmg\n/usr/bin/hdiutil convert /tmp/Skim.dmg -format UDZO -imagekey zlib-level=9 -o $HOME/Desktop/Skim.dmg\n/usr/bin/hdiutil internet-enable -YES $HOME/Desktop/Skim.dmg\nexit 0";
+ shellScript = "cd \"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\"\nln -fs ../SharedSupport/displayline displayline\nln -fs ../SharedSupport/displayline forward-search.sh\nexit 0";
};
- CEE1383C0BCEA63F00BF2D3E /* ShellScript */ = {
+ CEF82CA50C77286200A3AD51 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
- buildActionMask = 12;
+ buildActionMask = 2147483647;
files = (
);
inputPaths = (
+ "$(SRCROOT)/Skim Help/applehelp.init",
+ "$(SRCROOT)/Skim Help/postprocess-nontitle.py",
+ "$(SRCROOT)/English.lproj/Skim Help/skim.texi",
+ "$(SRCROOT)/English.lproj/Skim Help/version.texi",
+ "$(SRCROOT)/Dutch.lproj/Skim Help/skim.texi",
+ "$(SRCROOT)/Dutch.lproj/Skim Help/version.texi",
+ "$(SRCROOT)/Italian.lproj/Skim Help/skim.texi",
+ "$(SRCROOT)/Italian.lproj/Skim Help/version.texi",
+ "$(SRCROOT)/French.lproj/Skim Help/skim.texi",
+ "$(SRCROOT)/French.lproj/Skim Help/version.texi",
);
outputPaths = (
+ "$(DERIVED_FILE_DIR)/Skim Help/English.lproj/Skim Help/Skim Help.html",
+ "$(DERIVED_FILE_DIR)/Skim Help/Dutch.lproj/Skim Help/Skim Help.html",
+ "$(DERIVED_FILE_DIR)/Skim Help/Italian.lproj/Skim Help/Skim Help.html",
+ "$(DERIVED_FILE_DIR)/Skim Help/French.lproj/Skim Help/Skim Help.html",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "#\n# Run the genstrings build phase\n# This takes a while to generate, so it's not worth\n# the wait for development builds.\n#\nif [ ${BUILD_STYLE} = \"Debug\" ]; then\n# Check to see if a previous version exists and create it\n# if not, or else pbxcp will complain.\nif [ -f \"English.lproj/Localizable.strings\" ]; then\nexit 0\nfi\n#\n# Run the genstrings build phase\n#\nfi\ncd ${SOURCE_ROOT}\nif [ -f \"English.lproj/Localizable.strings\" ]; then\nmv English.lproj/Localizable.strings English.lproj/Localizable.strings.bak \nfi\n/usr/bin/genstrings -o ${SOURCE_ROOT}/English.lproj -skipTable Sparkle `/usr/bin/find . -type file -name \"*.[mh]\"`";
+ shellScript = "TARGET=\"${DERIVED_FILE_DIR}/Skim Help\"\n\nINPUT=\"Skim Help/skim.texi\"\nTOOLS=\"Skim Help\"\nDEST=\"Skim Help\"\nPREFIX=\"Skim Help\";\n\ncd \"${SOURCE_ROOT}\"\n\n[ -d \"${TARGET}\" ] || /bin/mkdir -p \"${TARGET}\";\n\nfor LOC_DIR in *.lproj; do \\\n\tLOC_TARGET=\"${TARGET}/${LOC_DIR}/${DEST}\"; \\\n\t[ -d \"${LOC_TARGET}\" ] && /bin/rm -rf \"${LOC_TARGET}\"/* || /bin/mkdir -p \"${LOC_TARGET}\"; \\\n\t\"${TOOLS}/texi2html\" \"${LOC_DIR}/${INPUT}\" --init-file=\"${TOOLS}/applehelp.init\" --prefix=\"${PREFIX}\" --output=\"${LOC_TARGET}\" --split=node --nonumber && \\\n\tpython \"${TOOLS}/postprocess-nontitle.py\" \"${LOC_TARGET}/${PREFIX}_\"*.html; \\\ndone;\n";
};
- CEE22EA50BFB8691002B746B /* ShellScript */ = {
+ CEF82CAD0C772A4200A3AD51 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
+ "$(DERIVED_FILE_DIR)/Skim Help/English.lproj/Skim Help/Skim Help.html",
+ "$(DERIVED_FILE_DIR)/Skim Help/Dutch.lproj/Skim Help/Skim Help.html",
+ "$(DERIVED_FILE_DIR)/Skim Help/Italian.lproj/Skim Help/Skim Help.html",
+ "$(DERIVED_FILE_DIR)/Skim Help/French.lproj/Skim Help/Skim Help.html",
);
outputPaths = (
+ "$(BUILT_PRODUCTS_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/English.lproj/Skim Help/Skim Help.html",
+ "$(BUILT_PRODUCTS_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Dutch.lproj/Skim Help/Skim Help.html",
+ "$(BUILT_PRODUCTS_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Italian.lproj/Skim Help/Skim Help.html",
+ "$(BUILT_PRODUCTS_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/French.lproj/Skim Help/Skim Help.html",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "cd \"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\"\nln -fs ../SharedSupport/displayline displayline\nln -fs ../SharedSupport/displayline forward-search.sh\nexit 0";
+ shellScript = "TARGET=\"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\";\nDEST=\"Skim Help\";\n\ncd \"${DERIVED_FILE_DIR}/Skim Help\";\n\nfor LOC_DIR in *.lproj; do \\\n\tLOC_TARGET=\"${TARGET}/${LOC_DIR}/${DEST}\"; \\\n\t/bin/rm -rf \"${LOC_TARGET}/\"*.html; \\\n\t/bin/cp -Rf \"${LOC_DIR}/${DEST}/\"*.html \"${LOC_TARGET}\"; \\\ndone;\n";
};
/* End PBXShellScriptBuildPhase section */
@@ -1461,11 +1467,6 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
- CE157D890B9F89CE00D5B03F /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = CE4DA8D60B9E16100039E89C /* Skim Help */;
- targetProxy = CE157D880B9F89CE00D5B03F /* PBXContainerItemProxy */;
- };
CE1E39880BDBCC930011D9DD /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = CEF3BF740B99CA2900E12E3D /* skimnotes */;
@@ -1817,28 +1818,6 @@
};
name = Release;
};
- CE4DA8DA0B9E16370039E89C /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- COPY_PHASE_STRIP = NO;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
- GCC_OPTIMIZATION_LEVEL = 0;
- PRODUCT_NAME = "Skim Help";
- };
- name = Debug;
- };
- CE4DA8DB0B9E16370039E89C /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- COPY_PHASE_STRIP = YES;
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
- GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
- PRODUCT_NAME = "Skim Help";
- ZERO_LINK = NO;
- };
- name = Release;
- };
CE592C5F0B9239C600C113DF /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -1952,15 +1931,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- CE4DA8D90B9E16370039E89C /* Build configuration list for PBXAggregateTarget "Skim Help" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- CE4DA8DA0B9E16370039E89C /* Debug */,
- CE4DA8DB0B9E16370039E89C /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
CE592C5E0B9239C600C113DF /* Build configuration list for PBXAggregateTarget "DiskImage" */ = {
isa = XCConfigurationList;
buildConfigurations = (
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-17 23:26:27
|
Revision: 2678
http://skim-app.svn.sourceforge.net/skim-app/?rev=2678&view=rev
Author: hofman
Date: 2007-08-17 16:26:25 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
Explicitly pass the screen for sidewindows and navigation windows, rather than getting it from the current window. The screen may not be set yet, as it is changed asynchronously when the window is displayed, not when the window frame is set.
Modified Paths:
--------------
trunk/SKMainWindowController.m
trunk/SKPDFView.h
trunk/SKPDFView.m
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-08-17 18:41:25 UTC (rev 2677)
+++ trunk/SKMainWindowController.m 2007-08-17 23:26:25 UTC (rev 2678)
@@ -133,11 +133,11 @@
- (void)setupToolbar;
-- (void)showLeftSideWindow;
-- (void)showRightSideWindow;
+- (void)showLeftSideWindowOnScreen:(NSScreen *)screen;
+- (void)showRightSideWindowOnScreen:(NSScreen *)screen;
- (void)hideLeftSideWindow;
- (void)hideRightSideWindow;
-- (void)showSideWindows;
+- (void)showSideWindowsOnScreen:(NSScreen *)screen;
- (void)hideSideWindows;
- (void)goFullScreen;
- (void)removeFullScreen;
@@ -1777,7 +1777,7 @@
if ([leftSideWindow isVisible])
[self hideLeftSideWindow];
else
- [self showLeftSideWindow];
+ [self showLeftSideWindowOnScreen:[[self window] screen]];
} else {
NSRect sideFrame = [leftSideContentBox frame];
NSRect pdfFrame = [pdfContentBox frame];
@@ -1862,10 +1862,7 @@
#pragma mark Full Screen support
-- (void)showLeftSideWindow {
- NSScreen *screen = [[self window] screen];
- if (screen == nil)
- screen = [NSScreen mainScreen];
+- (void)showLeftSideWindowOnScreen:(NSScreen *)screen {
if (leftSideWindow == nil)
leftSideWindow = [[SKSideWindow alloc] initWithMainController:self edge:NSMinXEdge];
@@ -1893,10 +1890,7 @@
}
}
-- (void)showRightSideWindow {
- NSScreen *screen = [[self window] screen]; // @@ or should we use the main screen?
- if (screen == nil)
- screen = [NSScreen mainScreen];
+- (void)showRightSideWindowOnScreen:(NSScreen *)screen {
if (rightSideWindow == nil)
rightSideWindow = [[SKSideWindow alloc] initWithMainController:self edge:NSMaxXEdge];
@@ -1962,9 +1956,9 @@
}
}
-- (void)showSideWindows {
- [self showLeftSideWindow];
- [self showRightSideWindow];
+- (void)showSideWindowsOnScreen:(NSScreen *)screen {
+ [self showLeftSideWindowOnScreen:screen];
+ [self showRightSideWindowOnScreen:screen];
[pdfView setFrame:NSInsetRect([[pdfView superview] bounds], 9.0, 0.0)];
[[pdfView superview] setNeedsDisplay:YES];
@@ -2176,8 +2170,8 @@
if ([fullScreenSetup count])
[self applyPDFSettings:fullScreenSetup];
- [pdfView setHasNavigation:YES activateAtBottom:[[NSUserDefaults standardUserDefaults] boolForKey:SKActivateFullScreenNavigationAtBottomKey] autohidesCursor:NO];
- [self showSideWindows];
+ [pdfView setHasNavigation:YES activateAtBottom:[[NSUserDefaults standardUserDefaults] boolForKey:SKActivateFullScreenNavigationAtBottomKey] autohidesCursor:NO screen:screen];
+ [self showSideWindowsOnScreen:screen];
}
- (IBAction)enterPresentation:(id)sender {
@@ -2199,7 +2193,7 @@
else
[self goFullScreen];
- [pdfView setHasNavigation:YES activateAtBottom:[[NSUserDefaults standardUserDefaults] boolForKey:SKActivatePresentationNavigationAtBottomKey] autohidesCursor:YES];
+ [pdfView setHasNavigation:YES activateAtBottom:[[NSUserDefaults standardUserDefaults] boolForKey:SKActivatePresentationNavigationAtBottomKey] autohidesCursor:YES screen:nil];
}
- (IBAction)exitFullScreen:(id)sender {
@@ -2211,7 +2205,7 @@
if ([[fullScreenWindow firstResponder] isDescendantOf:pdfView])
[fullScreenWindow makeFirstResponder:nil];
- [pdfView setHasNavigation:NO activateAtBottom:NO autohidesCursor:NO];
+ [pdfView setHasNavigation:NO activateAtBottom:NO autohidesCursor:NO screen:nil];
[pdfView setFrame:[[pdfContentBox contentView] bounds]];
[pdfContentBox addSubview:pdfView]; // this should be done before exitPresentationMode to get a smooth transition
Modified: trunk/SKPDFView.h
===================================================================
--- trunk/SKPDFView.h 2007-08-17 18:41:25 UTC (rev 2677)
+++ trunk/SKPDFView.h 2007-08-17 23:26:25 UTC (rev 2678)
@@ -170,7 +170,7 @@
- (void)takeSnapshot:(id)sender;
-- (void)setHasNavigation:(BOOL)hasNav activateAtBottom:(BOOL)atBottom autohidesCursor:(BOOL)hideCursor;
+- (void)setHasNavigation:(BOOL)hasNav activateAtBottom:(BOOL)atBottom autohidesCursor:(BOOL)hideCursor screen:(NSScreen *)screen;
- (void)setNeedsDisplayInRect:(NSRect)rect ofPage:(PDFPage *)page;
- (void)setNeedsDisplayForAnnotation:(PDFAnnotation *)annotation;
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2007-08-17 18:41:25 UTC (rev 2677)
+++ trunk/SKPDFView.m 2007-08-17 23:26:25 UTC (rev 2678)
@@ -2142,7 +2142,7 @@
[navWindow orderOut:self];
}
-- (void)setHasNavigation:(BOOL)hasNav activateAtBottom:(BOOL)atBottom autohidesCursor:(BOOL)hideCursor {
+- (void)setHasNavigation:(BOOL)hasNav activateAtBottom:(BOOL)atBottom autohidesCursor:(BOOL)hideCursor screen:(NSScreen *)screen {
hasNavigation = hasNav;
autohidesCursor = hideCursor;
activateNavigationAtBottom = atBottom;
@@ -2155,7 +2155,7 @@
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(handleWindowWillCloseNotification:)
name: NSWindowWillCloseNotification object: [self window]];
navWindow = [[SKNavigationWindow alloc] initWithPDFView:self];
- [navWindow moveToScreen:[[self window] screen]];
+ [navWindow moveToScreen:screen];
[navWindow setLevel:[[self window] level] + 1];
} else if ([navWindow isVisible]) {
[navWindow orderOut:self];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-17 18:49:51
|
Revision: 2677
http://skim-app.svn.sourceforge.net/skim-app/?rev=2677&view=rev
Author: hofman
Date: 2007-08-17 11:41:25 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
Wider page column in notes document.
Modified Paths:
--------------
trunk/Dutch.lproj/NotesDocument.nib/info.nib
trunk/Dutch.lproj/NotesDocument.nib/keyedobjects.nib
trunk/English.lproj/NotesDocument.nib/keyedobjects.nib
trunk/French.lproj/NotesDocument.nib/keyedobjects.nib
trunk/Italian.lproj/NotesDocument.nib/keyedobjects.nib
Modified: trunk/Dutch.lproj/NotesDocument.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/NotesDocument.nib/info.nib 2007-08-17 18:37:43 UTC (rev 2676)
+++ trunk/Dutch.lproj/NotesDocument.nib/info.nib 2007-08-17 18:41:25 UTC (rev 2677)
@@ -6,6 +6,10 @@
<string>69 58 356 240 0 0 1440 938 </string>
<key>IBFramework Version</key>
<string>446.1</string>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>5</integer>
+ </array>
<key>IBSystem Version</key>
<string>8R218</string>
</dict>
Modified: trunk/Dutch.lproj/NotesDocument.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/NotesDocument.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/French.lproj/NotesDocument.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/NotesDocument.nib/keyedobjects.nib
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-17 18:37:54
|
Revision: 2676
http://skim-app.svn.sourceforge.net/skim-app/?rev=2676&view=rev
Author: hofman
Date: 2007-08-17 11:37:43 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
Change resize knob for note table rows. Make default row height 2px higher to allow more space for the resize knob.
Modified Paths:
--------------
trunk/SKNoteOutlineView.m
trunk/SKNotesDocument.m
trunk/SKPDFAnnotationNote.m
Modified: trunk/SKNoteOutlineView.m
===================================================================
--- trunk/SKNoteOutlineView.m 2007-08-17 14:49:07 UTC (rev 2675)
+++ trunk/SKNoteOutlineView.m 2007-08-17 18:37:43 UTC (rev 2676)
@@ -169,17 +169,15 @@
continue;
BOOL isHighlighted = isFirstResponder && [self isRowSelected:row];
- NSColor *color = isHighlighted ? [NSColor whiteColor] : [NSColor grayColor];
+ NSColor *color = [NSColor colorWithCalibratedWhite:isHighlighted ? 1.0 : 0.5 alpha:0.7];
NSRect rect = [self rectOfRow:row];
- NSPoint startPoint = NSMakePoint(NSMaxX(rect) - 20.0, NSMaxY(rect) - 1.5);
- NSPoint endPoint = NSMakePoint(NSMaxX(rect), NSMaxY(rect) - 1.5);
+ float x = ceilf(NSMidX(rect));
+ float y = NSMaxY(rect) - 1.5;
[color set];
- [NSBezierPath strokeLineFromPoint:startPoint toPoint:endPoint];
- [[color colorWithAlphaComponent:0.5] set];
- startPoint.y -= 2.0;
- endPoint.y -= 2.0;
- [NSBezierPath strokeLineFromPoint:startPoint toPoint:endPoint];
+ [NSBezierPath strokeLineFromPoint:NSMakePoint(x - 1.0, y) toPoint:NSMakePoint(x + 1.0, y)];
+ y -= 2.0;
+ [NSBezierPath strokeLineFromPoint:NSMakePoint(x - 3.0, y) toPoint:NSMakePoint(x + 3.0, y)];
}
[NSGraphicsContext restoreGraphicsState];
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2007-08-17 14:49:07 UTC (rev 2675)
+++ trunk/SKNotesDocument.m 2007-08-17 18:37:43 UTC (rev 2676)
@@ -116,7 +116,7 @@
if ([[dict valueForKey:@"type"] isEqualToString:@"Note"])
[note setObject:[NSMutableDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithFloat:85.0], @"rowHeight", [dict valueForKey:@"text"], @"contents", nil] forKey:@"child"];
- [note setObject:[NSNumber numberWithFloat:17.0] forKey:@"rowHeight"];
+ [note setObject:[NSNumber numberWithFloat:19.0] forKey:@"rowHeight"];
[newNotes addObject:note];
[note release];
Modified: trunk/SKPDFAnnotationNote.m
===================================================================
--- trunk/SKPDFAnnotationNote.m 2007-08-17 14:49:07 UTC (rev 2675)
+++ trunk/SKPDFAnnotationNote.m 2007-08-17 18:37:43 UTC (rev 2676)
@@ -576,7 +576,7 @@
[[self border] setLineWidth:[[NSUserDefaults standardUserDefaults] floatForKey:SKCircleNoteLineWidthKey]];
[[self border] setDashPattern:[[NSUserDefaults standardUserDefaults] arrayForKey:SKCircleNoteDashPatternKey]];
[[self border] setStyle:[[NSUserDefaults standardUserDefaults] floatForKey:SKCircleNoteLineStyleKey]];
- rowHeight = 17.0;
+ rowHeight = 19.0;
}
return self;
}
@@ -650,7 +650,7 @@
[[self border] setLineWidth:[[NSUserDefaults standardUserDefaults] floatForKey:SKSquareNoteLineWidthKey]];
[[self border] setDashPattern:[[NSUserDefaults standardUserDefaults] arrayForKey:SKSquareNoteDashPatternKey]];
[[self border] setStyle:[[NSUserDefaults standardUserDefaults] floatForKey:SKSquareNoteLineStyleKey]];
- rowHeight = 17.0;
+ rowHeight = 19.0;
}
return self;
}
@@ -786,7 +786,7 @@
numberOfLines = 0;
lineRects = NULL;
- rowHeight = 17.0;
+ rowHeight = 19.0;
}
return self;
}
@@ -1036,7 +1036,7 @@
[border setStyle:[[NSUserDefaults standardUserDefaults] floatForKey:SKFreeTextNoteLineStyleKey]];
originalSetBorder(self, @selector(setBorder:), [border lineWidth] > 0.0 ? border : nil);
[border release];
- rowHeight = 17.0;
+ rowHeight = 19.0;
}
return self;
}
@@ -1141,7 +1141,7 @@
textStorage = [[NSTextStorage allocWithZone:[self zone]] init];
[textStorage setDelegate:self];
text = [[NSAttributedString alloc] init];
- rowHeight = 17.0;
+ rowHeight = 19.0;
}
return self;
}
@@ -1341,7 +1341,7 @@
[border setStyle:[[NSUserDefaults standardUserDefaults] floatForKey:SKLineNoteLineStyleKey]];
originalSetBorder(self, @selector(setBorder:), [border lineWidth] > 0.0 ? border : nil);
[border release];
- rowHeight = 17.0;
+ rowHeight = 19.0;
}
return self;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-17 14:49:12
|
Revision: 2675
http://skim-app.svn.sourceforge.net/skim-app/?rev=2675&view=rev
Author: hofman
Date: 2007-08-17 07:49:07 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
Implement dragging image from note window. Use cell interior as default drag image. Update keyboard focus ring when dragging into image view.
Modified Paths:
--------------
trunk/BDSKDragImageView.m
trunk/SKNoteWindowController.m
Modified: trunk/BDSKDragImageView.m
===================================================================
--- trunk/BDSKDragImageView.m 2007-08-17 10:18:26 UTC (rev 2674)
+++ trunk/BDSKDragImageView.m 2007-08-17 14:49:07 UTC (rev 2675)
@@ -71,6 +71,7 @@
dragOp = [delegate dragImageView:self validateDrop:sender];
if (dragOp != NSDragOperationNone) {
highlight = YES;
+ [self setKeyboardFocusRingNeedsDisplayInRect:[self bounds]];
[self setNeedsDisplay:YES];
}
return dragOp;
@@ -78,11 +79,13 @@
- (void)draggingExited:(id <NSDraggingInfo>)sender{
highlight = NO;
+ [self setKeyboardFocusRingNeedsDisplayInRect:[self bounds]];
[self setNeedsDisplay:YES];
}
- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender {
highlight = NO;
+ [self setKeyboardFocusRingNeedsDisplayInRect:[self bounds]];
[self setNeedsDisplay:YES];
if ([delegate respondsToSelector:@selector(dragImageView:acceptDrop:)])
return [delegate dragImageView:self acceptDrop:sender];
@@ -106,22 +109,33 @@
if ([delegate respondsToSelector:@selector(dragImageView:writeDataToPasteboard:)] &&
[delegate dragImageView:self writeDataToPasteboard:pboard]) {
- NSImage *image;
- NSImage *dragImage;
- NSSize imageSize;
- if ([delegate respondsToSelector:@selector(dragImageForDragImageView:)])
- image = [delegate dragImageForDragImageView:self];
- else
- image = [self image];
- imageSize = [image size];
-
- dragImage = [[NSImage alloc] initWithSize:imageSize];
- [dragImage lockFocus];
- [image compositeToPoint:NSZeroPoint operation:NSCompositeCopy fraction:0.7];
- [dragImage unlockFocus];
+ NSImage *dragImage = nil;
+ NSPoint dragPoint = mouseLoc;
+ if ([delegate respondsToSelector:@selector(dragImageForDragImageView:)]) {
+ dragImage = [delegate dragImageForDragImageView:self];
+ NSSize imageSize = [dragImage size];
+ dragPoint.x -= floorf(0.5 * imageSize.width);
+ dragPoint.y -= floorf(0.5 * imageSize.height);
+ }
+ if (dragImage == nil) {
+ NSRect rect = [self bounds];
+
+ dragPoint = rect.origin;
+ rect.origin = NSZeroPoint;
+
+ NSImage *image = [[NSImage alloc] initWithSize:rect.size];
- [self dragImage:dragImage at:NSMakePoint(mouseLoc.x - 0.5f * imageSize.width, mouseLoc.y - 0.5f * imageSize.height) offset:NSZeroSize event:theEvent pasteboard:pboard source:self slideBack:YES];
- [dragImage release];
+ [image lockFocus];
+ [[self cell] drawInteriorWithFrame:rect inView:self];
+ [image lockFocus];
+
+ dragImage = [[[NSImage alloc] initWithSize:rect.size] autorelease];
+ [dragImage lockFocus];
+ [image compositeToPoint:NSZeroPoint operation:NSCompositeCopy fraction:0.7];
+ [dragImage unlockFocus];
+ [image release];
+ }
+ [self dragImage:dragImage at:dragPoint offset:NSZeroSize event:theEvent pasteboard:pboard source:self slideBack:YES];
}
keepOn = NO;
break;
Modified: trunk/SKNoteWindowController.m
===================================================================
--- trunk/SKNoteWindowController.m 2007-08-17 10:18:26 UTC (rev 2674)
+++ trunk/SKNoteWindowController.m 2007-08-17 14:49:07 UTC (rev 2675)
@@ -189,6 +189,37 @@
} else return NO;
}
+- (BOOL)dragImageView:(BDSKDragImageView *)view writeDataToPasteboard:(NSPasteboard *)pasteboard {
+ NSImage *image = [self isNoteType] ? [(SKPDFAnnotationNote *)note image] : nil;
+ if (image) {
+ NSString *name = [note contents];
+ if ([name length] == 0)
+ name = @"NoteImage";
+ [pasteboard declareTypes:[NSArray arrayWithObjects:NSFilesPromisePboardType, NSTIFFPboardType, nil] owner:nil];
+ [pasteboard setPropertyList:[NSArray arrayWithObjects:[name stringByAppendingPathExtension:@"tiff"], nil] forType:NSFilesPromisePboardType];
+ [pasteboard setData:[image TIFFRepresentation] forType:NSTIFFPboardType];
+ return YES;
+ } else return NO;
+}
+
+- (NSArray *)dragImageView:(BDSKDragImageView *)view namesOfPromisedFilesDroppedAtDestination:(NSURL *)dropDestination {
+ NSImage *image = [self isNoteType] ? [(SKPDFAnnotationNote *)note image] : nil;
+ if (image) {
+ NSString *name = [note contents];
+ if ([name length] == 0)
+ name = @"NoteImage";
+ NSString *basePath = [[dropDestination path] stringByAppendingPathComponent:[note contents]];
+ NSString *path = [basePath stringByAppendingPathExtension:@"tiff"];
+ int i = 0;
+ NSFileManager *fm = [NSFileManager defaultManager];
+ while ([fm fileExistsAtPath:path])
+ path = [[basePath stringByAppendingFormat:@"-%i", ++i] stringByAppendingPathExtension:@"tiff"];
+ if ([[image TIFFRepresentation] writeToFile:path atomically:YES])
+ return [NSArray arrayWithObjects:[path lastPathComponent], nil];
+ }
+ return nil;
+}
+
@end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-17 10:18:27
|
Revision: 2674
http://skim-app.svn.sourceforge.net/skim-app/?rev=2674&view=rev
Author: hofman
Date: 2007-08-17 03:18:26 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
Use mainScreen for fullscreen windows if the passed in screen is nil.
Modified Paths:
--------------
trunk/SKFullScreenWindow.m
trunk/SKNavigationWindow.m
trunk/SKSideWindow.m
Modified: trunk/SKFullScreenWindow.m
===================================================================
--- trunk/SKFullScreenWindow.m 2007-08-16 19:55:35 UTC (rev 2673)
+++ trunk/SKFullScreenWindow.m 2007-08-17 10:18:26 UTC (rev 2674)
@@ -44,6 +44,8 @@
@implementation SKFullScreenWindow
- (id)initWithScreen:(NSScreen *)screen {
+ if (screen == nil)
+ screen = [NSScreen mainScreen];
if (self = [self initWithContentRect:[screen frame] styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO screen:screen]) {
[self setReleasedWhenClosed:NO];
[self setDisplaysWhenScreenProfileChanges:YES];
Modified: trunk/SKNavigationWindow.m
===================================================================
--- trunk/SKNavigationWindow.m 2007-08-16 19:55:35 UTC (rev 2673)
+++ trunk/SKNavigationWindow.m 2007-08-17 10:18:26 UTC (rev 2674)
@@ -53,6 +53,8 @@
- (id)initWithPDFView:(PDFView *)pdfView {
NSScreen *screen = [[pdfView window] screen];
+ if (screen == nil)
+ screen = [NSScreen mainScreen];
float width = 4 * BUTTON_WIDTH + 2 * SEP_WIDTH + 2 * MARGIN;
NSRect contentRect = NSMakeRect(NSMidX([screen frame]) - 0.5 * width, NSMinY([screen frame]) + OFFSET, width, BUTTON_WIDTH + 2 * MARGIN);
if (self = [super initWithContentRect:contentRect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO screen:screen]) {
Modified: trunk/SKSideWindow.m
===================================================================
--- trunk/SKSideWindow.m 2007-08-16 19:55:35 UTC (rev 2673)
+++ trunk/SKSideWindow.m 2007-08-17 10:18:26 UTC (rev 2674)
@@ -55,6 +55,8 @@
- (id)initWithMainController:(SKMainWindowController *)aController edge:(NSRectEdge)anEdge {
NSScreen *screen = [[aController window] screen];
+ if (screen == nil)
+ screen = [NSScreen mainScreen];
NSRect contentRect = [screen frame];
if (anEdge == NSMaxXEdge)
contentRect.origin.x = NSMaxX(contentRect) - DEFAULT_WINDOW_WIDTH;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-16 19:55:36
|
Revision: 2673
http://skim-app.svn.sourceforge.net/skim-app/?rev=2673&view=rev
Author: hofman
Date: 2007-08-16 12:55:35 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
Use 1px outset for the line rects to build the selection for a highlight, to avoid rounding errors.
Modified Paths:
--------------
trunk/SKPDFAnnotationNote.m
Modified: trunk/SKPDFAnnotationNote.m
===================================================================
--- trunk/SKPDFAnnotationNote.m 2007-08-16 19:44:24 UTC (rev 2672)
+++ trunk/SKPDFAnnotationNote.m 2007-08-16 19:55:35 UTC (rev 2673)
@@ -943,7 +943,8 @@
unsigned i;
for (i = 0; i < numberOfLines; i++) {
- if (sel = [[self page] selectionForRect:lineRects[i]]) {
+ // slightly outset the rect to avoid rounding errors, as selectionForRect is pretty strict
+ if (sel = [[self page] selectionForRect:NSInsetRect(lineRects[i], -1.0, -1.0)]) {
if (selection == nil)
selection = sel;
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-16 19:44:28
|
Revision: 2672
http://skim-app.svn.sourceforge.net/skim-app/?rev=2672&view=rev
Author: hofman
Date: 2007-08-16 12:44:24 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
Make sure side windows start off in the right state.
Modified Paths:
--------------
trunk/SKSideWindow.m
Modified: trunk/SKSideWindow.m
===================================================================
--- trunk/SKSideWindow.m 2007-08-16 17:35:12 UTC (rev 2671)
+++ trunk/SKSideWindow.m 2007-08-16 19:44:24 UTC (rev 2672)
@@ -89,6 +89,8 @@
frame.origin.x = NSMaxX(screenFrame) - WINDOW_OFFSET;
frame = NSInsetRect(frame, 0.0, WINDOW_INSET);
[self setFrame:frame display:NO];
+ state = NSDrawerClosedState;
+ [[self contentView] setAcceptsMouseOver:YES];
}
- (void)slideOut {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-16 17:35:13
|
Revision: 2671
http://skim-app.svn.sourceforge.net/skim-app/?rev=2671&view=rev
Author: hofman
Date: 2007-08-16 10:35:12 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
Add hidden default to close downloads window when all downloads have finished.
Modified Paths:
--------------
trunk/InitialUserDefaults.plist
trunk/SKDownloadController.m
trunk/SKStringConstants.h
trunk/SKStringConstants.m
Modified: trunk/InitialUserDefaults.plist
===================================================================
--- trunk/InitialUserDefaults.plist 2007-08-16 17:28:46 UTC (rev 2670)
+++ trunk/InitialUserDefaults.plist 2007-08-16 17:35:12 UTC (rev 2671)
@@ -228,6 +228,8 @@
<true/>
<key>SKAutoRemoveFinishedDownloads</key>
<true/>
+ <key>SKAutoCloseDownloadsWindow</key>
+ <false/>
<key>SUScheduledCheckInterval</key>
<integer>86400</integer>
</dict>
Modified: trunk/SKDownloadController.m
===================================================================
--- trunk/SKDownloadController.m 2007-08-16 17:28:46 UTC (rev 2670)
+++ trunk/SKDownloadController.m 2007-08-16 17:35:12 UTC (rev 2671)
@@ -190,6 +190,8 @@
[downloads removeObject:download];
// for the document to note that the file has been deleted
[document setFileURL:[NSURL fileURLWithPath:[download filePath]]];
+ if ([downloads count] == 0 && [[NSUserDefaults standardUserDefaults] boolForKey:SKAutoCloseDownloadsWindowKey])
+ [[self window] close];
}
}
Modified: trunk/SKStringConstants.h
===================================================================
--- trunk/SKStringConstants.h 2007-08-16 17:28:46 UTC (rev 2670)
+++ trunk/SKStringConstants.h 2007-08-16 17:35:12 UTC (rev 2671)
@@ -102,3 +102,4 @@
extern NSString *SKAutoHidePresentationContentsKey;
extern NSString *SKAutoOpenDownloadsWindowKey;
extern NSString *SKAutoRemoveFinishedDownloadsKey;
+extern NSString *SKAutoCloseDownloadsWindowKey;
Modified: trunk/SKStringConstants.m
===================================================================
--- trunk/SKStringConstants.m 2007-08-16 17:28:46 UTC (rev 2670)
+++ trunk/SKStringConstants.m 2007-08-16 17:35:12 UTC (rev 2671)
@@ -103,3 +103,4 @@
NSString *SKAutoHidePresentationContentsKey = @"SKAutoHidePresentationContents";
NSString *SKAutoOpenDownloadsWindowKey = @"SKAutoOpenDownloadsWindow";
NSString *SKAutoRemoveFinishedDownloadsKey = @"SKAutoRemoveFinishedDownloads";
+NSString *SKAutoCloseDownloadsWindowKey = @"SKAutoCloseDownloadsWindow";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-16 17:28:53
|
Revision: 2670
http://skim-app.svn.sourceforge.net/skim-app/?rev=2670&view=rev
Author: hofman
Date: 2007-08-16 10:28:46 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
Ue different window title format for single page documents.
Modified Paths:
--------------
trunk/Dutch.lproj/Localizable.strings
trunk/French.lproj/Localizable.strings
trunk/Italian.lproj/Localizable.strings
trunk/SKMainWindowController.m
Modified: trunk/Dutch.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/French.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-08-16 16:51:04 UTC (rev 2669)
+++ trunk/SKMainWindowController.m 2007-08-16 17:28:46 UTC (rev 2670)
@@ -539,9 +539,12 @@
}
- (NSString *)windowTitleForDocumentDisplayName:(NSString *)displayName {
- if ([pdfView document])
- return [NSString stringWithFormat:NSLocalizedString(@"%@ (%i pages)", @"Window title format"), displayName, [[pdfView document] pageCount]];
- else
+ if ([pdfView document]) {
+ if ([[pdfView document] pageCount] == 1)
+ return [NSString stringWithFormat:NSLocalizedString(@"%@ (1 page)", @"Window title format"), displayName];
+ else
+ return [NSString stringWithFormat:NSLocalizedString(@"%@ (%i pages)", @"Window title format"), displayName, [[pdfView document] pageCount]];
+ } else
return displayName;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-16 16:51:09
|
Revision: 2669
http://skim-app.svn.sourceforge.net/skim-app/?rev=2669&view=rev
Author: hofman
Date: 2007-08-16 09:51:04 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
Always move full screen related windows to the correct screen when showing them. Hopefully this fixes problems reported on the users list.
Modified Paths:
--------------
trunk/SKMainWindowController.m
trunk/SKSideWindow.m
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-08-16 13:36:14 UTC (rev 2668)
+++ trunk/SKMainWindowController.m 2007-08-16 16:51:04 UTC (rev 2669)
@@ -1863,12 +1863,11 @@
NSScreen *screen = [[self window] screen];
if (screen == nil)
screen = [NSScreen mainScreen];
- if (leftSideWindow == nil) {
+ if (leftSideWindow == nil)
leftSideWindow = [[SKSideWindow alloc] initWithMainController:self edge:NSMinXEdge];
- } else if (screen != [leftSideWindow screen]) {
- [leftSideWindow moveToScreen:screen];
- }
+ [leftSideWindow moveToScreen:screen];
+
if ([[mainWindow firstResponder] isDescendantOf:leftSideContentView])
[mainWindow makeFirstResponder:nil];
[leftSideWindow setMainView:leftSideContentView];
@@ -1895,12 +1894,11 @@
NSScreen *screen = [[self window] screen]; // @@ or should we use the main screen?
if (screen == nil)
screen = [NSScreen mainScreen];
- if (rightSideWindow == nil) {
+ if (rightSideWindow == nil)
rightSideWindow = [[SKSideWindow alloc] initWithMainController:self edge:NSMaxXEdge];
- } else if (screen != [rightSideWindow screen]) {
- [rightSideWindow moveToScreen:screen];
- }
+ [rightSideWindow moveToScreen:screen];
+
if ([[mainWindow firstResponder] isDescendantOf:rightSideContentView])
[mainWindow makeFirstResponder:nil];
[rightSideWindow setMainView:rightSideContentView];
@@ -1989,9 +1987,7 @@
}
// explicitly set window frame; screen may have moved, or may be nil (in which case [fullScreenWindow frame] is wrong, which is weird); the first time through this method, [fullScreenWindow screen] is nil
- if ([screen isEqual:[fullScreenWindow screen]] == NO) {
- [fullScreenWindow setFrame:[screen frame] display:NO];
- }
+ [fullScreenWindow setFrame:[screen frame] display:NO];
if ([[mainWindow firstResponder] isDescendantOf:pdfView])
[mainWindow makeFirstResponder:nil];
Modified: trunk/SKSideWindow.m
===================================================================
--- trunk/SKSideWindow.m 2007-08-16 13:36:14 UTC (rev 2668)
+++ trunk/SKSideWindow.m 2007-08-16 16:51:04 UTC (rev 2669)
@@ -73,7 +73,6 @@
[self setReleasedWhenClosed:NO];
[self setHidesOnDeactivate:YES];
[self setLevel:NSFloatingWindowLevel];
- [self moveToScreen:screen];
}
return self;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-16 13:36:20
|
Revision: 2668
http://skim-app.svn.sourceforge.net/skim-app/?rev=2668&view=rev
Author: hofman
Date: 2007-08-16 06:36:14 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
Align navigation window vertically with screen as well, as the bottom of the screen may not be at zero.
Modified Paths:
--------------
trunk/SKNavigationWindow.m
Modified: trunk/SKNavigationWindow.m
===================================================================
--- trunk/SKNavigationWindow.m 2007-08-16 11:22:28 UTC (rev 2667)
+++ trunk/SKNavigationWindow.m 2007-08-16 13:36:14 UTC (rev 2668)
@@ -54,7 +54,7 @@
- (id)initWithPDFView:(PDFView *)pdfView {
NSScreen *screen = [[pdfView window] screen];
float width = 4 * BUTTON_WIDTH + 2 * SEP_WIDTH + 2 * MARGIN;
- NSRect contentRect = NSMakeRect(NSMidX([screen frame]) - 0.5 * width, OFFSET, width, BUTTON_WIDTH + 2 * MARGIN);
+ NSRect contentRect = NSMakeRect(NSMidX([screen frame]) - 0.5 * width, NSMinY([screen frame]) + OFFSET, width, BUTTON_WIDTH + 2 * MARGIN);
if (self = [super initWithContentRect:contentRect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO screen:screen]) {
NSWindowController *controller = [[pdfView window] windowController];
@@ -130,6 +130,7 @@
- (void)moveToScreen:(NSScreen *)screen {
NSRect winFrame = [self frame];
winFrame.origin.x = NSMidX([screen frame]) - 0.5 * NSWidth(winFrame);
+ winFrame.origin.y = NSMinY([screen frame]) + OFFSET;
[self setFrame:winFrame display:NO];
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-16 11:23:16
|
Revision: 2667
http://skim-app.svn.sourceforge.net/skim-app/?rev=2667&view=rev
Author: hofman
Date: 2007-08-16 04:22:28 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
Unify style. Add gradient to downloads and bookmarks windows.
Modified Paths:
--------------
trunk/Dutch.lproj/BookmarksWindow.nib/classes.nib
trunk/Dutch.lproj/BookmarksWindow.nib/info.nib
trunk/Dutch.lproj/BookmarksWindow.nib/keyedobjects.nib
trunk/Dutch.lproj/DownloadsWindow.nib/classes.nib
trunk/Dutch.lproj/DownloadsWindow.nib/keyedobjects.nib
trunk/English.lproj/BookmarksWindow.nib/classes.nib
trunk/English.lproj/BookmarksWindow.nib/info.nib
trunk/English.lproj/BookmarksWindow.nib/keyedobjects.nib
trunk/English.lproj/DownloadsWindow.nib/classes.nib
trunk/English.lproj/DownloadsWindow.nib/keyedobjects.nib
trunk/French.lproj/BookmarksWindow.nib/classes.nib
trunk/French.lproj/BookmarksWindow.nib/info.nib
trunk/French.lproj/BookmarksWindow.nib/keyedobjects.nib
trunk/French.lproj/DownloadsWindow.nib/classes.nib
trunk/French.lproj/DownloadsWindow.nib/keyedobjects.nib
trunk/Italian.lproj/BookmarksWindow.nib/classes.nib
trunk/Italian.lproj/BookmarksWindow.nib/info.nib
trunk/Italian.lproj/BookmarksWindow.nib/keyedobjects.nib
trunk/Italian.lproj/DownloadsWindow.nib/classes.nib
trunk/Italian.lproj/DownloadsWindow.nib/keyedobjects.nib
Modified: trunk/Dutch.lproj/BookmarksWindow.nib/classes.nib
===================================================================
--- trunk/Dutch.lproj/BookmarksWindow.nib/classes.nib 2007-08-16 09:45:05 UTC (rev 2666)
+++ trunk/Dutch.lproj/BookmarksWindow.nib/classes.nib 2007-08-16 11:22:28 UTC (rev 2667)
@@ -1,5 +1,6 @@
{
IBClasses = (
+ {CLASS = BDSKGradientView; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{
CLASS = SKBookmarkController;
Modified: trunk/Dutch.lproj/BookmarksWindow.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/BookmarksWindow.nib/info.nib 2007-08-16 09:45:05 UTC (rev 2666)
+++ trunk/Dutch.lproj/BookmarksWindow.nib/info.nib 2007-08-16 11:22:28 UTC (rev 2667)
@@ -11,6 +11,6 @@
<integer>5</integer>
</array>
<key>IBSystem Version</key>
- <string>8P135</string>
+ <string>8R218</string>
</dict>
</plist>
Modified: trunk/Dutch.lproj/BookmarksWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Dutch.lproj/DownloadsWindow.nib/classes.nib
===================================================================
--- trunk/Dutch.lproj/DownloadsWindow.nib/classes.nib 2007-08-16 09:45:05 UTC (rev 2666)
+++ trunk/Dutch.lproj/DownloadsWindow.nib/classes.nib 2007-08-16 11:22:28 UTC (rev 2667)
@@ -1,5 +1,6 @@
{
IBClasses = (
+ {CLASS = BDSKGradientView; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{
ACTIONS = {"" = id; };
CLASS = FirstResponder;
Modified: trunk/Dutch.lproj/DownloadsWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/BookmarksWindow.nib/classes.nib
===================================================================
--- trunk/English.lproj/BookmarksWindow.nib/classes.nib 2007-08-16 09:45:05 UTC (rev 2666)
+++ trunk/English.lproj/BookmarksWindow.nib/classes.nib 2007-08-16 11:22:28 UTC (rev 2667)
@@ -1,5 +1,6 @@
{
IBClasses = (
+ {CLASS = BDSKGradientView; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{
CLASS = SKBookmarkController;
Modified: trunk/English.lproj/BookmarksWindow.nib/info.nib
===================================================================
--- trunk/English.lproj/BookmarksWindow.nib/info.nib 2007-08-16 09:45:05 UTC (rev 2666)
+++ trunk/English.lproj/BookmarksWindow.nib/info.nib 2007-08-16 11:22:28 UTC (rev 2667)
@@ -11,6 +11,6 @@
<integer>5</integer>
</array>
<key>IBSystem Version</key>
- <string>8P135</string>
+ <string>8R218</string>
</dict>
</plist>
Modified: trunk/English.lproj/BookmarksWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/DownloadsWindow.nib/classes.nib
===================================================================
--- trunk/English.lproj/DownloadsWindow.nib/classes.nib 2007-08-16 09:45:05 UTC (rev 2666)
+++ trunk/English.lproj/DownloadsWindow.nib/classes.nib 2007-08-16 11:22:28 UTC (rev 2667)
@@ -1,5 +1,6 @@
{
IBClasses = (
+ {CLASS = BDSKGradientView; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{
ACTIONS = {"" = id; };
CLASS = FirstResponder;
Modified: trunk/English.lproj/DownloadsWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/French.lproj/BookmarksWindow.nib/classes.nib
===================================================================
--- trunk/French.lproj/BookmarksWindow.nib/classes.nib 2007-08-16 09:45:05 UTC (rev 2666)
+++ trunk/French.lproj/BookmarksWindow.nib/classes.nib 2007-08-16 11:22:28 UTC (rev 2667)
@@ -1,15 +1,12 @@
{
- IBClasses = (
- {
- CLASS = FirstResponder;
- LANGUAGE = ObjC;
- SUPERCLASS = NSObject;
- },
- {
- CLASS = SKBookmarkController;
- LANGUAGE = ObjC;
- SUPERCLASS = NSWindowController;
+ IBClasses = (
+ {CLASS = BDSKGradientView; LANGUAGE = ObjC; SUPERCLASS = NSView; },
+ {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
+ {
+ CLASS = SKBookmarkController;
+ LANGUAGE = ObjC;
+ SUPERCLASS = NSWindowController;
}
- );
- IBVersion = 1;
+ );
+ IBVersion = 1;
}
\ No newline at end of file
Modified: trunk/French.lproj/BookmarksWindow.nib/info.nib
===================================================================
--- trunk/French.lproj/BookmarksWindow.nib/info.nib 2007-08-16 09:45:05 UTC (rev 2666)
+++ trunk/French.lproj/BookmarksWindow.nib/info.nib 2007-08-16 11:22:28 UTC (rev 2667)
@@ -1,12 +1,16 @@
<?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">
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>79 78 356 240 0 0 1600 1178 </string>
+ <string>69 58 356 240 0 0 1440 938 </string>
<key>IBFramework Version</key>
<string>446.1</string>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>5</integer>
+ </array>
<key>IBSystem Version</key>
- <string>9A466</string>
+ <string>8R218</string>
</dict>
</plist>
Modified: trunk/French.lproj/BookmarksWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/French.lproj/DownloadsWindow.nib/classes.nib
===================================================================
--- trunk/French.lproj/DownloadsWindow.nib/classes.nib 2007-08-16 09:45:05 UTC (rev 2666)
+++ trunk/French.lproj/DownloadsWindow.nib/classes.nib 2007-08-16 11:22:28 UTC (rev 2667)
@@ -1,5 +1,6 @@
{
IBClasses = (
+ {CLASS = BDSKGradientView; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{
ACTIONS = {"" = id; };
CLASS = FirstResponder;
Modified: trunk/French.lproj/DownloadsWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/BookmarksWindow.nib/classes.nib
===================================================================
--- trunk/Italian.lproj/BookmarksWindow.nib/classes.nib 2007-08-16 09:45:05 UTC (rev 2666)
+++ trunk/Italian.lproj/BookmarksWindow.nib/classes.nib 2007-08-16 11:22:28 UTC (rev 2667)
@@ -1,5 +1,6 @@
{
IBClasses = (
+ {CLASS = BDSKGradientView; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{
CLASS = SKBookmarkController;
Modified: trunk/Italian.lproj/BookmarksWindow.nib/info.nib
===================================================================
--- trunk/Italian.lproj/BookmarksWindow.nib/info.nib 2007-08-16 09:45:05 UTC (rev 2666)
+++ trunk/Italian.lproj/BookmarksWindow.nib/info.nib 2007-08-16 11:22:28 UTC (rev 2667)
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>43 101 356 240 0 0 1024 746 </string>
+ <string>70 139 356 240 0 0 1440 938 </string>
<key>IBFramework Version</key>
<string>446.1</string>
<key>IBOpenObjects</key>
@@ -11,6 +11,6 @@
<integer>5</integer>
</array>
<key>IBSystem Version</key>
- <string>8P135</string>
+ <string>8R218</string>
</dict>
</plist>
Modified: trunk/Italian.lproj/BookmarksWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/DownloadsWindow.nib/classes.nib
===================================================================
--- trunk/Italian.lproj/DownloadsWindow.nib/classes.nib 2007-08-16 09:45:05 UTC (rev 2666)
+++ trunk/Italian.lproj/DownloadsWindow.nib/classes.nib 2007-08-16 11:22:28 UTC (rev 2667)
@@ -1,5 +1,6 @@
{
IBClasses = (
+ {CLASS = BDSKGradientView; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{
ACTIONS = {"" = id; };
CLASS = FirstResponder;
Modified: trunk/Italian.lproj/DownloadsWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-16 09:45:09
|
Revision: 2666
http://skim-app.svn.sourceforge.net/skim-app/?rev=2666&view=rev
Author: hofman
Date: 2007-08-16 02:45:05 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
Set fileURL of downloaded document after the temporary file has been removed, so the document notes this.
Modified Paths:
--------------
trunk/SKDownloadController.m
Modified: trunk/SKDownloadController.m
===================================================================
--- trunk/SKDownloadController.m 2007-08-15 19:01:43 UTC (rev 2665)
+++ trunk/SKDownloadController.m 2007-08-16 09:45:05 UTC (rev 2666)
@@ -182,14 +182,14 @@
NSURL *URL = [NSURL fileURLWithPath:[download filePath]];
NSError *error = nil;
id document = [[NSDocumentController sharedDocumentController] openDocumentWithContentsOfURL:URL display:YES error:&error];
- if (document)
- [document setFileName:[[URL path] lastPathComponent]];
- else
+ if (document == nil)
[NSApp presentError:error];
if ([[NSUserDefaults standardUserDefaults] boolForKey:SKAutoRemoveFinishedDownloadsKey]) {
[download cleanupDownload];
[downloads removeObject:download];
+ // for the document to note that the file has been deleted
+ [document setFileURL:[NSURL fileURLWithPath:[download filePath]]];
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-15 19:01:46
|
Revision: 2665
http://skim-app.svn.sourceforge.net/skim-app/?rev=2665&view=rev
Author: hofman
Date: 2007-08-15 12:01:43 -0700 (Wed, 15 Aug 2007)
Log Message:
-----------
Scroll new download row to visible after adding.
Modified Paths:
--------------
trunk/SKDownloadController.m
Modified: trunk/SKDownloadController.m
===================================================================
--- trunk/SKDownloadController.m 2007-08-15 18:10:41 UTC (rev 2664)
+++ trunk/SKDownloadController.m 2007-08-15 19:01:43 UTC (rev 2665)
@@ -95,9 +95,11 @@
- (void)addDownloadForURL:(NSURL *)aURL {
if (aURL) {
SKDownload *download = [[[SKDownload alloc] initWithURL:aURL delegate:self] autorelease];
+ int row = [downloads count];
[downloads addObject:download];
[self reloadTableView];
- [tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:[tableView numberOfRows] - 1] byExtendingSelection:NO];
+ [tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO];
+ [tableView scrollRowToVisible:row];
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-15 18:10:43
|
Revision: 2664
http://skim-app.svn.sourceforge.net/skim-app/?rev=2664&view=rev
Author: hofman
Date: 2007-08-15 11:10:41 -0700 (Wed, 15 Aug 2007)
Log Message:
-----------
Add accessory view to print layout panel to auto rotate pages.
Modified Paths:
--------------
trunk/Dutch.lproj/Localizable.strings
trunk/SKDocument.h
trunk/SKDocument.m
Modified: trunk/Dutch.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/SKDocument.h
===================================================================
--- trunk/SKDocument.h 2007-08-15 17:36:38 UTC (rev 2663)
+++ trunk/SKDocument.h 2007-08-15 18:10:41 UTC (rev 2664)
@@ -66,6 +66,9 @@
IBOutlet NSProgressIndicator *progressBar;
IBOutlet NSTextField *progressField;
+ IBOutlet NSButton *autoRotateButton;
+ BOOL autoRotate;
+
// variables to be saved:
NSData *pdfData;
Modified: trunk/SKDocument.m
===================================================================
--- trunk/SKDocument.m 2007-08-15 17:36:38 UTC (rev 2663)
+++ trunk/SKDocument.m 2007-08-15 18:10:41 UTC (rev 2664)
@@ -97,6 +97,7 @@
[readNotesAccessoryView release];
[lastModifiedDate release];
[progressSheet release];
+ [autoRotateButton release];
[super dealloc];
}
@@ -507,7 +508,7 @@
#pragma mark Actions
- (IBAction)printDocument:(id)sender{
- [[self pdfView] printWithInfo:[self printInfo] autoRotate:NO];
+ [[self pdfView] printWithInfo:[self printInfo] autoRotate:autoRotate];
}
- (void)openPanelDidEnd:(NSOpenPanel *)oPanel returnCode:(int)returnCode contextInfo:(void *)contextInfo{
@@ -1154,9 +1155,24 @@
- (void)setPrintInfo:(NSPrintInfo *)printInfo {
[super setPrintInfo:printInfo];
+ if (autoRotateButton)
+ autoRotate = [autoRotateButton state] == NSOnState;
[self updateChangeCount:[[self undoManager] isUndoing] ? NSChangeDone : NSChangeUndone];
}
+- (BOOL)preparePageLayout:(NSPageLayout *)pageLayout {
+ if (autoRotateButton == nil) {
+ autoRotateButton = [[NSButton alloc] init];
+ [autoRotateButton setBezelStyle:NSRoundedBezelStyle];
+ [autoRotateButton setButtonType:NSSwitchButton];
+ [autoRotateButton setTitle:NSLocalizedString(@"Auto Rotate Pages", @"Print layout sheet button title")];
+ [autoRotateButton sizeToFit];
+ }
+ [autoRotateButton setState:autoRotate ? NSOnState : NSOffState];
+ [pageLayout setAccessoryView:autoRotateButton];
+ return YES;
+}
+
#pragma mark Scripting support
- (unsigned int)countOfPages {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-15 17:36:52
|
Revision: 2663
http://skim-app.svn.sourceforge.net/skim-app/?rev=2663&view=rev
Author: hofman
Date: 2007-08-15 10:36:38 -0700 (Wed, 15 Aug 2007)
Log Message:
-----------
Always set the print orientation, as the user may have landscape set as default.
Modified Paths:
--------------
trunk/SKDocument.m
Modified: trunk/SKDocument.m
===================================================================
--- trunk/SKDocument.m 2007-08-15 13:13:44 UTC (rev 2662)
+++ trunk/SKDocument.m 2007-08-15 17:36:38 UTC (rev 2663)
@@ -112,13 +112,14 @@
if ([pdfDocument pageCount]) {
PDFPage *page = [pdfDocument pageAtIndex:0];
NSPrintInfo *printInfo = [self printInfo];
- NSSize paperSize = [printInfo paperSize];
NSSize pageSize = [page boundsForBox:kPDFDisplayBoxMediaBox].size;
+ BOOL isWide = pageSize.width > pageSize.height;
BOOL isRotated = [page rotation] % 180 == 90;
- BOOL isWide = (pageSize.width > pageSize.height) != (paperSize.width > paperSize.height);
- if (isRotated != isWide) {
+ NSPrintingOrientation requiredOrientation = isWide == isRotated ? NSPortraitOrientation : NSLandscapeOrientation;
+ NSPrintingOrientation currentOrientation = [printInfo orientation];
+ if (requiredOrientation != currentOrientation) {
printInfo = [printInfo copy];
- [printInfo setOrientation:NSLandscapeOrientation];
+ [printInfo setOrientation:requiredOrientation];
[self setPrintInfo:printInfo];
[printInfo release];
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-15 13:13:47
|
Revision: 2662
http://skim-app.svn.sourceforge.net/skim-app/?rev=2662&view=rev
Author: hofman
Date: 2007-08-15 06:13:44 -0700 (Wed, 15 Aug 2007)
Log Message:
-----------
Resume download restarts when there is no resume data or the download failed. Allows reloading for restored internet connection.
Modified Paths:
--------------
trunk/SKDownload.m
Modified: trunk/SKDownload.m
===================================================================
--- trunk/SKDownload.m 2007-08-14 18:22:41 UTC (rev 2661)
+++ trunk/SKDownload.m 2007-08-15 13:13:44 UTC (rev 2662)
@@ -195,6 +195,7 @@
progressIndicator = [[NSProgressIndicator alloc] init];
[progressIndicator setStyle:NSProgressIndicatorBarStyle];
[progressIndicator setControlSize:NSSmallControlSize];
+ [progressIndicator setUsesThreadedAnimation:YES];
[progressIndicator sizeToFit];
if (expectedContentLength > 0) {
[progressIndicator setIndeterminate:NO];
@@ -239,14 +240,27 @@
- (void)resumeDownload {
if ([self canResume]) {
- NSData *resumeData = [[[URLDownload resumeData] retain] autorelease];
+ NSData *resumeData = nil;
+ if ([self status] == SKDownloadStatusCanceled)
+ resumeData = [[[URLDownload resumeData] retain] autorelease];
+
if (resumeData) {
+
[URLDownload release];
URLDownload = [[NSURLDownload alloc] initWithResumeData:resumeData delegate:self path:[self filePath]];
[URLDownload setDeletesFileUponFailure:NO];
[self setStatus:SKDownloadStatusDownloading];
if ([delegate respondsToSelector:@selector(downloadDidUpdate:)])
[delegate downloadDidUpdate:self];
+
+ } else {
+
+ [self cleanupDownload];
+ [self setFilePath:nil];
+ [URLDownload release];
+ URLDownload = nil;
+ [self startDownload];
+
}
}
}
@@ -262,7 +276,7 @@
}
- (BOOL)canResume {
- return [self status] == SKDownloadStatusCanceled;
+ return ([self status] == SKDownloadStatusCanceled || [self status] == SKDownloadStatusFailed) && [self URL];
}
#pragma mark NSURLDownloadDelegate protocol
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-14 18:22:47
|
Revision: 2661
http://skim-app.svn.sourceforge.net/skim-app/?rev=2661&view=rev
Author: hofman
Date: 2007-08-14 11:22:41 -0700 (Tue, 14 Aug 2007)
Log Message:
-----------
Make some setters for download object private. Cleanup download when app terminates in the download object.
Modified Paths:
--------------
trunk/SKDownload.h
trunk/SKDownload.m
trunk/SKDownloadController.h
trunk/SKDownloadController.m
Modified: trunk/SKDownload.h
===================================================================
--- trunk/SKDownload.h 2007-08-14 17:50:41 UTC (rev 2660)
+++ trunk/SKDownload.h 2007-08-14 18:22:41 UTC (rev 2661)
@@ -64,18 +64,13 @@
- (id)delegate;
- (void)setDelegate:(id)newDelegate;
-- (int)status;
-- (void)setStatus:(int)newStatus;
-
- (NSURL *)URL;
- (void)setURL:(NSURL *)newURL;
+- (int)status;
- (NSString *)filePath;
-- (void)setFilePath:(NSString *)newFilePath;
-
- (NSString *)fileName;
- (NSImage *)fileIcon;
-
- (long long)expectedContentLength;
- (long long)receivedContentLength;
Modified: trunk/SKDownload.m
===================================================================
--- trunk/SKDownload.m 2007-08-14 17:50:41 UTC (rev 2660)
+++ trunk/SKDownload.m 2007-08-14 18:22:41 UTC (rev 2661)
@@ -40,6 +40,15 @@
#import <ApplicationServices/ApplicationServices.h>
+@interface SKDownload (Private)
+- (void)setStatus:(int)newStatus;
+- (void)setFilePath:(NSString *)newFilePath;
+- (void)setExpectedContentLength:(long long)newExpectedContentLength;
+- (void)setReceivedContentLength:(long long)newReceivedContentLength;
+- (void)handleApplicationWillTerminateNotification:(NSNotification *)notification;
+@end
+
+
@implementation SKDownload
- (id)initWithURL:(NSURL *)aURL delegate:(id)aDelegate {
@@ -56,6 +65,9 @@
if (URL)
[self startDownload];
+
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleApplicationWillTerminateNotification:)
+ name:NSApplicationWillTerminateNotification object:NSApp];
}
return self;
}
@@ -65,6 +77,7 @@
}
- (void)dealloc {
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
[self cleanupDownload];
[URL release];
[URLDownload release];
@@ -74,6 +87,10 @@
[super dealloc];
}
+- (void)handleApplicationWillTerminateNotification:(NSNotification *)notification {
+ [self cleanupDownload];
+}
+
#pragma mark Accessors
- (id)delegate {
@@ -150,7 +167,7 @@
expectedContentLength = newExpectedContentLength;
if (expectedContentLength > 0) {
[progressIndicator setIndeterminate:NO];
- [progressIndicator setMaxValue:expectedContentLength];
+ [progressIndicator setMaxValue:(double)expectedContentLength];
} else {
[progressIndicator setIndeterminate:YES];
[progressIndicator setMaxValue:1.0];
@@ -181,13 +198,13 @@
[progressIndicator sizeToFit];
if (expectedContentLength > 0) {
[progressIndicator setIndeterminate:NO];
- [progressIndicator setMaxValue:expectedContentLength];
+ [progressIndicator setMaxValue:(double)expectedContentLength];
+ [progressIndicator setDoubleValue:(double)receivedContentLength];
} else {
[progressIndicator setIndeterminate:YES];
[progressIndicator setMaxValue:1.0];
}
- if ([self status] == SKDownloadStatusDownloading)
- [progressIndicator startAnimation:self];
+ [progressIndicator startAnimation:self];
}
return progressIndicator;
}
Modified: trunk/SKDownloadController.h
===================================================================
--- trunk/SKDownloadController.h 2007-08-14 17:50:41 UTC (rev 2660)
+++ trunk/SKDownloadController.h 2007-08-14 18:22:41 UTC (rev 2661)
@@ -53,6 +53,4 @@
- (IBAction)removeDownload:(id)sender;
- (IBAction)cancelDownload:(id)sender;
-- (void)handleApplicationWillTerminateNotification:(NSNotification *)notification;
-
@end
Modified: trunk/SKDownloadController.m
===================================================================
--- trunk/SKDownloadController.m 2007-08-14 17:50:41 UTC (rev 2660)
+++ trunk/SKDownloadController.m 2007-08-14 18:22:41 UTC (rev 2661)
@@ -55,8 +55,6 @@
- (id)init {
if (self = [super init]) {
downloads = [[NSMutableArray alloc] init];
- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleApplicationWillTerminateNotification:)
- name:NSApplicationWillTerminateNotification object:NSApp];
}
return self;
}
@@ -68,10 +66,6 @@
- (NSString *)windowNibName { return @"DownloadsWindow"; }
-- (void)handleApplicationWillTerminateNotification:(NSNotification *)notification {
- [downloads makeObjectsPerformSelector:@selector(cleanupDownload)];
-}
-
- (void)reloadTableView {
NSView *view;
while (view = [[tableView subviews] lastObject])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-14 17:50:42
|
Revision: 2660
http://skim-app.svn.sourceforge.net/skim-app/?rev=2660&view=rev
Author: hofman
Date: 2007-08-14 10:50:41 -0700 (Tue, 14 Aug 2007)
Log Message:
-----------
Check for "://" before trying to create a URL from an arbitrary string on the pasteboard.
Modified Paths:
--------------
trunk/NSURL_SKExtensions.m
Modified: trunk/NSURL_SKExtensions.m
===================================================================
--- trunk/NSURL_SKExtensions.m 2007-08-14 15:21:11 UTC (rev 2659)
+++ trunk/NSURL_SKExtensions.m 2007-08-14 17:50:41 UTC (rev 2660)
@@ -51,9 +51,11 @@
theURL = [NSURL URLWithString:[pasteboard stringForType:SKWeblocFilePboardType]];
} else if ([pboardType isEqualToString:NSStringPboardType]) {
NSString *string = [[pasteboard stringForType:NSStringPboardType] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
- if ([string hasPrefix:@"<"] && [string hasSuffix:@">"])
- string = [string substringWithRange:NSMakeRange(1, [string length] - 2)];
- theURL = [NSURL URLWithString:string];
+ if ([string rangeOfString:@"://"].length) {
+ if ([string hasPrefix:@"<"] && [string hasSuffix:@">"])
+ string = [string substringWithRange:NSMakeRange(1, [string length] - 2)];
+ theURL = [NSURL URLWithString:string];
+ }
if (theURL == nil) {
if ([string hasPrefix:@"~"])
string = [string stringByExpandingTildeInPath];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-14 15:21:46
|
Revision: 2659
http://skim-app.svn.sourceforge.net/skim-app/?rev=2659&view=rev
Author: hofman
Date: 2007-08-14 08:21:11 -0700 (Tue, 14 Aug 2007)
Log Message:
-----------
Update dutch localization. Add some localization comments. Declare method.
Modified Paths:
--------------
trunk/Dutch.lproj/DownloadsWindow.nib/keyedobjects.nib
trunk/Dutch.lproj/Localizable.strings
trunk/Dutch.lproj/MainMenu.nib/info.nib
trunk/Dutch.lproj/MainMenu.nib/keyedobjects.nib
trunk/SKDownloadController.h
trunk/SKDownloadController.m
trunk/SKProgressCell.m
Modified: trunk/Dutch.lproj/DownloadsWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Dutch.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/Dutch.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/MainMenu.nib/info.nib 2007-08-14 12:46:24 UTC (rev 2658)
+++ trunk/Dutch.lproj/MainMenu.nib/info.nib 2007-08-14 15:21:11 UTC (rev 2659)
@@ -7,14 +7,10 @@
<key>IBEditorPositions</key>
<dict>
<key>29</key>
- <string>140 614 635 44 0 0 1440 938 </string>
+ <string>140 614 542 44 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
- <key>IBOpenObjects</key>
- <array>
- <integer>29</integer>
- </array>
<key>IBSystem Version</key>
<string>8R218</string>
</dict>
Modified: trunk/Dutch.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/SKDownloadController.h
===================================================================
--- trunk/SKDownloadController.h 2007-08-14 12:46:24 UTC (rev 2658)
+++ trunk/SKDownloadController.h 2007-08-14 15:21:11 UTC (rev 2659)
@@ -53,4 +53,6 @@
- (IBAction)removeDownload:(id)sender;
- (IBAction)cancelDownload:(id)sender;
+- (void)handleApplicationWillTerminateNotification:(NSNotification *)notification;
+
@end
Modified: trunk/SKDownloadController.m
===================================================================
--- trunk/SKDownloadController.m 2007-08-14 12:46:24 UTC (rev 2658)
+++ trunk/SKDownloadController.m 2007-08-14 15:21:11 UTC (rev 2659)
@@ -282,12 +282,12 @@
NSString *toolTip = nil;
if ([[tableColumn identifier] isEqualToString:@"cancel"]) {
if ([[downloads objectAtIndex:row] canCancel])
- toolTip = NSLocalizedString(@"Cancel download", @"");
+ toolTip = NSLocalizedString(@"Cancel download", @"Tool tip message");
else
- toolTip = NSLocalizedString(@"Remove download", @"");
+ toolTip = NSLocalizedString(@"Remove download", @"Tool tip message");
} else if ([[tableColumn identifier] isEqualToString:@"resume"]) {
if ([[downloads objectAtIndex:row] canResume])
- toolTip = NSLocalizedString(@"Resume download", @"");
+ toolTip = NSLocalizedString(@"Resume download", @"Tool tip message");
}
return toolTip;
}
Modified: trunk/SKProgressCell.m
===================================================================
--- trunk/SKProgressCell.m 2007-08-14 12:46:24 UTC (rev 2658)
+++ trunk/SKProgressCell.m 2007-08-14 15:21:11 UTC (rev 2659)
@@ -99,16 +99,16 @@
NSString *string = nil;
switch (status) {
case SKDownloadStatusStarting:
- string = [NSLocalizedString(@"Starting", @"") stringByAppendingEllipsis];
+ string = [NSLocalizedString(@"Starting", @"Download status message") stringByAppendingEllipsis];
break;
case SKDownloadStatusFinished:
- string = NSLocalizedString(@"Finished", @"");
+ string = NSLocalizedString(@"Finished", @"Download status message");
break;
case SKDownloadStatusFailed:
- string = NSLocalizedString(@"Failed", @"");
+ string = NSLocalizedString(@"Failed", @"Download status message");
break;
case SKDownloadStatusCanceled:
- string = NSLocalizedString(@"Canceled", @"");
+ string = NSLocalizedString(@"Canceled", @"Download status message");
break;
}
[self setObjectValue:string];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-14 12:46:28
|
Revision: 2658
http://skim-app.svn.sourceforge.net/skim-app/?rev=2658&view=rev
Author: hofman
Date: 2007-08-14 05:46:24 -0700 (Tue, 14 Aug 2007)
Log Message:
-----------
check for webloc files before URLs, otherwise webloc files will give their file's URL rather than the represented URL.
Modified Paths:
--------------
trunk/NSURL_SKExtensions.m
Modified: trunk/NSURL_SKExtensions.m
===================================================================
--- trunk/NSURL_SKExtensions.m 2007-08-14 12:16:13 UTC (rev 2657)
+++ trunk/NSURL_SKExtensions.m 2007-08-14 12:46:24 UTC (rev 2658)
@@ -43,7 +43,7 @@
@implementation NSURL (SKExtensions)
+ (NSURL *)URLFromPasteboardAnyType:(NSPasteboard *)pasteboard {
- NSString *pboardType = [pasteboard availableTypeFromArray:[NSArray arrayWithObjects:NSURLPboardType, SKWeblocFilePboardType, NSStringPboardType, nil]];
+ NSString *pboardType = [pasteboard availableTypeFromArray:[NSArray arrayWithObjects:SKWeblocFilePboardType, NSURLPboardType, NSStringPboardType, nil]];
NSURL *theURL = nil;
if ([pboardType isEqualToString:NSURLPboardType]) {
theURL = [NSURL URLFromPasteboard:pasteboard];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-14 12:16:14
|
Revision: 2657
http://skim-app.svn.sourceforge.net/skim-app/?rev=2657&view=rev
Author: hofman
Date: 2007-08-14 05:16:13 -0700 (Tue, 14 Aug 2007)
Log Message:
-----------
Add hidden default to automatically remove finished downloads. Set progress bar value when finished.
Modified Paths:
--------------
trunk/InitialUserDefaults.plist
trunk/SKDownload.m
trunk/SKDownloadController.m
trunk/SKStringConstants.h
trunk/SKStringConstants.m
Modified: trunk/InitialUserDefaults.plist
===================================================================
--- trunk/InitialUserDefaults.plist 2007-08-14 11:09:16 UTC (rev 2656)
+++ trunk/InitialUserDefaults.plist 2007-08-14 12:16:13 UTC (rev 2657)
@@ -226,6 +226,8 @@
<real>600.0</real>
<key>SKAutoOpenDownloadsWindow</key>
<true/>
+ <key>SKAutoRemoveFinishedDownloads</key>
+ <true/>
<key>SUScheduledCheckInterval</key>
<integer>86400</integer>
</dict>
Modified: trunk/SKDownload.m
===================================================================
--- trunk/SKDownload.m 2007-08-14 11:09:16 UTC (rev 2656)
+++ trunk/SKDownload.m 2007-08-14 12:16:13 UTC (rev 2657)
@@ -48,6 +48,8 @@
URLDownload = nil;
filePath = nil;
fileIcon = nil;
+ expectedContentLength = -1;
+ receivedContentLength = 0;
progressIndicator = nil;
status = SKDownloadStatusUndefined;
delegate = aDelegate;
@@ -294,6 +296,8 @@
}
- (void)downloadDidFinish:(NSURLDownload *)theDownload {
+ if (expectedContentLength > 0)
+ [progressIndicator setDoubleValue:(double)expectedContentLength];
[self setStatus:SKDownloadStatusFinished];
if ([delegate respondsToSelector:@selector(downloadDidEnd:)])
[delegate downloadDidEnd:self];
Modified: trunk/SKDownloadController.m
===================================================================
--- trunk/SKDownloadController.m 2007-08-14 11:09:16 UTC (rev 2656)
+++ trunk/SKDownloadController.m 2007-08-14 12:16:13 UTC (rev 2657)
@@ -40,6 +40,7 @@
#import "SKDownload.h"
#import "SKProgressCell.h"
#import "NSURL_SKExtensions.h"
+#import "SKStringConstants.h"
@implementation SKDownloadController
@@ -190,8 +191,10 @@
else
[NSApp presentError:error];
- [download cleanupDownload];
- [downloads removeObject:download];
+ if ([[NSUserDefaults standardUserDefaults] boolForKey:SKAutoRemoveFinishedDownloadsKey]) {
+ [download cleanupDownload];
+ [downloads removeObject:download];
+ }
}
[self reloadTableView];
Modified: trunk/SKStringConstants.h
===================================================================
--- trunk/SKStringConstants.h 2007-08-14 11:09:16 UTC (rev 2656)
+++ trunk/SKStringConstants.h 2007-08-14 12:16:13 UTC (rev 2657)
@@ -101,3 +101,4 @@
extern NSString *SKActivatePresentationNavigationAtBottomKey;
extern NSString *SKAutoHidePresentationContentsKey;
extern NSString *SKAutoOpenDownloadsWindowKey;
+extern NSString *SKAutoRemoveFinishedDownloadsKey;
Modified: trunk/SKStringConstants.m
===================================================================
--- trunk/SKStringConstants.m 2007-08-14 11:09:16 UTC (rev 2656)
+++ trunk/SKStringConstants.m 2007-08-14 12:16:13 UTC (rev 2657)
@@ -102,3 +102,4 @@
NSString *SKActivatePresentationNavigationAtBottomKey = @"SKActivatePresentationNavigationAtBottom";
NSString *SKAutoHidePresentationContentsKey = @"SKAutoHidePresentationContents";
NSString *SKAutoOpenDownloadsWindowKey = @"SKAutoOpenDownloadsWindow";
+NSString *SKAutoRemoveFinishedDownloadsKey = @"SKAutoRemoveFinishedDownloads";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
2 messages has been excluded from this view by a project administrator.
