From: <rom...@us...> - 2008-01-25 15:50:04
|
Revision: 520 http://daisymfcgui.svn.sourceforge.net/daisymfcgui/?rev=520&view=rev Author: romaindeltour Date: 2008-01-25 07:49:59 -0800 (Fri, 25 Jan 2008) Log Message: ----------- Organized and commented the message properties Modified Paths: -------------- trunk/gui/plugin.properties trunk/gui/plugin.xml trunk/gui/src/org/daisy/pipeline/gui/doc/messages.properties trunk/gui/src/org/daisy/pipeline/gui/jobs/messages.properties trunk/gui/src/org/daisy/pipeline/gui/jobs/wizard/messages.properties trunk/gui/src/org/daisy/pipeline/gui/messages/messages.properties trunk/gui/src/org/daisy/pipeline/gui/messages.properties trunk/gui/src/org/daisy/pipeline/gui/model/Messages.java trunk/gui/src/org/daisy/pipeline/gui/model/messages.properties trunk/gui/src/org/daisy/pipeline/gui/parameters/messages.properties trunk/gui/src/org/daisy/pipeline/gui/progress/JobProgressView.java trunk/gui/src/org/daisy/pipeline/gui/progress/Messages.java trunk/gui/src/org/daisy/pipeline/gui/progress/messages.properties trunk/gui/src/org/daisy/pipeline/gui/update/Messages.java trunk/gui/src/org/daisy/pipeline/gui/update/ZipUpdateOperation.java trunk/gui/src/org/daisy/pipeline/gui/update/messages.properties trunk/gui/src/org/daisy/pipeline/gui/util/messages.properties Modified: trunk/gui/plugin.properties =================================================================== --- trunk/gui/plugin.properties 2008-01-04 16:02:25 UTC (rev 519) +++ trunk/gui/plugin.properties 2008-01-25 15:49:59 UTC (rev 520) @@ -1,11 +1,33 @@ -# MANIFEST +################################################################################# +# Copyright (C) 2008 Daisy Consortium +# +# This library is free software; you can redistribute it and/or modify it under +# the terms of the GNU Lesser General Public License as published by the Free +# Software Foundation; either version 2.1 of the License, or (at your option) +# any later version. +# +# This library is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +# details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this library; if not, write to the Free Software Foundation, Inc., +# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +################################################################################# + +######################### +# --- OSGi Manifest --- # +######################### bundle.vendor = The DAISY Consortium bundle.name = DAISY Pipeline GUI -# Product -product.name = DAISY Pipeline -product.description = Product for the DAISY Pipeline application -product.about =DAISY Pipeline\n\ +############################## +# --- Product Definition --- # +############################## +product.name = DAISY Pipeline GUI +product.description = Product for the DAISY Pipeline GUI application +product.about =DAISY Pipeline GUI\n\ \n\ GUI Version: 1.0.2\n\ Core Version: 20071221\n\ @@ -16,14 +38,46 @@ This product is based on the Eclipse Rich Client\n\ Platform: http://www.eclipse.org/ -# Intro -intro.title=Welcom to the DAISY Pipeline +####################### +# --- UI Elements --- # +####################### + +# --- Introduction Page --- +intro.title=Welcome to the DAISY Pipeline intro.brandingImageText=The DAISY Consortium -# Action set: Table Edition +# --- Presentation factory --- +presentation.hackingFactory = Pipeline Presentation Factory + +# --- Perspectives --- +perspective.jobs = Pipeline Jobs +perspective.documentation = Documentation + +# --- Views --- +view.documentation = Documentation +view.errorLog= Error Log +view.jobs = Jobs +view.messages = Messages +view.parameters = Job Parameters (in development) +view.progress = Progress + +# --- Wizards --- +wizard.newJob = Pipeline Job + +# --- Preferences pages --- +prefPage.appearance = Appearance +prefPage.keys = Keys +prefPage.paths = Paths +prefPage.perspectives = Perspectives +prefPage.run = Run + +################################ +# --- Actions and Commands --- # +################################ + +# --- Table Edition --- actionSet.tableEdition = Table Edition actionSet.tableEdition.description = -# Actions action.moveToBottom = Move to &Bottom action.moveToBottom.tooltip = Move the selection to bottom action.moveDown = Move Do&wn @@ -33,12 +87,10 @@ action.moveToTop = Move to &Top action.moveToTop.tooltip = Move the selection to top -# Action set: Pipeline Jobs +# --- Pipeline Jobs --- +menu.run = &Run actionSet.jobs = Pipeline Jobs -actionSet.jobs.description = -# Menus -menu.run = &Run -# Actions +actionSet.jobs.description = action.cancelAll = C&ancel All action.cancelAll.tooltip = Cancel all the jobs action.cancel = &Cancel @@ -50,19 +102,16 @@ action.newJob = New &Job action.newJob.tooltip = Launch the new job wizard - -# Action set: Navigation +# --- Navigation --- actionSet.navigation = Navigation actionSet.navigation.description = -# Actions action.toggleBrowser = Toggle Browser action.toggleBrowser.tooltip = Move the focus in/out the browser -# Binding schemes +# --- Binding schemes --- binding.scheme.default = Pipeline (Default) -# Commands -# Categories +# --- Command Categories --- command.category.edit = Edit command.category.edit.description = command.category.file = File @@ -75,7 +124,8 @@ command.category.run.description = command.category.window = Window command.category.window.description = -# Commands + +# --- Commands --- command.cancel = Cancel command.cancel.description = Cancel the selection command.cancelAll = Cancel All @@ -102,25 +152,5 @@ command.update.description = Updates the Pipeline software and scripts command.showDoc = Documentation command.showDoc.description = Open the Documentation Perspective +command.showDoc.param.handleWarning = Handle Warning -# Wizards -wizard.newJob = Pipeline Job - -# Perspectives -perspective.jobs = Pipeline Jobs -perspective.documentation = Documentation - -# Preferece pages -prefPage.appearance = Appearance -prefPage.keys = Keys -prefPage.paths = Paths -prefPage.perspectives = Perspectives -prefPage.run = Run - -# Views -view.documentation = Documentation -view.errorLog= Error Log -view.jobs = Jobs -view.messages = Messages -view.parameters = Job Parameters (in development) -view.progress = Progress Modified: trunk/gui/plugin.xml =================================================================== --- trunk/gui/plugin.xml 2008-01-04 16:02:25 UTC (rev 519) +++ trunk/gui/plugin.xml 2008-01-25 15:49:59 UTC (rev 520) @@ -18,7 +18,7 @@ <product application="org.daisy.pipeline.gui.application" description="%product.description" - name="DAISY Pipeline"> <property + name="%product.name"> <property name="introTitle" value="%intro.title"/> <property @@ -466,7 +466,7 @@ name="%command.showDoc"> <commandParameter id="org.daisy.pipeline.gui.doc.showDoc.handleWarning" - name="org.daisy.pipeline.gui.doc.showDoc.handleWarning" + name="%command.showDoc.param.handleWarning" optional="false"> </commandParameter> </command> @@ -624,7 +624,7 @@ <factory class="org.daisy.pipeline.gui.HackingPresentationFactory" id="org.daisy.pipeline.gui.presentationFactory" - name="Hacking Factory"> + name="%presentation.hackingFactory"> </factory> </extension> Modified: trunk/gui/src/org/daisy/pipeline/gui/doc/messages.properties =================================================================== --- trunk/gui/src/org/daisy/pipeline/gui/doc/messages.properties 2008-01-04 16:02:25 UTC (rev 519) +++ trunk/gui/src/org/daisy/pipeline/gui/doc/messages.properties 2008-01-25 15:49:59 UTC (rev 520) @@ -1,12 +1,37 @@ -action_synchronize=Synchronize -action_synchronize_tooltip=Show in table of contents -error_noBrowser=Couldn't create browser widget:\n\n +################################################################################# +# Copyright (C) 2008 Daisy Consortium +# +# This library is free software; you can redistribute it and/or modify it under +# the terms of the GNU Lesser General Public License as published by the Free +# Software Foundation; either version 2.1 of the License, or (at your option) +# any later version. +# +# This library is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +# details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this library; if not, write to the Free Software Foundation, Inc., +# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +################################################################################# + +# --- ToC Tabs --- tab_script=Scripts +tab_script_tooltip=Scripts documentation contents tab_help=Help -tab_script_tooltip=Scripts documentation contents tab_help_tooltip=Help contents tab_transformers=Transformers tab_transformers_tooltip=Transformers documentation contents + +# --- Actions --- +action_synchronize=Synchronize +action_synchronize_tooltip=Show in table of contents + +# --- Dialogs --- dialog_showDoc_title=Show the Documentation dialog_showDoc_message=You are about to switch to the Documentaton perspective, which will change the layout of the application.\n\nTo go back to the main perspective, use Window -> Open Perspective -> Pipeline Jobs dialog_showDoc_toggle=Never show this dialog again + +# --- Errors --- +error_noBrowser=Couldn't create browser widget:\n\n \ No newline at end of file Modified: trunk/gui/src/org/daisy/pipeline/gui/jobs/messages.properties =================================================================== --- trunk/gui/src/org/daisy/pipeline/gui/jobs/messages.properties 2008-01-04 16:02:25 UTC (rev 519) +++ trunk/gui/src/org/daisy/pipeline/gui/jobs/messages.properties 2008-01-25 15:49:59 UTC (rev 520) @@ -1,3 +1,26 @@ +################################################################################# +# Copyright (C) 2008 Daisy Consortium +# +# This library is free software; you can redistribute it and/or modify it under +# the terms of the GNU Lesser General Public License as published by the Free +# Software Foundation; either version 2.1 of the License, or (at your option) +# any later version. +# +# This library is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +# details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this library; if not, write to the Free Software Foundation, Inc., +# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +################################################################################# + +# --- UI Elements --- +heading_jobs=Jobs +heading_status=Status + +# --- Actions --- action_clearFinished=Clear Finished Job action_delete=Delete Job action_moveUp=Move Up @@ -4,16 +27,16 @@ action_moveDown=Move Down action_moveToBottom=Move To Bottom action_moveToTop=Move To Top -error_delete_title=Delete Error -error_delete_message=Exception while moving job: + +# --- Jobs --- operation_newJob=Create Job -heading_jobs=Jobs -heading_status=Status uiJob_updateJobs=Job List Update uiJob_updateJobs_task=Updating Job List -uiJob_updateJobs_subtask=Udating Job {0} +uiJob_updateJobs_subtask=Updating Job {0} runnerJob_name=Running {0} runnerJob_message=Running the job + +# --- Dialogs --- dialog_abortedJobs_title=Aborted Jobs dialog_abortedJobs_message=Please select the jobs you want to re-execute.\n\nNote: The following jobs have been aborted during their previous execution, re-executing them might fail. dialog_abortedJobs_toggle=Always re-execute finished jobs @@ -25,8 +48,14 @@ dialog_finishedJobs_toggle=Always re-execute finished jobs dialog_scheduledJobs_title=Scheduled Jobs dialog_scheduledJobs_message=The operation will not affect the following already scheduled jobs. + +# --- Preferences --- prefPage_run_aborted_label=Re-execute aborted jobs: prefPage_run_always=Always prefPage_run_prompt=Prompt prefPage_run_failed_label=Re-execute failed jobs: prefPage_run_finished_label=Re-execute finished jobs: + +# --- Errors --- +error_delete_title=Delete Error +error_delete_message=Exception while moving job: \ No newline at end of file Modified: trunk/gui/src/org/daisy/pipeline/gui/jobs/wizard/messages.properties =================================================================== --- trunk/gui/src/org/daisy/pipeline/gui/jobs/wizard/messages.properties 2008-01-04 16:02:25 UTC (rev 519) +++ trunk/gui/src/org/daisy/pipeline/gui/jobs/wizard/messages.properties 2008-01-25 15:49:59 UTC (rev 520) @@ -1,11 +1,37 @@ -helpTray_close=Close -helpTray_close_tooltip=Close the help tray +################################################################################# +# Copyright (C) 2008 Daisy Consortium +# +# This library is free software; you can redistribute it and/or modify it under +# the terms of the GNU Lesser General Public License as published by the Free +# Software Foundation; either version 2.1 of the License, or (at your option) +# any later version. +# +# This library is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +# details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this library; if not, write to the Free Software Foundation, Inc., +# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +################################################################################# + +# --- Wizard Window --- +wizard_title=New Job Wizard + +# --- Wizard Pages --- +# - Parameters Page page_param_title=Configure {0} -page_script_title=Select Script page_param_description=Configure the parameters of the {0} job page_param_requiredGroup=Required Parameters page_param_optionalGroup=Optional Parameters -page_param_error_invalid=Invalid parameter: {0} +page_param_error_invalid=Invalid parameter: {0} +# - Script Page +page_script_title=Select Script page_script_description=Select the script the new job will be based on. page_script_error_unhandledScript=Unhandled script file. -wizard_title=New Job Wizard + +# --- Help Tray --- + +helpTray_close=Close +helpTray_close_tooltip=Close the help tray Modified: trunk/gui/src/org/daisy/pipeline/gui/messages/messages.properties =================================================================== --- trunk/gui/src/org/daisy/pipeline/gui/messages/messages.properties 2008-01-04 16:02:25 UTC (rev 519) +++ trunk/gui/src/org/daisy/pipeline/gui/messages/messages.properties 2008-01-25 15:49:59 UTC (rev 520) @@ -1,25 +1,45 @@ +################################################################################# +# Copyright (C) 2008 Daisy Consortium +# +# This library is free software; you can redistribute it and/or modify it under +# the terms of the GNU Lesser General Public License as published by the Free +# Software Foundation; either version 2.1 of the License, or (at your option) +# any later version. +# +# This library is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +# details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this library; if not, write to the Free Software Foundation, Inc., +# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +################################################################################# + +# --- UI Elements --- heading_message=Message heading_type=Type -location_extended={0}: {1} -location_file=In file ''{0}'' [{1}] -location_fileAndLine=At line {2} in file ''{0}'' [{1}] -location_fileAndColumnAndLine=At line {2}, column {3} in file ''{0}'' [{1}] +menu_groupBy=Group By +groupBy_categorySet_job=Job +groupBy_categorySet_cause=Cause +groupBy_categorySet_type=Type +groupBy_category_core=Core + +# --- Actions --- action_clearMessages=Clear Messages action_export_confirm=File {0} already exists. Would you like to overwrite it? action_filter=Filter... action_export=Export Messages action_scrollLock=Scroll Lock -menu_groupBy=Group By -groupBy_categorySet_job=Job -groupBy_categorySet_cause=Cause -groupBy_categorySet_type=Type -groupBy_category_core=Core -uiJob_addMessage_name=Add Message + +# --- Dialogs --- dialog_filter_title=Filter dialog_filter_severityGroup=Severity: dialog_filter_typesGroup=Types: dialog_filter_button_selectAll=Select All dialog_filter_button_deselectAll=Deselect All + +# --- Messages Types and Causes type_error=Error type_error_filter=Hide error messages type_warning=Warning @@ -32,3 +52,12 @@ cause_input_filter=Hide messages relating to input cause_system=System cause_system_filter=Hide messages relating to system events + +# --- Locations --- +location_extended={0}: {1} +location_file=In file ''{0}'' [{1}] +location_fileAndLine=At line {2} in file ''{0}'' [{1}] +location_fileAndColumnAndLine=At line {2}, column {3} in file ''{0}'' [{1}] + +# --- Jobs --- +uiJob_addMessage_name=Add Message Modified: trunk/gui/src/org/daisy/pipeline/gui/messages.properties =================================================================== --- trunk/gui/src/org/daisy/pipeline/gui/messages.properties 2008-01-04 16:02:25 UTC (rev 519) +++ trunk/gui/src/org/daisy/pipeline/gui/messages.properties 2008-01-25 15:49:59 UTC (rev 520) @@ -1,3 +1,25 @@ +################################################################################# +# Copyright (C) 2008 Daisy Consortium +# +# This library is free software; you can redistribute it and/or modify it under +# the terms of the GNU Lesser General Public License as published by the Free +# Software Foundation; either version 2.1 of the License, or (at your option) +# any later version. +# +# This library is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +# details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this library; if not, write to the Free Software Foundation, Inc., +# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +################################################################################# + +# --- Window Title --- +window_title=DAISY Pipeline + +# --- Menu Bars and Items --- menu_file=&File menu_edit=&Edit menu_window=&Window @@ -6,7 +28,9 @@ menu_window_openPerspective=Open &Perspective menu_window_showView=Show &View menu_window_navigation=&Navigation -window_title=DAISY Pipeline +accessibleName_viewMenu=View Menu + +# --- Preferences --- pref_imageMagickPath_label=ImageMagick Converter: pref_imageMagickPath_tooltip=Path to the ImageMagick converter executable pref_lamePath_label=LAME executable: @@ -18,4 +42,3 @@ pref_tempDirPath_label=Temporary Directory: pref_tempDirPath_tooltip=Path to the temporary directory message_reloadCore=Reloading the Pipeline core -accessibleName_viewMenu=View Menu Modified: trunk/gui/src/org/daisy/pipeline/gui/model/Messages.java =================================================================== --- trunk/gui/src/org/daisy/pipeline/gui/model/Messages.java 2008-01-04 16:02:25 UTC (rev 519) +++ trunk/gui/src/org/daisy/pipeline/gui/model/Messages.java 2008-01-25 15:49:59 UTC (rev 520) @@ -22,16 +22,17 @@ /** * @author Romain Deltour - * + * */ public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.daisy.pipeline.gui.model.messages"; //$NON-NLS-1$ - public static String error_unableToLoadScript; - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } + private static final String BUNDLE_NAME = "org.daisy.pipeline.gui.model.messages"; //$NON-NLS-1$ + /** The error message when a script could not be loaded */ + public static String error_unableToLoadScript; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } - private Messages() { - } + private Messages() { + } } Modified: trunk/gui/src/org/daisy/pipeline/gui/model/messages.properties =================================================================== --- trunk/gui/src/org/daisy/pipeline/gui/model/messages.properties 2008-01-04 16:02:25 UTC (rev 519) +++ trunk/gui/src/org/daisy/pipeline/gui/model/messages.properties 2008-01-25 15:49:59 UTC (rev 520) @@ -1 +1,20 @@ +################################################################################# +# Copyright (C) 2008 Daisy Consortium +# +# This library is free software; you can redistribute it and/or modify it under +# the terms of the GNU Lesser General Public License as published by the Free +# Software Foundation; either version 2.1 of the License, or (at your option) +# any later version. +# +# This library is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +# details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this library; if not, write to the Free Software Foundation, Inc., +# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +################################################################################# + +# --- Errors --- error_unableToLoadScript=Unable to load script {0} Modified: trunk/gui/src/org/daisy/pipeline/gui/parameters/messages.properties =================================================================== --- trunk/gui/src/org/daisy/pipeline/gui/parameters/messages.properties 2008-01-04 16:02:25 UTC (rev 519) +++ trunk/gui/src/org/daisy/pipeline/gui/parameters/messages.properties 2008-01-25 15:49:59 UTC (rev 520) @@ -1,2 +1,19 @@ +################################################################################# +# Copyright (C) 2008 Daisy Consortium +# +# This library is free software; you can redistribute it and/or modify it under +# the terms of the GNU Lesser General Public License as published by the Free +# Software Foundation; either version 2.1 of the License, or (at your option) +# any later version. +# +# This library is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +# details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this library; if not, write to the Free Software Foundation, Inc., +# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +################################################################################# heading_name=Name heading_value=Value Modified: trunk/gui/src/org/daisy/pipeline/gui/progress/JobProgressView.java =================================================================== --- trunk/gui/src/org/daisy/pipeline/gui/progress/JobProgressView.java 2008-01-04 16:02:25 UTC (rev 519) +++ trunk/gui/src/org/daisy/pipeline/gui/progress/JobProgressView.java 2008-01-25 15:49:59 UTC (rev 520) @@ -35,6 +35,7 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredViewer; @@ -168,7 +169,7 @@ stateLabel.setLayoutData(formData); // Create the cancel buttons cancelButton = new ToolItem(toolbar, SWT.PUSH); - cancelButton.setToolTipText(Messages.button_cancel_tooltip); + cancelButton.setToolTipText(IDialogConstants.CANCEL_LABEL); cancelButton.setImage(GuiPlugin.getImage(IIconsKeys.ACTION_STOP)); cancelButton.addSelectionListener(new SelectionAdapter() { @Override Modified: trunk/gui/src/org/daisy/pipeline/gui/progress/Messages.java =================================================================== --- trunk/gui/src/org/daisy/pipeline/gui/progress/Messages.java 2008-01-04 16:02:25 UTC (rev 519) +++ trunk/gui/src/org/daisy/pipeline/gui/progress/Messages.java 2008-01-25 15:49:59 UTC (rev 520) @@ -26,11 +26,6 @@ public class Messages extends NLS { private static final String BUNDLE_NAME = "org.daisy.pipeline.gui.progress.messages"; //$NON-NLS-1$ /** - * The tooltip of the button to cancel the job displayed in the progress - * view - */ - public static String button_cancel_tooltip; - /** * The text to display in the progress view when no job is selected. */ public static String label_noJob; Modified: trunk/gui/src/org/daisy/pipeline/gui/progress/messages.properties =================================================================== --- trunk/gui/src/org/daisy/pipeline/gui/progress/messages.properties 2008-01-04 16:02:25 UTC (rev 519) +++ trunk/gui/src/org/daisy/pipeline/gui/progress/messages.properties 2008-01-25 15:49:59 UTC (rev 520) @@ -1,6 +1,22 @@ -uiJob_taskUpdate_name=Task Update Job -uiJob_progressUpdate=Progress View Update Job -button_cancel_tooltip=Cancel +################################################################################# +# Copyright (C) 2008 Daisy Consortium +# +# This library is free software; you can redistribute it and/or modify it under +# the terms of the GNU Lesser General Public License as published by the Free +# Software Foundation; either version 2.1 of the License, or (at your option) +# any later version. +# +# This library is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +# details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this library; if not, write to the Free Software Foundation, Inc., +# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +################################################################################# + +# --- Progress Info --- label_noJob=No job selected label_state_aborted=Aborted after {0} label_state_done=Finished in {0} @@ -8,3 +24,7 @@ label_state_running=Running state_timeRunning={0} left state_timeDone=Done in {0} + +# --- Jobs --- +uiJob_taskUpdate_name=Task Update Job +uiJob_progressUpdate=Progress View Update Job \ No newline at end of file Modified: trunk/gui/src/org/daisy/pipeline/gui/update/Messages.java =================================================================== --- trunk/gui/src/org/daisy/pipeline/gui/update/Messages.java 2008-01-04 16:02:25 UTC (rev 519) +++ trunk/gui/src/org/daisy/pipeline/gui/update/Messages.java 2008-01-25 15:49:59 UTC (rev 520) @@ -48,8 +48,6 @@ public static String zipOperation_monitor_updatingDir; /** The main progress message */ public static String zipOperation_monitor_mainTask; - /** The message shown when error occurred in the update operation */ - public static String zipOperation_error_globalMessage; /** The message for an error that occurred while creating a directory */ public static String zipOperation_error_directory; /** The message for an error that occurred while updating a file */ Modified: trunk/gui/src/org/daisy/pipeline/gui/update/ZipUpdateOperation.java =================================================================== --- trunk/gui/src/org/daisy/pipeline/gui/update/ZipUpdateOperation.java 2008-01-04 16:02:25 UTC (rev 519) +++ trunk/gui/src/org/daisy/pipeline/gui/update/ZipUpdateOperation.java 2008-01-25 15:49:59 UTC (rev 520) @@ -97,7 +97,7 @@ GuiPlugin.get().error("An error occured while updating " + file, e); //$NON-NLS-1$ if (errors == null) { errors = new MultiStatus(GuiPlugin.ID, 0, - Messages.zipOperation_error_globalMessage, null); + Messages.zipPage_dialog_error_message, null); } errors.add(new Status(IStatus.ERROR, GuiPlugin.ID, ((file.isDirectory()) ? Messages.zipOperation_error_directory Modified: trunk/gui/src/org/daisy/pipeline/gui/update/messages.properties =================================================================== --- trunk/gui/src/org/daisy/pipeline/gui/update/messages.properties 2008-01-04 16:02:25 UTC (rev 519) +++ trunk/gui/src/org/daisy/pipeline/gui/update/messages.properties 2008-01-25 15:49:59 UTC (rev 520) @@ -1,24 +1,51 @@ +################################################################################# +# Copyright (C) 2008 Daisy Consortium +# +# This library is free software; you can redistribute it and/or modify it under +# the terms of the GNU Lesser General Public License as published by the Free +# Software Foundation; either version 2.1 of the License, or (at your option) +# any later version. +# +# This library is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +# details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this library; if not, write to the Free Software Foundation, Inc., +# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +################################################################################# + +# --- Wizard Window --- wizard_title=Update Wizard -metadata_description_NA=Description not available. -metadata_version_NA=not specified + +# --- Zip Page UI Elements --- zipPage_title=Apply a ZIP Update Patch -zipPage_message_info=Select a ZIP archive containing the update patch to install. zipPage_path_label=Zip Update Patch: zipPage_descr_label=Description: zipPage_content_label=Content: +metadata_description_NA=Description not available. +metadata_version_NA=not specified + +# --- Dialogs --- +zipPage_dialog_ok_title=Update Succeeded +zipPage_dialog_ok_confirm=It is recommended that you restart the DAISY Pipeline GUI now for the update to take effect.\nWould you like to restart now ? zipPage_dialog_warning_version_title=Incompatible Version zipPage_dialog_warning_version_question=\nApplying this update patch could be harmful to the DAISY Pipeline installation.\n\nAre you sure you want to contine? +# --- Errors --- zipPage_dialog_error_title=Update Error zipPage_dialog_error_message=Could not apply the update patch. See the error log for details. +zipOperation_error_file=Could not update file: zipOperation_error_directory=Could not create directory: + +# --- Message Area --- +zipPage_message_info=Select a ZIP archive containing the update patch to install. +zipPage_message_warning_version=The version targeted by the selected update patch [{0}] does not match exactly the current version of the DAISY Pipeline [{1}]. +zipPage_message_metadataNA=Invalid update patch: properties not found. +zipPage_message_error_invalidZip=Invalid ZIP file. +zipPage_message_error_readAccess=ZIP file could not be read. + +# --- Operation --- zipOperation_monitor_mainTask=Applying update patch -zipPage_dialog_ok_title=Update Succeeded -zipOperation_error_file=Could not update file: -zipPage_dialog_ok_confirm=It is recommended that you restart the DAISY Pipeline GUI now for the update to take effect.\nWould you like to restart now ? -zipPage_message_error_invalidZip=Invalid Zip file. -zipPage_message_error_readAccess=Zip file could not be read. -zipPage_message_warning_version=The version targeted by the selected update patch [{0}] does not match exactly the current version of the DAISY Pipeline [{1}]. -zipOperation_error_globalMessage=Could not apply the update patch. See the error log for details. zipOperation_monitor_updatingDir=Updating directory zipOperation_monitor_updatingFile=Updating file -zipPage_message_metadataNA=Invalid ZIP update patch: properties not found. Modified: trunk/gui/src/org/daisy/pipeline/gui/util/messages.properties =================================================================== --- trunk/gui/src/org/daisy/pipeline/gui/util/messages.properties 2008-01-04 16:02:25 UTC (rev 519) +++ trunk/gui/src/org/daisy/pipeline/gui/util/messages.properties 2008-01-25 15:49:59 UTC (rev 520) @@ -1,3 +1,22 @@ +################################################################################# +# Copyright (C) 2008 Daisy Consortium +# +# This library is free software; you can redistribute it and/or modify it under +# the terms of the GNU Lesser General Public License as published by the Free +# Software Foundation; either version 2.1 of the License, or (at your option) +# any later version. +# +# This library is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +# details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this library; if not, write to the Free Software Foundation, Inc., +# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +################################################################################# + +# --- Actions --- action_forward=Forward action_forward_tooltip=Go to the next page action_browseBack_tooltip=Go to the previous page @@ -4,8 +23,13 @@ action_collapseAll=Collapse All action_expandAll=Expand All action_browseBack=Back + +# --- UI Elements --- button_browse=Browse... button_selectAll=Select All button_deselectAll=Deselect All +groupBy_categorySet_none=None + + +# --- Errors --- dialog_operationError={0} Error -groupBy_categorySet_none=None This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rom...@us...> - 2008-02-08 07:11:48
|
Revision: 527 http://daisymfcgui.svn.sourceforge.net/daisymfcgui/?rev=527&view=rev Author: romaindeltour Date: 2008-02-07 23:11:46 -0800 (Thu, 07 Feb 2008) Log Message: ----------- Minor fixes Modified Paths: -------------- trunk/gui/plugin.properties trunk/gui/plugin.xml Modified: trunk/gui/plugin.properties =================================================================== --- trunk/gui/plugin.properties 2008-02-08 07:10:20 UTC (rev 526) +++ trunk/gui/plugin.properties 2008-02-08 07:11:46 UTC (rev 527) @@ -147,7 +147,7 @@ command.runAll = Run All command.runAll.description = Run all the items command.toggleBrowser = Toggle Browser Focus -command.toggleBrowser.description = Set the in/out the browser widget +command.toggleBrowser.description = Set the focus in/out the browser widget command.update = Updates... command.update.description = Updates the Pipeline software and scripts command.showDoc = Documentation Modified: trunk/gui/plugin.xml =================================================================== --- trunk/gui/plugin.xml 2008-02-08 07:10:20 UTC (rev 526) +++ trunk/gui/plugin.xml 2008-02-08 07:11:46 UTC (rev 527) @@ -18,7 +18,7 @@ <product application="org.daisy.pipeline.gui.application" description="%product.description" - name="%product.name"> <property + name="DAISY Pipeline"> <property name="introTitle" value="%intro.title"/> <property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rom...@us...> - 2008-02-08 10:56:34
|
Revision: 529 http://daisymfcgui.svn.sourceforge.net/daisymfcgui/?rev=529&view=rev Author: romaindeltour Date: 2008-02-08 02:56:32 -0800 (Fri, 08 Feb 2008) Log Message: ----------- Added GUI support for the new INFO_FINER message type Modified Paths: -------------- trunk/gui/src/org/daisy/pipeline/gui/messages/MessageField.java trunk/gui/src/org/daisy/pipeline/gui/messages/Messages.java trunk/gui/src/org/daisy/pipeline/gui/messages/MessagesView.java Added Paths: ----------- trunk/gui/icons/message-filter-info-finer.gif trunk/gui/icons/message-info-finer.gif Added: trunk/gui/icons/message-filter-info-finer.gif =================================================================== (Binary files differ) Property changes on: trunk/gui/icons/message-filter-info-finer.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/gui/icons/message-info-finer.gif =================================================================== (Binary files differ) Property changes on: trunk/gui/icons/message-info-finer.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/gui/src/org/daisy/pipeline/gui/messages/MessageField.java =================================================================== --- trunk/gui/src/org/daisy/pipeline/gui/messages/MessageField.java 2008-02-08 07:32:27 UTC (rev 528) +++ trunk/gui/src/org/daisy/pipeline/gui/messages/MessageField.java 2008-02-08 10:56:32 UTC (rev 529) @@ -55,6 +55,8 @@ return GuiPlugin.getImage(IIconsKeys.MESSAGE_ERROR); case INFO: return GuiPlugin.getImage(IIconsKeys.MESSAGE_INFO); + case INFO_FINER: + return GuiPlugin.getImage(IIconsKeys.MESSAGE_INFO_FINER); case WARNING: return GuiPlugin.getImage(IIconsKeys.MESSAGE_WARNING); } Modified: trunk/gui/src/org/daisy/pipeline/gui/messages/Messages.java =================================================================== --- trunk/gui/src/org/daisy/pipeline/gui/messages/Messages.java 2008-02-08 07:32:27 UTC (rev 528) +++ trunk/gui/src/org/daisy/pipeline/gui/messages/Messages.java 2008-02-08 10:56:32 UTC (rev 529) @@ -89,6 +89,10 @@ public static String type_info; /** The name of the button to filter 'info' message type */ public static String type_info_filter; + /** The label of the 'info finer' message type */ + public static String type_info_finer; + /** The name of the button to filter 'info finer' message type */ + public static String type_info_finer_filter; /** The label of the 'warning' message type */ public static String type_warning; /** The name of the button to filter 'warning' message type */ @@ -137,6 +141,8 @@ return type_error_filter; case INFO: return type_info_filter; + case INFO_FINER: + return type_info_finer_filter; case WARNING: return type_warning_filter; default: @@ -177,6 +183,8 @@ return type_error; case INFO: return type_info; + case INFO_FINER: + return type_info_finer; case WARNING: return type_warning; default: Modified: trunk/gui/src/org/daisy/pipeline/gui/messages/MessagesView.java =================================================================== --- trunk/gui/src/org/daisy/pipeline/gui/messages/MessagesView.java 2008-02-08 07:32:27 UTC (rev 528) +++ trunk/gui/src/org/daisy/pipeline/gui/messages/MessagesView.java 2008-02-08 10:56:32 UTC (rev 529) @@ -49,263 +49,348 @@ import org.eclipse.ui.IViewSite; import org.eclipse.ui.PartInitException; +/** + * The implementation of the Messages view used to display the various messages + * output by the Pipeline. + * <p> + * This view consists in a table of messages. Messages are categorized by cause + * and type (see {@link MessageEvent.Cause} and {@link MessageEvent.Type}). + * They user can group or filter-out messages according to these categories. + * </p> + * + * @author Romain Deltour + * + */ public class MessagesView extends TableView { - private class ClearAction extends Action { + /** + * The Action that clears the message list. + */ + private class ClearAction extends Action { - public ClearAction() { - super(Messages.action_clearMessages, GuiPlugin - .createDescriptor(IIconsKeys.MESSAGE_CLEAR)); - } + /** + * Creates a new instance of the clear action. + */ + public ClearAction() { + super(Messages.action_clearMessages, GuiPlugin + .createDescriptor(IIconsKeys.MESSAGE_CLEAR)); + } - @Override - public void run() { - final Display display = getViewer().getTree().getDisplay(); - BusyIndicator.showWhile(display, new Runnable() { - public void run() { - MessageManager.getDefault().clear(); - display.asyncExec(new Runnable() { - public void run() { - getViewer().refresh(); - } - }); - } - }); - } + @Override + public void run() { + final Display display = getViewer().getTree().getDisplay(); + BusyIndicator.showWhile(display, new Runnable() { + public void run() { + MessageManager.getDefault().clear(); + display.asyncExec(new Runnable() { + public void run() { + getViewer().refresh(); + } + }); + } + }); + } - } + } - private class FilterDialogAction extends Action { + /** + * The Action to invoke the filter configuration dialog. + */ + private class FilterDialogAction extends Action { - public FilterDialogAction() { - super(Messages.action_filter, GuiPlugin - .createDescriptor(IIconsKeys.TREE_FILTER)); - } + /** + * Creates a new instance of this action. + */ + public FilterDialogAction() { + super(Messages.action_filter, GuiPlugin + .createDescriptor(IIconsKeys.TREE_FILTER)); + } - @Override - public void run() { - FilterDialog dialog = new FilterDialog(getSite().getShell(), filter); + @Override + public void run() { + FilterDialog dialog = new FilterDialog(getSite().getShell(), filter); - if (dialog.open() == IDialogConstants.OK_ID) { - getViewer().refresh(); - for (FilterToggleAction action : filterTypeActions) { - action.refresh(); - } - for (FilterToggleAction action : filterCauseActions) { - action.refresh(); - } - } - } + if (dialog.open() == IDialogConstants.OK_ID) { + getViewer().refresh(); + for (FilterToggleAction action : filterTypeActions) { + action.refresh(); + } + for (FilterToggleAction action : filterCauseActions) { + action.refresh(); + } + } + } - } + } - private class FilterToggleAction extends Action { + /** + * A generic Action to toggle the filtering of a category of messages (a + * cause or a type), backed up by an underlying {@link MessageFilter}. + */ + private class FilterToggleAction extends Action { - private boolean checked; - private MessageEvent.Cause cause; - private MessageEvent.Type type; + private boolean checked; + private MessageEvent.Cause cause; + private MessageEvent.Type type; - public FilterToggleAction(MessageEvent.Cause cause, ImageDescriptor icon) { - super(Messages.getFilterTip(cause), IAction.AS_CHECK_BOX); - setImageDescriptor(icon); - this.cause = cause; - refresh(); - } + /** + * Creates a new instance of this action for the given cause, with the + * given icon. + * + * @param cause + * The message cause this action will toggle the filtering of + * @param icon + * The icon of the action + */ + public FilterToggleAction(MessageEvent.Cause cause, ImageDescriptor icon) { + super(Messages.getFilterTip(cause), IAction.AS_CHECK_BOX); + setImageDescriptor(icon); + this.cause = cause; + refresh(); + } - public FilterToggleAction(MessageEvent.Type type, ImageDescriptor icon) { - super(Messages.getFilterTip(type), IAction.AS_CHECK_BOX); - setImageDescriptor(icon); - this.type = type; - refresh(); - } + /** + * Creates a new instance of this action for the given type, with the + * given icon. + * + * @param type + * The message type this action will toggle the filtering of + * @param icon + * The icon of the action + */ + public FilterToggleAction(MessageEvent.Type type, ImageDescriptor icon) { + super(Messages.getFilterTip(type), IAction.AS_CHECK_BOX); + setImageDescriptor(icon); + this.type = type; + refresh(); + } - public void refresh() { - if (cause != null) { - setChecked(!filter.isAccepted(cause)); - } else if (type != null) { - setChecked(!filter.isAccepted(type)); - } - this.checked = isChecked(); - } + /** + * Refresh the checked state of this action according to the state of + * the underlying {@link MessageFilter}. + */ + public void refresh() { + if (cause != null) { + setChecked(!filter.isAccepted(cause)); + } else if (type != null) { + setChecked(!filter.isAccepted(type)); + } + this.checked = isChecked(); + } - @Override - public void run() { - checked = !checked; - if (cause != null) { - filter.configure(cause, !checked); - } else if (type != null) { - filter.configure(type, !checked); - } - getViewer().refresh(); - } - } + @Override + public void run() { + checked = !checked; + if (cause != null) { + filter.configure(cause, !checked); + } else if (type != null) { + filter.configure(type, !checked); + } + getViewer().refresh(); + } + } - private class ScrollLockAction extends Action { + /** + * An Action to lock the scrolling of the message view. + */ + private class ScrollLockAction extends Action { - public ScrollLockAction() { - super(Messages.action_scrollLock, GuiPlugin - .createDescriptor(IIconsKeys.MESSAGE_SCROLL_LOCK)); - } + /** + * Creates a new instance of this action. + */ + public ScrollLockAction() { + super(Messages.action_scrollLock, GuiPlugin + .createDescriptor(IIconsKeys.MESSAGE_SCROLL_LOCK)); + } - @Override - public void run() { - locked = !locked; - } - } + @Override + public void run() { + locked = !locked; + } + } - public static final String ID = "org.daisy.pipeline.gui.views.messages"; //$NON-NLS-1$ - private static IMemento memento; - private MessageFilter filter; - private List<FilterToggleAction> filterTypeActions; - private List<FilterToggleAction> filterCauseActions; - private List<IAction> groupByActions; - private IAction filterDialogAction; - private IAction expandAllAction; - private IAction scrollLockAction; + /** The ID of this view (as used in plugin.xml) */ + public static final String ID = "org.daisy.pipeline.gui.views.messages"; //$NON-NLS-1$ + /** The memento used to save the state of this view (filtering, grouping) */ + private static IMemento memento; + /** The object that stores the filters configuration */ + private MessageFilter filter; + /** The list of actions used for toggling the type filters */ + private List<FilterToggleAction> filterTypeActions; + /** The list of actions used for toggling the cause filters */ + private List<FilterToggleAction> filterCauseActions; + /** The list of actions used for grouping messages */ + private List<IAction> groupByActions; + /** The action that invokes the filter configuration dialog */ + private IAction filterDialogAction; + /** The action to expand the messages tree */ + private IAction expandAllAction; + /** The action to lock the scrolling of the message list */ + private IAction scrollLockAction; + /** The action to collapse the messages tree */ + private IAction collapseAllAction; + /** The action to clear the message list */ + private IAction clearAction; + /** The action to export the messages to a text file */ + private IAction exportAction; + /** Whether the scrolling is locked */ + private boolean locked; - private IAction collapseAllAction; + @Override + protected void createActions() { + super.createActions(); + // Filter actions + filterDialogAction = new FilterDialogAction(); + filterTypeActions = new LinkedList<FilterToggleAction>(); + for (MessageEvent.Type type : MessageEvent.Type.values()) { + filterTypeActions.add(new FilterToggleAction(type, getIcon(type))); + } + filterCauseActions = new LinkedList<FilterToggleAction>(); + for (MessageEvent.Cause cause : MessageEvent.Cause.values()) { + filterCauseActions + .add(new FilterToggleAction(cause, getIcon(cause))); + } + // Group by actions + List<CategorySet> cats = createCategorySets(); + groupByActions = new LinkedList<IAction>(); + for (CategorySet cat : cats) { + groupByActions.add(new GroupByAction(cat, getViewer())); + } + // Expand/Collapse Action + expandAllAction = new ExpandAllAction(getViewer()); + collapseAllAction = new CollapseAllAction(getViewer()); + // Clear/Export Action + clearAction = new ClearAction(); + exportAction = new ExportAction(); + scrollLockAction = new ScrollLockAction(); + } - private IAction clearAction; + /** + * Creates the {@link CategorySet}s used to group the messages. + * + * @return The list of <code>CategorySet</code> used in this view. + */ + private List<CategorySet> createCategorySets() { + List<CategorySet> cats = new ArrayList<CategorySet>(); + cats.add(new CauseCategorySet()); + cats.add(new TypeCategorySet()); + cats.add(new JobCategorySet()); + cats.add(CategorySet.NONE); + return cats; + } - private IAction exportAction; - private boolean locked; + @Override + protected ITreeContentProvider createContentProvider() { + return new MessagesContentProvider(this); + } - @Override - public void init(IViewSite site, IMemento memento) throws PartInitException { - super.init(site, memento); - MessagesView.memento = memento; - } + @Override + protected ViewerFilter[] createFilters() { + ViewerFilter[] superFilters = super.createFilters(); + filter = new MessageFilter(); + filter.init(memento); + ViewerFilter[] filters = new ViewerFilter[superFilters.length + 1]; + System.arraycopy(superFilters, 0, filters, 0, superFilters.length); + filters[filters.length - 1] = filter; + return filters; + } - public boolean isLocked() { - return locked; - } + @Override + protected Object createViewerInput() { + return MessageManager.getDefault(); + } - @Override - public void saveState(IMemento memento) { - super.saveState(memento); - filter.saveState(memento); - } + @Override + protected ITableField[] getFields() { + return new ITableField[] { new MessageField(), new TypeField() }; + } - public void setLocked(boolean locked) { - this.locked = locked; - } + private ImageDescriptor getIcon(Cause cause) { + switch (cause) { + case INPUT: + return GuiPlugin.createDescriptor(IIconsKeys.MESSAGE_FILTER_INPUT); + case SYSTEM: + return GuiPlugin.createDescriptor(IIconsKeys.MESSAGE_FILTER_SYSTEM); + default: + return null; + } + } - private List<CategorySet> createCategorySets() { - List<CategorySet> cats = new ArrayList<CategorySet>(); - cats.add(new CauseCategorySet()); - cats.add(new TypeCategorySet()); - cats.add(new JobCategorySet()); - cats.add(CategorySet.NONE); - return cats; - } + private ImageDescriptor getIcon(Type type) { + switch (type) { + case DEBUG: + return GuiPlugin.createDescriptor(IIconsKeys.MESSAGE_FILTER_DEBUG); + case ERROR: + return GuiPlugin.createDescriptor(IIconsKeys.MESSAGE_FILTER_ERROR); + case INFO: + return GuiPlugin.createDescriptor(IIconsKeys.MESSAGE_FILTER_INFO); + case INFO_FINER: + return GuiPlugin + .createDescriptor(IIconsKeys.MESSAGE_FILTER_INFO_FINER); + case WARNING: + return GuiPlugin + .createDescriptor(IIconsKeys.MESSAGE_FILTER_WARNING); + default: + return null; + } + } - private ImageDescriptor getIcon(Cause cause) { - switch (cause) { - case INPUT: - return GuiPlugin.createDescriptor(IIconsKeys.MESSAGE_FILTER_INPUT); - case SYSTEM: - return GuiPlugin.createDescriptor(IIconsKeys.MESSAGE_FILTER_SYSTEM); - default: - return null; - } - } + @Override + public void init(IViewSite site, IMemento memento) throws PartInitException { + super.init(site, memento); + MessagesView.memento = memento; + } - private ImageDescriptor getIcon(Type type) { - switch (type) { - case DEBUG: - return GuiPlugin.createDescriptor(IIconsKeys.MESSAGE_FILTER_DEBUG); - case ERROR: - return GuiPlugin.createDescriptor(IIconsKeys.MESSAGE_FILTER_ERROR); - case INFO: - return GuiPlugin.createDescriptor(IIconsKeys.MESSAGE_FILTER_INFO); - case WARNING: - return GuiPlugin - .createDescriptor(IIconsKeys.MESSAGE_FILTER_WARNING); - default: - return null; - } - } + @Override + protected void initMenu(IMenuManager menu) { + super.initMenu(menu); + menu.add(filterDialogAction); + IMenuManager groupByMenu = new MenuManager(Messages.menu_groupBy); + menu.add(groupByMenu); + for (IAction action : groupByActions) { + groupByMenu.add(action); + } + } - @Override - protected void createActions() { - super.createActions(); - // Filter actions - filterDialogAction = new FilterDialogAction(); - filterTypeActions = new LinkedList<FilterToggleAction>(); - for (MessageEvent.Type type : MessageEvent.Type.values()) { - filterTypeActions.add(new FilterToggleAction(type, getIcon(type))); - } - filterCauseActions = new LinkedList<FilterToggleAction>(); - for (MessageEvent.Cause cause : MessageEvent.Cause.values()) { - filterCauseActions - .add(new FilterToggleAction(cause, getIcon(cause))); - } - // Group by actions - List<CategorySet> cats = createCategorySets(); - groupByActions = new LinkedList<IAction>(); - for (CategorySet cat : cats) { - groupByActions.add(new GroupByAction(cat, getViewer())); - } - // Expand/Collpase Action - expandAllAction = new ExpandAllAction(getViewer()); - collapseAllAction = new CollapseAllAction(getViewer()); - // Clear/Export Action - clearAction = new ClearAction(); - exportAction = new ExportAction(); - scrollLockAction = new ScrollLockAction(); - } + @Override + protected void initToolBar(IToolBarManager toolbar) { + super.initToolBar(toolbar); + toolbar.add(expandAllAction); + toolbar.add(collapseAllAction); + toolbar.add(new Separator()); + for (FilterToggleAction action : filterTypeActions) { + toolbar.add(action); + } + for (FilterToggleAction action : filterCauseActions) { + toolbar.add(action); + } + toolbar.add(new Separator()); + toolbar.add(exportAction); + toolbar.add(clearAction); + toolbar.add(scrollLockAction); + } - @Override - protected ITreeContentProvider createContentProvider() { - return new MessagesContentProvider(this); - } + /** + * Whether the scrolling of this view is locked. + * + * @return <code>true</code> if and only if the scrolling is locked. + */ + public boolean isLocked() { + return locked; + } - @Override - protected ViewerFilter[] createFilters() { - ViewerFilter[] superFilters = super.createFilters(); - filter = new MessageFilter(); - filter.init(memento); - ViewerFilter[] filters = new ViewerFilter[superFilters.length + 1]; - System.arraycopy(superFilters, 0, filters, 0, superFilters.length); - filters[filters.length - 1] = filter; - return filters; - } + @Override + public void saveState(IMemento memento) { + super.saveState(memento); + filter.saveState(memento); + } - @Override - protected Object createViewerInput() { - return MessageManager.getDefault(); - } - - @Override - protected ITableField[] getFields() { - return new ITableField[] { new MessageField(), new TypeField() }; - } - - @Override - protected void initMenu(IMenuManager menu) { - super.initMenu(menu); - menu.add(filterDialogAction); - IMenuManager groupByMenu = new MenuManager(Messages.menu_groupBy); - menu.add(groupByMenu); - for (IAction action : groupByActions) { - groupByMenu.add(action); - } - } - - @Override - protected void initToolBar(IToolBarManager toolbar) { - super.initToolBar(toolbar); - toolbar.add(expandAllAction); - toolbar.add(collapseAllAction); - toolbar.add(new Separator()); - for (FilterToggleAction action : filterTypeActions) { - toolbar.add(action); - } - for (FilterToggleAction action : filterCauseActions) { - toolbar.add(action); - } - toolbar.add(new Separator()); - toolbar.add(exportAction); - toolbar.add(clearAction); - toolbar.add(scrollLockAction); - } + /** + * Lock or unlock the scrolling of this view. + * + * @param locked + * whether the view should be locked or unlocked. + */ + public void setLocked(boolean locked) { + this.locked = locked; + } } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rom...@us...> - 2008-04-12 10:15:49
|
Revision: 549 http://daisymfcgui.svn.sourceforge.net/daisymfcgui/?rev=549&view=rev Author: romaindeltour Date: 2008-04-12 03:15:46 -0700 (Sat, 12 Apr 2008) Log Message: ----------- Updated the version strings Modified Paths: -------------- trunk/gui/META-INF/MANIFEST.MF trunk/gui/pipeline.product trunk/gui/plugin.properties Modified: trunk/gui/META-INF/MANIFEST.MF =================================================================== --- trunk/gui/META-INF/MANIFEST.MF 2008-04-12 10:11:05 UTC (rev 548) +++ trunk/gui/META-INF/MANIFEST.MF 2008-04-12 10:15:46 UTC (rev 549) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %bundle.name Bundle-SymbolicName: org.daisy.pipeline.gui;singleton:=true -Bundle-Version: 1.0.2 +Bundle-Version: 1.0.3 Bundle-Vendor: %bundle.vendor Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, Modified: trunk/gui/pipeline.product =================================================================== --- trunk/gui/pipeline.product 2008-04-12 10:11:05 UTC (rev 548) +++ trunk/gui/pipeline.product 2008-04-12 10:15:46 UTC (rev 549) @@ -68,7 +68,7 @@ </plugins> <features> - <feature id="org.daisy.pipeline.gui" version="1.0.2"/> + <feature id="org.daisy.pipeline.gui" version="1.0.3"/> <feature id="org.eclipse.rcp" version="3.3.2.R33x_r20071022-8y8eE9CEV3FspP8HJrY1M2dS"/> <feature id="org.eclipse.rcp.additions" version="3.3.2.200712191738"/> </features> Modified: trunk/gui/plugin.properties =================================================================== --- trunk/gui/plugin.properties 2008-04-12 10:11:05 UTC (rev 548) +++ trunk/gui/plugin.properties 2008-04-12 10:15:46 UTC (rev 549) @@ -29,8 +29,7 @@ product.description = Product for the DAISY Pipeline GUI application product.about =DAISY Pipeline GUI\n\ \n\ -GUI Version: 1.0.2\n\ -Core Version: 20071221\n\ +Version: 20080502 Beta 1\n\ \n\ (c) Copyright The DAISY Consortium 2006. All rights reserved.\n\ Visit http://www.daisy.org\n\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rom...@us...> - 2008-04-28 07:07:48
|
Revision: 553 http://daisymfcgui.svn.sourceforge.net/daisymfcgui/?rev=553&view=rev Author: romaindeltour Date: 2008-04-28 00:07:46 -0700 (Mon, 28 Apr 2008) Log Message: ----------- Added a command for switching the language Modified Paths: -------------- trunk/gui/plugin.properties trunk/gui/plugin.xml Added Paths: ----------- trunk/gui/icons/lang-en.gif trunk/gui/icons/lang-hi.gif trunk/gui/src/org/daisy/pipeline/gui/language/ Added: trunk/gui/icons/lang-en.gif =================================================================== (Binary files differ) Property changes on: trunk/gui/icons/lang-en.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/gui/icons/lang-hi.gif =================================================================== (Binary files differ) Property changes on: trunk/gui/icons/lang-hi.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/gui/plugin.properties =================================================================== --- trunk/gui/plugin.properties 2008-04-26 10:55:27 UTC (rev 552) +++ trunk/gui/plugin.properties 2008-04-28 07:07:46 UTC (rev 553) @@ -131,6 +131,8 @@ command.cancelAll.description = Cancel all the items command.clearFinished = Clear Finished Jobs command.clearFinished.description = Clear all the finished jobs +command.language = Language +command.language.description = Change the locale setting command.moveDown = Move Down command.moveDow.description = Move down the selection command.moveToBottom = Move To Bottom @@ -153,3 +155,9 @@ command.showDoc.description = Open the Documentation Perspective command.showDoc.param.handleWarning = Handle Warning +# --- Language --- + +language.default=(default) +language.english=English +language.hindi=Hindi + Modified: trunk/gui/plugin.xml =================================================================== --- trunk/gui/plugin.xml 2008-04-26 10:55:27 UTC (rev 552) +++ trunk/gui/plugin.xml 2008-04-28 07:07:46 UTC (rev 553) @@ -470,6 +470,18 @@ optional="false"> </commandParameter> </command> + <command + categoryId="org.eclipse.ui.category.window" + defaultHandler="org.daisy.pipeline.gui.language.LanguageSwitchHandler" + description="%command.language.description" + id="org.daisy.pipeline.gui.command.language" + name="%command.language"> + <commandParameter + id="org.daisy.gui.language.locale" + name="locale" + optional="true"> + </commandParameter> + </command> </extension> <extension point="org.eclipse.ui.commandImages"> @@ -537,6 +549,38 @@ commandId="org.daisy.pipeline.gui.command.update"> </command> </menuContribution> + <menuContribution + locationURI="menu:window?after=additions"> + <menu + label="%command.language" + mnemonic="L"> + <command + commandId="org.daisy.pipeline.gui.command.language" + label="%language.default" + style="radio"> + </command> + <command + commandId="org.daisy.pipeline.gui.command.language" + icon="icons/lang-en.gif" + label="%language.english" + style="radio"> + <parameter + name="org.daisy.gui.language.locale" + value="en"> + </parameter> + </command> + <command + commandId="org.daisy.pipeline.gui.command.language" + icon="icons/lang-hi.gif" + label="%language.hindi" + style="radio"> + <parameter + name="org.daisy.gui.language.locale" + value="hi"> + </parameter> + </command> + </menu> + </menuContribution> </extension> <extension point="org.eclipse.ui.newWizards"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rom...@us...> - 2008-05-02 16:04:11
|
Revision: 575 http://daisymfcgui.svn.sourceforge.net/daisymfcgui/?rev=575&view=rev Author: romaindeltour Date: 2008-05-02 09:03:48 -0700 (Fri, 02 May 2008) Log Message: ----------- Added CLI launchers in the GUI deployment Added Paths: ----------- trunk/gui/cli/ trunk/gui/cli/pipeline.bat trunk/gui/cli/pipeline.sh Added: trunk/gui/cli/pipeline.bat =================================================================== --- trunk/gui/cli/pipeline.bat (rev 0) +++ trunk/gui/cli/pipeline.bat 2008-05-02 16:03:48 UTC (rev 575) @@ -0,0 +1,8 @@ +@echo off + +rem This is the path to Java. Edit this variable to suite your needs. +set JAVA=java + +echo. +%JAVA% -classpath "../plugins/org.daisy.pipeline_1.0.3/daisy-pipeline.jar";"../plugins/org.daisy.pipeline_1.0.3/" org.daisy.pipeline.ui.CommandLineUI %1 %2 %3 %4 %5 %6 %7 %8 %9 +echo. Added: trunk/gui/cli/pipeline.sh =================================================================== --- trunk/gui/cli/pipeline.sh (rev 0) +++ trunk/gui/cli/pipeline.sh 2008-05-02 16:03:48 UTC (rev 575) @@ -0,0 +1,48 @@ +#!/bin/bash +############################################ +# Simple launch script for the command line +# version of the Daisy Pipeline +############################################ + +# This is the path to Java. Edit this variable to suite your needs. +JAVA=`which java 2> /dev/null` +#JAVA=/opt/jre1.5.0_04/bin/java + + + + +# Test java version +if [ -n "$JAVA" ] +then + JAVAVERSION=`$JAVA -version 2>&1 | grep version | cut -d '"' -f 2 | cut -d '.' -f 1-2` + JAVAMAJOR=`echo $JAVAVERSION | cut -d '.' -f 1` + JAVAMINOR=`echo $JAVAVERSION | cut -d '.' -f 2` + if [ $JAVAMAJOR -lt 1 -o $JAVAMINOR -lt 5 ] + then + echo + echo "Error: This application requires Java 5 (or later) to run. Only" + echo " version $JAVAVERSION was found on your system path. Make sure" + echo " Java 5 (or later) is installed on the system and edit this" + echo " pipeline.sh script to insert the path to the 'java' command." + echo + echo " Current (incorrect) java path: $JAVA" + echo + exit 1 + fi +else + echo + echo "Error: Java 5 was not found on your system path. Make sure Java 5" + echo " (or later) is installed on the system and edit this" + echo " pipelins.sh script to insert the path to the 'java' command." + echo + exit 1 +fi + + + +# Set classpath +DIR=`dirname $0` +CP="$DIR/../plugins/org.daisy.pipeline_1.0.3/daisy-pipeline.jar":"$DIR/../plugins/org.daisy.pipeline_1.0.3/daisy-util.jar":"$DIR/../plugins/org.daisy.pipeline_1.0.3/" + +# Execute Daisy Pipeline +$JAVA -classpath $CP org.daisy.pipeline.ui.CommandLineUI "$@" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |