diff --git a/build.py b/build.py index 201166ac..6ceab378 100644 --- a/build.py +++ b/build.py @@ -15,7 +15,7 @@ import shutil from setuptools import setup import yaml -from hsdocgen import generate_help, filters +from hscommon import helpgen from hscommon.build import add_to_pythonpath, print_and_do, build_all_qt_ui, copy_packages def build_cocoa(edition, dev, help_destpath): @@ -85,13 +85,12 @@ def main(): add_to_pythonpath('.') print "Generating Help" windows = sys.platform == 'win32' - tix = filters.tixgen("https://hardcoded.lighthouseapp.com/projects/31699-dupeguru/tickets/{0}") + profile = 'win_en' if windows else 'osx_en' help_dir = 'help_{0}'.format(edition) dest_dir = 'dupeguru_{0}_help'.format(edition) if edition != 'se' else 'dupeguru_help' help_basepath = op.abspath(help_dir) help_destpath = op.abspath(op.join(help_dir, dest_dir)) - generate_help.main(help_basepath, help_destpath, force_render=not dev, tix=tix, windows=windows) - + helpgen.gen(help_basepath, help_destpath, profile=profile) print "Building dupeGuru" if edition == 'pe': os.chdir('core_pe') diff --git a/help_me/LICENSE b/help_me/LICENSE deleted file mode 100644 index 25c0e61a..00000000 --- a/help_me/LICENSE +++ /dev/null @@ -1,11 +0,0 @@ -Copyright 2010 Hardcoded Software Inc. (http://www.hardcoded.net) -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Hardcoded Software Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - * If the source code has been published less than two years ago, any redistribution, in whole or in part, must retain full licensing functionality, without any attempt to change, obscure or in other ways circumvent its intent. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/help_me/conf.yaml b/help_me/conf.yaml new file mode 100644 index 00000000..f81cff76 --- /dev/null +++ b/help_me/conf.yaml @@ -0,0 +1,6 @@ +base: + pages: en/pages.yaml + skeleton: skeleton + changelog: changelog.yaml + tixurl: "https://hardcoded.lighthouseapp.com/projects/31699-dupeguru/tickets/{0}" + firstpage_meta: "" diff --git a/help_me/en/credits.md b/help_me/en/credits.md new file mode 100644 index 00000000..b823d193 --- /dev/null +++ b/help_me/en/credits.md @@ -0,0 +1,26 @@ +Below is the list of people who contributed, directly or indirectly to dupeGuru. + +**Virgil Dupras, Developer**
+ + +**Jérôme Cantin, Icon designer**
+Icons in dupeGuru are from him + +**Python, Programming language**
+The bestest of the bests
+ + +**PyObjC, Python-to-Cocoa bridge**
+Used for the Mac OS X version
+ + +**PyQt, Python-to-Qt bridge**
+Used for the Windows version
+ + +**Sparkle, Auto-update library**
+Used for the Mac OS X version
+ + +**You, dupeGuru user**
+You rock. \ No newline at end of file diff --git a/help_se/templates/directories.mako b/help_me/en/directories.md similarity index 94% rename from help_se/templates/directories.mako rename to help_me/en/directories.md index e75b47bd..4e739c51 100644 --- a/help_se/templates/directories.mako +++ b/help_me/en/directories.md @@ -1,9 +1,3 @@ -<%! - title = 'Directories' - selected_menu_item = 'Directories' -%> -<%inherit file="/base_dg.mako"/> - There is a panel in dupeGuru called **Directories**. You can open it by clicking on the **Directories** button. This directory contains the list of the directories that will be scanned when you click on **Start Scanning**. This panel is quite straightforward to use. If you want to add a directory, click on **Add**. If you added directories before, a popup menu with a list of recent directories you added will pop. You can click on one of them to add it directly to your list. If you click on the first item of the popup menu, **Add New Directory...**, you will be prompted for a directory to add. If you never added a directory, no menu will pop and you will directly be prompted for a new directory to add. diff --git a/help_me/templates/faq.mako b/help_me/en/faq.md similarity index 97% rename from help_me/templates/faq.mako rename to help_me/en/faq.md index deb13f56..32eae927 100644 --- a/help_me/templates/faq.mako +++ b/help_me/en/faq.md @@ -1,10 +1,3 @@ -<%! - title = 'dupeGuru ME F.A.Q.' - selected_menu_item = 'F.A.Q.' -%> -<%inherit file="/base_dg.mako"/> - -<%text filter="md"> ### What is dupeGuru Music Edition? dupeGuru Music Edition is a tool to find duplicate songs in your music collection. It can base its scan on filenames, tags or content. The filename and tag scans feature a fuzzy matching algorithm that can find duplicate filenames or tags even when they are not exactly the same. @@ -71,5 +64,4 @@ Most of the time, the reason why dupeGuru can't send files to Trash is because o If dupeGuru still gives you troubles after fixing your permissions, there have been some cases where using "Move Marked to..." as a workaround did the trick. So instead of sending your files to Trash, you send them to a temporary folder with the "Move Marked to..." action, and then you delete that temporary folder manually. -If all of this fail, [contact HS support](http://www.hardcoded.net/support), we'll figure it out. - \ No newline at end of file +If all of this fail, [contact HS support](http://www.hardcoded.net/support), we'll figure it out. \ No newline at end of file diff --git a/help_me/templates/intro.mako b/help_me/en/intro.md similarity index 73% rename from help_me/templates/intro.mako rename to help_me/en/intro.md index 2381895d..395224d0 100644 --- a/help_me/templates/intro.mako +++ b/help_me/en/intro.md @@ -1,13 +1,5 @@ -<%! - title = 'Introduction to dupeGuru ME' - selected_menu_item = 'introduction' -%> -<%inherit file="/base_dg.mako"/> - dupeGuru Music Edition is a tool to find duplicate files on your computer. It can scan either filenames or contents. The filename scan features a fuzzy matching algorithm that can find duplicate filenames even when they are not exactly the same. Although dupeGuru can easily be used without documentation, reading this file will help you to master it. If you are looking for guidance for your first duplicate scan, you can take a look at the [Quick Start](quick_start.htm) section. -It is a good idea to keep dupeGuru updated. You can download the latest version on the [dupeGuru ME homepage](http://www.hardcoded.net/dupeguru_me/). - -<%def name="meta()"> +It is a good idea to keep dupeGuru updated. You can download the latest version on the [dupeGuru ME homepage](http://www.hardcoded.net/dupeguru_me/). \ No newline at end of file diff --git a/help_me/en/pages.yaml b/help_me/en/pages.yaml new file mode 100644 index 00000000..ed4ee8f7 --- /dev/null +++ b/help_me/en/pages.yaml @@ -0,0 +1,45 @@ +- + name: intro + title: Introduction to dupeGuru ME + menutitle: Introduction + menudesc: Introduction to dupeGuru +- + name: quick_start + title: Quick Start + menutitle: Quick Start + menudesc: Quickly get into the action +- + name: directories + title: Directories + menutitle: Directories + menudesc: Managing dupeGuru directories +- + name: preferences + title: Preferences + menutitle: Preferences + menudesc: Setting dupeGuru preferences +- + name: results + title: Results + menutitle: Results + menudesc: Time to delete these duplicates! +- + name: power_marker + title: Power Marker + menutitle: Power Marker + menudesc: Take control of your duplicates +- + name: faq + title: Frequently Asked Questions + menutitle: F.A.Q. + menudesc: Frequently Asked Questions +- + name: versions + title: Version History + menutitle: Version History + menudesc: Changes moneyGuru went through +- + name: credits + title: Credits + menutitle: Credits + menudesc: People who contributed to dupeGuru diff --git a/help_se/templates/power_marker.mako b/help_me/en/power_marker.md similarity index 96% rename from help_se/templates/power_marker.mako rename to help_me/en/power_marker.md index 26078f3d..69712b09 100644 --- a/help_se/templates/power_marker.mako +++ b/help_me/en/power_marker.md @@ -1,9 +1,3 @@ -<%! - title = 'Power Marker' - selected_menu_item = 'Power Marker' -%> -<%inherit file="/base_dg.mako"/> - You will probably not use the Power Marker feature very often, but if you get into a situation where you need it, you will be pretty happy that this feature exists. What is it? diff --git a/help_me/templates/preferences.mako b/help_me/en/preferences.md similarity index 98% rename from help_me/templates/preferences.mako rename to help_me/en/preferences.md index b94252b1..c1a8c5fd 100644 --- a/help_me/templates/preferences.mako +++ b/help_me/en/preferences.md @@ -1,9 +1,3 @@ -<%! - title = 'Preferences' - selected_menu_item = 'Preferences' -%> -<%inherit file="/base_dg.mako"/> - **Scan Type:** This option determines what aspect of the files will be compared in the duplicate scan. The nature of the duplicate scan varies greatly depending on what you select for this option. * **Filename:** Every song will have its filename split into words, and then every word will be compared to compute a matching percentage. If this percentage is higher or equal to the **Filter Hardness** (see below for more details), dupeGuru will consider the 2 songs duplicates. diff --git a/help_pe/templates/quick_start.mako b/help_me/en/quick_start.md similarity index 90% rename from help_pe/templates/quick_start.mako rename to help_me/en/quick_start.md index dde33c65..0c8d4081 100644 --- a/help_pe/templates/quick_start.mako +++ b/help_me/en/quick_start.md @@ -1,9 +1,3 @@ -<%! - title = 'Quick Start' - selected_menu_item = 'Quick Start' -%> -<%inherit file="/base_dg.mako"/> - To get you quickly started with dupeGuru, let's just make a standard scan using default preferences. * Click on **Directories**. diff --git a/help_se/templates/results.mako b/help_me/en/results.md similarity index 98% rename from help_se/templates/results.mako rename to help_me/en/results.md index e55e7f47..e46eaa30 100644 --- a/help_se/templates/results.mako +++ b/help_me/en/results.md @@ -1,9 +1,3 @@ -<%! - title = 'Results' - selected_menu_item = 'Results' -%> -<%inherit file="/base_dg.mako"/> - When dupeGuru is finished scanning for duplicates, it will show its results in the form of duplicate group list. About duplicate groups diff --git a/help_me/templates/versions.mako b/help_me/en/versions.md similarity index 58% rename from help_me/templates/versions.mako rename to help_me/en/versions.md index 946cbaa1..ec54bbf7 100644 --- a/help_me/templates/versions.mako +++ b/help_me/en/versions.md @@ -1,9 +1,3 @@ -<%! - title = 'dupeGuru ME version history' - selected_menu_item = 'Version History' -%> -<%inherit file="/base_dg.mako"/> - A large part of this version history is not serious (especially before v3), but it is always interesting to remember that I learnt most of what I know about designing/implementing/supporting a software through that. -${self.output_changelogs(changelog)} \ No newline at end of file +{changelog} \ No newline at end of file diff --git a/help_me/templates/base_dg.mako b/help_me/templates/base_dg.mako deleted file mode 100644 index 7767c49f..00000000 --- a/help_me/templates/base_dg.mako +++ /dev/null @@ -1,14 +0,0 @@ -<%inherit file="/base_help.mako"/> -${next.body()} - -<%def name="menu()"><% -self.menuitem('intro.htm', 'Introduction', 'Introduction to dupeGuru') -self.menuitem('quick_start.htm', 'Quick Start', 'Quickly get into the action') -self.menuitem('directories.htm', 'Directories', 'Managing dupeGuru directories') -self.menuitem('preferences.htm', 'Preferences', 'Setting dupeGuru preferences') -self.menuitem('results.htm', 'Results', 'Time to delete these duplicates!') -self.menuitem('power_marker.htm', 'Power Marker', 'Take control of your duplicates') -self.menuitem('faq.htm', 'F.A.Q.', 'Frequently Asked Questions') -self.menuitem('versions.htm', 'Version History', 'Changes dupeGuru went through') -self.menuitem('credits.htm', 'Credits', 'People who contributed to dupeGuru') -%> \ No newline at end of file diff --git a/help_me/templates/credits.mako b/help_me/templates/credits.mako deleted file mode 100644 index a170ec3d..00000000 --- a/help_me/templates/credits.mako +++ /dev/null @@ -1,20 +0,0 @@ -<%! - title = 'Credits' - selected_menu_item = 'Credits' -%> -<%inherit file="/base_dg.mako"/> -Below is the list of people who contributed, directly or indirectly to dupeGuru. - -${self.credit('Virgil Dupras', 'Developer', "That's me, Hardcoded Software founder", 'www.hardcoded.net', 'hsoft@hardcoded.net')} - -${self.credit('Python', 'Programming language', "The bestest of the bests", 'www.python.org')} - -${self.credit('PyObjC', 'Python-to-Cocoa bridge', "Used for the Mac OS X version", 'pyobjc.sourceforge.net')} - -${self.credit('PyQt', 'Python-to-Qt bridge', "Used for the Windows version", 'www.riverbankcomputing.co.uk')} - -${self.credit('Qt', 'GUI Toolkit', "Used for the Windows version", 'www.qtsoftware.com')} - -${self.credit('Sparkle', 'Auto-update library', "Used for the Mac OS X version", 'andymatuschak.org/pages/sparkle')} - -${self.credit('You', 'dupeGuru user', "What would I do without you?")} diff --git a/help_pe/LICENSE b/help_pe/LICENSE deleted file mode 100644 index 25c0e61a..00000000 --- a/help_pe/LICENSE +++ /dev/null @@ -1,11 +0,0 @@ -Copyright 2010 Hardcoded Software Inc. (http://www.hardcoded.net) -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Hardcoded Software Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - * If the source code has been published less than two years ago, any redistribution, in whole or in part, must retain full licensing functionality, without any attempt to change, obscure or in other ways circumvent its intent. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/help_pe/conf.yaml b/help_pe/conf.yaml new file mode 100644 index 00000000..f81cff76 --- /dev/null +++ b/help_pe/conf.yaml @@ -0,0 +1,6 @@ +base: + pages: en/pages.yaml + skeleton: skeleton + changelog: changelog.yaml + tixurl: "https://hardcoded.lighthouseapp.com/projects/31699-dupeguru/tickets/{0}" + firstpage_meta: "" diff --git a/help_pe/en/credits.md b/help_pe/en/credits.md new file mode 100644 index 00000000..44206bcb --- /dev/null +++ b/help_pe/en/credits.md @@ -0,0 +1,30 @@ +Below is the list of people who contributed, directly or indirectly to dupeGuru. + +**Virgil Dupras, Developer**
+ + +**Jérôme Cantin, Icon designer**
+Icons in dupeGuru are from him + +**Python, Programming language**
+The bestest of the bests
+ + +**PyObjC, Python-to-Cocoa bridge**
+Used for the Mac OS X version
+ + +**PyQt, Python-to-Qt bridge**
+Used for the Windows version
+ + +**Sparkle, Auto-update library**
+Used for the Mac OS X version
+ + +**Python Imaging Library, Picture analyzer**
+Used for the Windows version
+ + +**You, dupeGuru user**
+You rock. \ No newline at end of file diff --git a/help_pe/templates/directories.mako b/help_pe/en/directories.md similarity index 94% rename from help_pe/templates/directories.mako rename to help_pe/en/directories.md index e75b47bd..4e739c51 100644 --- a/help_pe/templates/directories.mako +++ b/help_pe/en/directories.md @@ -1,9 +1,3 @@ -<%! - title = 'Directories' - selected_menu_item = 'Directories' -%> -<%inherit file="/base_dg.mako"/> - There is a panel in dupeGuru called **Directories**. You can open it by clicking on the **Directories** button. This directory contains the list of the directories that will be scanned when you click on **Start Scanning**. This panel is quite straightforward to use. If you want to add a directory, click on **Add**. If you added directories before, a popup menu with a list of recent directories you added will pop. You can click on one of them to add it directly to your list. If you click on the first item of the popup menu, **Add New Directory...**, you will be prompted for a directory to add. If you never added a directory, no menu will pop and you will directly be prompted for a new directory to add. diff --git a/help_pe/templates/faq.mako b/help_pe/en/faq.md similarity index 97% rename from help_pe/templates/faq.mako rename to help_pe/en/faq.md index 29dc383f..f5df0033 100644 --- a/help_pe/templates/faq.mako +++ b/help_pe/en/faq.md @@ -1,10 +1,3 @@ -<%! - title = 'dupeGuru F.A.Q.' - selected_menu_item = 'F.A.Q.' -%> -<%inherit file="/base_dg.mako"/> - -<%text filter="md"> ### What is dupeGuru PE? dupeGuru Picture Edition (PE for short) is a tool to find duplicate pictures on your computer. Not only can it find exact matches, but it can also find duplicates among pictures of different kind (PNG, JPG, GIF etc..) and quality. @@ -70,5 +63,4 @@ If dupeGuru still gives you troubles after fixing your permissions, there have b If you're trying to delete *iPhoto* pictures, then the reason for the failure is different. The deletion fails because dupeGuru can't communicate with iPhoto. Be aware that for the deletion to work correctly, you're not supposed to play around iPhoto while dupeGuru is working. Also, sometimes, the Applescript system doesn't seem to know where to find iPhoto to launch it. It might help in these cases to launch iPhoto *before* you send your duplicates to Trash. -If all of this fail, [contact HS support](http://www.hardcoded.net/support), we'll figure it out. - \ No newline at end of file +If all of this fail, [contact HS support](http://www.hardcoded.net/support), we'll figure it out. \ No newline at end of file diff --git a/help_pe/templates/intro.mako b/help_pe/en/intro.md similarity index 72% rename from help_pe/templates/intro.mako rename to help_pe/en/intro.md index 51d058c9..c4e030a1 100644 --- a/help_pe/templates/intro.mako +++ b/help_pe/en/intro.md @@ -1,13 +1,5 @@ -<%! - title = 'Introduction to dupeGuru PE' - selected_menu_item = 'introduction' -%> -<%inherit file="/base_dg.mako"/> - dupeGuru Picture Edition (PE for short) is a tool to find duplicate pictures on your computer. Not only can it find exact matches, but it can also find duplicates among pictures of different kind (PNG, JPG, GIF etc..) and quality. Although dupeGuru can easily be used without documentation, reading this file will help you to master it. If you are looking for guidance for your first duplicate scan, you can take a look at the [Quick Start](quick_start.htm) section. -It is a good idea to keep dupeGuru PE updated. You can download the latest version on the [dupeGuru PE homepage](http://www.hardcoded.net/dupeguru_pe/). - -<%def name="meta()"> +It is a good idea to keep dupeGuru PE updated. You can download the latest version on the [dupeGuru PE homepage](http://www.hardcoded.net/dupeguru_pe/). \ No newline at end of file diff --git a/help_pe/en/pages.yaml b/help_pe/en/pages.yaml new file mode 100644 index 00000000..ed4ee8f7 --- /dev/null +++ b/help_pe/en/pages.yaml @@ -0,0 +1,45 @@ +- + name: intro + title: Introduction to dupeGuru ME + menutitle: Introduction + menudesc: Introduction to dupeGuru +- + name: quick_start + title: Quick Start + menutitle: Quick Start + menudesc: Quickly get into the action +- + name: directories + title: Directories + menutitle: Directories + menudesc: Managing dupeGuru directories +- + name: preferences + title: Preferences + menutitle: Preferences + menudesc: Setting dupeGuru preferences +- + name: results + title: Results + menutitle: Results + menudesc: Time to delete these duplicates! +- + name: power_marker + title: Power Marker + menutitle: Power Marker + menudesc: Take control of your duplicates +- + name: faq + title: Frequently Asked Questions + menutitle: F.A.Q. + menudesc: Frequently Asked Questions +- + name: versions + title: Version History + menutitle: Version History + menudesc: Changes moneyGuru went through +- + name: credits + title: Credits + menutitle: Credits + menudesc: People who contributed to dupeGuru diff --git a/help_me/templates/power_marker.mako b/help_pe/en/power_marker.md similarity index 96% rename from help_me/templates/power_marker.mako rename to help_pe/en/power_marker.md index 26078f3d..69712b09 100644 --- a/help_me/templates/power_marker.mako +++ b/help_pe/en/power_marker.md @@ -1,9 +1,3 @@ -<%! - title = 'Power Marker' - selected_menu_item = 'Power Marker' -%> -<%inherit file="/base_dg.mako"/> - You will probably not use the Power Marker feature very often, but if you get into a situation where you need it, you will be pretty happy that this feature exists. What is it? diff --git a/help_pe/templates/preferences.mako b/help_pe/en/preferences.md similarity index 96% rename from help_pe/templates/preferences.mako rename to help_pe/en/preferences.md index 45fc4cb4..2b8fc0c2 100644 --- a/help_pe/templates/preferences.mako +++ b/help_pe/en/preferences.md @@ -1,9 +1,3 @@ -<%! - title = 'Preferences' - selected_menu_item = 'Preferences' -%> -<%inherit file="/base_dg.mako"/> - **Filter Hardness:** The higher is this setting, the "harder" is the filter (In other words, the less results you get). Most pictures of the same quality match at 100% even if the format is different (PNG and JPG for example.). However, if you want to make a PNG match with a lower quality JPG, you will have to set the filer hardness to lower than 100. The default, 95, is a sweet spot. **Match scaled pictures together:** If you check this box, pictures of different dimensions will be allowed in the same duplicate group. diff --git a/help_se/templates/quick_start.mako b/help_pe/en/quick_start.md similarity index 90% rename from help_se/templates/quick_start.mako rename to help_pe/en/quick_start.md index dde33c65..0c8d4081 100644 --- a/help_se/templates/quick_start.mako +++ b/help_pe/en/quick_start.md @@ -1,9 +1,3 @@ -<%! - title = 'Quick Start' - selected_menu_item = 'Quick Start' -%> -<%inherit file="/base_dg.mako"/> - To get you quickly started with dupeGuru, let's just make a standard scan using default preferences. * Click on **Directories**. diff --git a/help_pe/templates/results.mako b/help_pe/en/results.md similarity index 98% rename from help_pe/templates/results.mako rename to help_pe/en/results.md index e55e7f47..e46eaa30 100644 --- a/help_pe/templates/results.mako +++ b/help_pe/en/results.md @@ -1,9 +1,3 @@ -<%! - title = 'Results' - selected_menu_item = 'Results' -%> -<%inherit file="/base_dg.mako"/> - When dupeGuru is finished scanning for duplicates, it will show its results in the form of duplicate group list. About duplicate groups diff --git a/help_pe/en/versions.md b/help_pe/en/versions.md new file mode 100644 index 00000000..ee53e0a2 --- /dev/null +++ b/help_pe/en/versions.md @@ -0,0 +1 @@ +{changelog} \ No newline at end of file diff --git a/help_pe/templates/base_dg.mako b/help_pe/templates/base_dg.mako deleted file mode 100644 index 7767c49f..00000000 --- a/help_pe/templates/base_dg.mako +++ /dev/null @@ -1,14 +0,0 @@ -<%inherit file="/base_help.mako"/> -${next.body()} - -<%def name="menu()"><% -self.menuitem('intro.htm', 'Introduction', 'Introduction to dupeGuru') -self.menuitem('quick_start.htm', 'Quick Start', 'Quickly get into the action') -self.menuitem('directories.htm', 'Directories', 'Managing dupeGuru directories') -self.menuitem('preferences.htm', 'Preferences', 'Setting dupeGuru preferences') -self.menuitem('results.htm', 'Results', 'Time to delete these duplicates!') -self.menuitem('power_marker.htm', 'Power Marker', 'Take control of your duplicates') -self.menuitem('faq.htm', 'F.A.Q.', 'Frequently Asked Questions') -self.menuitem('versions.htm', 'Version History', 'Changes dupeGuru went through') -self.menuitem('credits.htm', 'Credits', 'People who contributed to dupeGuru') -%> \ No newline at end of file diff --git a/help_pe/templates/credits.mako b/help_pe/templates/credits.mako deleted file mode 100644 index 9de91bd2..00000000 --- a/help_pe/templates/credits.mako +++ /dev/null @@ -1,25 +0,0 @@ -## -*- coding: utf-8 -*- -<%! - title = 'Credits' - selected_menu_item = 'Credits' -%> -<%inherit file="/base_dg.mako"/> -Below is the list of people who contributed, directly or indirectly to dupeGuru. - -${self.credit('Virgil Dupras', 'Developer', "That's me, Hardcoded Software founder", 'www.hardcoded.net', 'hsoft@hardcoded.net')} - -${self.credit(u'Jérôme Cantin', u'Icon designer', u"Icons in dupeGuru are from him")} - -${self.credit('Python', 'Programming language', "The bestest of the bests", 'www.python.org')} - -${self.credit('PyObjC', 'Python-to-Cocoa bridge', "Used for the Mac OS X version", 'pyobjc.sourceforge.net')} - -${self.credit('PyQt', 'Python-to-Qt bridge', "Used for the Windows version", 'www.riverbankcomputing.co.uk')} - -${self.credit('Qt', 'GUI Toolkit', "Used for the Windows version", 'www.qtsoftware.com')} - -${self.credit('Sparkle', 'Auto-update library', "Used for the Mac OS X version", 'andymatuschak.org/pages/sparkle')} - -${self.credit('Python Imaging Library', 'Picture analyzer', "Used for the Windows version", 'www.pythonware.com/products/pil/')} - -${self.credit('You', 'dupeGuru user', "What would I do without you?")} diff --git a/help_pe/templates/versions.mako b/help_pe/templates/versions.mako deleted file mode 100644 index 157c26ba..00000000 --- a/help_pe/templates/versions.mako +++ /dev/null @@ -1,6 +0,0 @@ -<%! - title = 'dupeGuru PE version history' - selected_menu_item = 'Version History' -%> -<%inherit file="/base_dg.mako"/> -${self.output_changelogs(changelog)} \ No newline at end of file diff --git a/help_se/LICENSE b/help_se/LICENSE deleted file mode 100644 index 25c0e61a..00000000 --- a/help_se/LICENSE +++ /dev/null @@ -1,11 +0,0 @@ -Copyright 2010 Hardcoded Software Inc. (http://www.hardcoded.net) -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Hardcoded Software Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - * If the source code has been published less than two years ago, any redistribution, in whole or in part, must retain full licensing functionality, without any attempt to change, obscure or in other ways circumvent its intent. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/help_se/conf.yaml b/help_se/conf.yaml new file mode 100644 index 00000000..f81cff76 --- /dev/null +++ b/help_se/conf.yaml @@ -0,0 +1,6 @@ +base: + pages: en/pages.yaml + skeleton: skeleton + changelog: changelog.yaml + tixurl: "https://hardcoded.lighthouseapp.com/projects/31699-dupeguru/tickets/{0}" + firstpage_meta: "" diff --git a/help_se/en/credits.md b/help_se/en/credits.md new file mode 100644 index 00000000..b823d193 --- /dev/null +++ b/help_se/en/credits.md @@ -0,0 +1,26 @@ +Below is the list of people who contributed, directly or indirectly to dupeGuru. + +**Virgil Dupras, Developer**
+ + +**Jérôme Cantin, Icon designer**
+Icons in dupeGuru are from him + +**Python, Programming language**
+The bestest of the bests
+ + +**PyObjC, Python-to-Cocoa bridge**
+Used for the Mac OS X version
+ + +**PyQt, Python-to-Qt bridge**
+Used for the Windows version
+ + +**Sparkle, Auto-update library**
+Used for the Mac OS X version
+ + +**You, dupeGuru user**
+You rock. \ No newline at end of file diff --git a/help_me/templates/directories.mako b/help_se/en/directories.md similarity index 94% rename from help_me/templates/directories.mako rename to help_se/en/directories.md index e75b47bd..4e739c51 100644 --- a/help_me/templates/directories.mako +++ b/help_se/en/directories.md @@ -1,9 +1,3 @@ -<%! - title = 'Directories' - selected_menu_item = 'Directories' -%> -<%inherit file="/base_dg.mako"/> - There is a panel in dupeGuru called **Directories**. You can open it by clicking on the **Directories** button. This directory contains the list of the directories that will be scanned when you click on **Start Scanning**. This panel is quite straightforward to use. If you want to add a directory, click on **Add**. If you added directories before, a popup menu with a list of recent directories you added will pop. You can click on one of them to add it directly to your list. If you click on the first item of the popup menu, **Add New Directory...**, you will be prompted for a directory to add. If you never added a directory, no menu will pop and you will directly be prompted for a new directory to add. diff --git a/help_se/templates/faq.mako b/help_se/en/faq.md similarity index 97% rename from help_se/templates/faq.mako rename to help_se/en/faq.md index 02200ffa..263dd99b 100644 --- a/help_se/templates/faq.mako +++ b/help_se/en/faq.md @@ -1,10 +1,3 @@ -<%! - title = 'dupeGuru F.A.Q.' - selected_menu_item = 'F.A.Q.' -%> -<%inherit file="/base_dg.mako"/> - -<%text filter="md"> ### What is dupeGuru? dupeGuru is a tool to find duplicate files on your computer. It can scan either filenames or content. The filename scan features a fuzzy matching algorithm that can find duplicate filenames even when they are not exactly the same. @@ -69,4 +62,3 @@ Most of the time, the reason why dupeGuru can't send files to Trash is because o If dupeGuru still gives you troubles after fixing your permissions, there have been some cases where using "Move Marked to..." as a workaround did the trick. So instead of sending your files to Trash, you send them to a temporary folder with the "Move Marked to..." action, and then you delete that temporary folder manually. If all of this fail, [contact HS support](http://www.hardcoded.net/support), we'll figure it out. - \ No newline at end of file diff --git a/help_se/templates/intro.mako b/help_se/en/intro.md similarity index 73% rename from help_se/templates/intro.mako rename to help_se/en/intro.md index 0fd3019b..8a4b7490 100644 --- a/help_se/templates/intro.mako +++ b/help_se/en/intro.md @@ -1,13 +1,5 @@ -<%! - title = 'Introduction to dupeGuru' - selected_menu_item = 'introduction' -%> -<%inherit file="/base_dg.mako"/> - dupeGuru is a tool to find duplicate files on your computer. It can scan either filenames or contents. The filename scan features a fuzzy matching algorithm that can find duplicate filenames even when they are not exactly the same. Although dupeGuru can easily be used without documentation, reading this file will help you to master it. If you are looking for guidance for your first duplicate scan, you can take a look at the [Quick Start](quick_start.htm) section. -It is a good idea to keep dupeGuru updated. You can download the latest version on the [dupeGuru homepage](http://www.hardcoded.net/dupeguru/). - -<%def name="meta()"> \ No newline at end of file +It is a good idea to keep dupeGuru updated. You can download the latest version on the [dupeGuru homepage](http://www.hardcoded.net/dupeguru/). \ No newline at end of file diff --git a/help_se/en/pages.yaml b/help_se/en/pages.yaml new file mode 100644 index 00000000..ed4ee8f7 --- /dev/null +++ b/help_se/en/pages.yaml @@ -0,0 +1,45 @@ +- + name: intro + title: Introduction to dupeGuru ME + menutitle: Introduction + menudesc: Introduction to dupeGuru +- + name: quick_start + title: Quick Start + menutitle: Quick Start + menudesc: Quickly get into the action +- + name: directories + title: Directories + menutitle: Directories + menudesc: Managing dupeGuru directories +- + name: preferences + title: Preferences + menutitle: Preferences + menudesc: Setting dupeGuru preferences +- + name: results + title: Results + menutitle: Results + menudesc: Time to delete these duplicates! +- + name: power_marker + title: Power Marker + menutitle: Power Marker + menudesc: Take control of your duplicates +- + name: faq + title: Frequently Asked Questions + menutitle: F.A.Q. + menudesc: Frequently Asked Questions +- + name: versions + title: Version History + menutitle: Version History + menudesc: Changes moneyGuru went through +- + name: credits + title: Credits + menutitle: Credits + menudesc: People who contributed to dupeGuru diff --git a/help_pe/templates/power_marker.mako b/help_se/en/power_marker.md similarity index 96% rename from help_pe/templates/power_marker.mako rename to help_se/en/power_marker.md index 26078f3d..69712b09 100644 --- a/help_pe/templates/power_marker.mako +++ b/help_se/en/power_marker.md @@ -1,9 +1,3 @@ -<%! - title = 'Power Marker' - selected_menu_item = 'Power Marker' -%> -<%inherit file="/base_dg.mako"/> - You will probably not use the Power Marker feature very often, but if you get into a situation where you need it, you will be pretty happy that this feature exists. What is it? diff --git a/help_se/templates/preferences.mako b/help_se/en/preferences.md similarity index 97% rename from help_se/templates/preferences.mako rename to help_se/en/preferences.md index 94412e87..1f43acc1 100644 --- a/help_se/templates/preferences.mako +++ b/help_se/en/preferences.md @@ -1,9 +1,3 @@ -<%! - title = 'Preferences' - selected_menu_item = 'Preferences' -%> -<%inherit file="/base_dg.mako"/> - **Scan Type:** This option determines what aspect of the files will be compared in the duplicate scan. If you select **Filename**, dupeGuru will compare every filenames word-by-word and, depending on the other settings below, it will determine if enough words are matching to consider 2 files duplicates. If you select **Content**, only files with the exact same content will match. **Filter Hardness:** If you chose the **Filename** scan type, this option determines how similar two filenames must be for dupeGuru to consider them duplicates. If the filter hardness is, for example 80, it means that 80% of the words of two filenames must match. To determine the matching percentage, dupeGuru first counts the total number of words in **both** filenames, then count the number of words matching (every word matching count as 2), and then divide the number of words matching by the total number of words. If the result is higher or equal to the filter hardness, we have a duplicate match. For example, "a b c d" and "c d e" have a matching percentage of 57 (4 words matching, 7 total words). diff --git a/help_me/templates/quick_start.mako b/help_se/en/quick_start.md similarity index 90% rename from help_me/templates/quick_start.mako rename to help_se/en/quick_start.md index dde33c65..0c8d4081 100644 --- a/help_me/templates/quick_start.mako +++ b/help_se/en/quick_start.md @@ -1,9 +1,3 @@ -<%! - title = 'Quick Start' - selected_menu_item = 'Quick Start' -%> -<%inherit file="/base_dg.mako"/> - To get you quickly started with dupeGuru, let's just make a standard scan using default preferences. * Click on **Directories**. diff --git a/help_me/templates/results.mako b/help_se/en/results.md similarity index 98% rename from help_me/templates/results.mako rename to help_se/en/results.md index e55e7f47..e46eaa30 100644 --- a/help_me/templates/results.mako +++ b/help_se/en/results.md @@ -1,9 +1,3 @@ -<%! - title = 'Results' - selected_menu_item = 'Results' -%> -<%inherit file="/base_dg.mako"/> - When dupeGuru is finished scanning for duplicates, it will show its results in the form of duplicate group list. About duplicate groups diff --git a/help_se/en/versions.md b/help_se/en/versions.md new file mode 100644 index 00000000..ee53e0a2 --- /dev/null +++ b/help_se/en/versions.md @@ -0,0 +1 @@ +{changelog} \ No newline at end of file diff --git a/help_se/templates/base_dg.mako b/help_se/templates/base_dg.mako deleted file mode 100644 index 7767c49f..00000000 --- a/help_se/templates/base_dg.mako +++ /dev/null @@ -1,14 +0,0 @@ -<%inherit file="/base_help.mako"/> -${next.body()} - -<%def name="menu()"><% -self.menuitem('intro.htm', 'Introduction', 'Introduction to dupeGuru') -self.menuitem('quick_start.htm', 'Quick Start', 'Quickly get into the action') -self.menuitem('directories.htm', 'Directories', 'Managing dupeGuru directories') -self.menuitem('preferences.htm', 'Preferences', 'Setting dupeGuru preferences') -self.menuitem('results.htm', 'Results', 'Time to delete these duplicates!') -self.menuitem('power_marker.htm', 'Power Marker', 'Take control of your duplicates') -self.menuitem('faq.htm', 'F.A.Q.', 'Frequently Asked Questions') -self.menuitem('versions.htm', 'Version History', 'Changes dupeGuru went through') -self.menuitem('credits.htm', 'Credits', 'People who contributed to dupeGuru') -%> \ No newline at end of file diff --git a/help_se/templates/credits.mako b/help_se/templates/credits.mako deleted file mode 100644 index 269d7463..00000000 --- a/help_se/templates/credits.mako +++ /dev/null @@ -1,20 +0,0 @@ -<%! - title = 'Credits' - selected_menu_item = 'Credits' -%> -<%inherit file="/base_dg.mako"/> -Below is the list of people who contributed, directly or indirectly to dupeGuru. - -${self.credit('Virgil Dupras', 'Developer', "That's me, Hardcoded Software founder", 'www.hardcoded.net', 'hsoft@hardcoded.net')} - -${self.credit('Jerome', 'Icon designer', "Icons in dupeGuru are from him")} - -${self.credit('Python', 'Programming language', "The bestest of the bests", 'www.python.org')} - -${self.credit('PyObjC', 'Python-to-Cocoa bridge', "Used for the Mac OS X version", 'pyobjc.sourceforge.net')} - -${self.credit('Python for .NET', 'Python-to-.NET bridge', "Used for the Windows version", 'sourceforge.net/projects/pythonnet/')} - -${self.credit('Sparkle', 'Auto-update library', "Used for the Mac OS X version", 'andymatuschak.org/pages/sparkle')} - -${self.credit('You', 'dupeGuru user', "What would I do without you?")} diff --git a/help_se/templates/versions.mako b/help_se/templates/versions.mako deleted file mode 100644 index 354a294d..00000000 --- a/help_se/templates/versions.mako +++ /dev/null @@ -1,6 +0,0 @@ -<%! - title = 'dupeGuru version history' - selected_menu_item = 'Version History' -%> -<%inherit file="/base_dg.mako"/> -${self.output_changelogs(changelog)} \ No newline at end of file