[Xerte-dev] Re: Outstanding stuff

Fri Jun 22 15:14:34 BST 2012

I did an update before I made any changes.

I have run an update after the commit but the ! are still hanging around.

According to the svn help the ! means

The *Modified* overlay represents the modified state, where you have made
local modifications, the merged state, where changes from the repository
have been merged with local changes, and the replaced state, where a file
has been deleted and replaced by another different file with the same name.

If I remember correctly I copied the files from the pageWizards / models
folder to the runtime / pages / models folder by highlighting the files in
the pageWizards / models folder, right clicking and selecting copy, then
right clicking on the destination folder and selecting Tortoise SVN / paste.

The tortoise svn help says

You can also copy or move versioned files within a working copy, or between
two working copies, using the familiar cut-and-paste method. Use the
standard Windows Copy or Cut to copy one or more versioned items to the
clipboard. If the clipboard contains such versioned items, you can then use
TortoiseSVN → Paste (note: not the standard Windows Paste) to copy or move
those items to the new working copy location.
"Try and get your repo to not show those !s, otherwise you’re gonna get in
a mess."

I am not sure how to get rid of the ! now. However if there is no problem
with the Xerte svn i.e. the source from which I am now updating from and
committing too, then I could just scrap my local copy and create a new
local copy. Would that not sort it out?

Kind regards

Johnathan

On 22 June 2012 14:10, Julian Tenney <Julian.Tenney at nottingham.ac.uk> wrote:

> Try and get your repo to not show those !s, otherwise you’re gonna get in
> a mess.
>
>
>
> Try an update. Remember not to copy files directly within the repo
> otherwise the links to them the repo manages get copied as well: to
> duplicate files, export them, then add them as fresh files to the
> repository (this is important).
>
>
>
> Always do an update before any commits.
>
>
>
> *From:* xerte-dev-bounces at lists.nottingham.ac.uk [mailto:
> xerte-dev-bounces at lists.nottingham.ac.uk] *On Behalf Of *Kemp Johnathan
> *Sent:* 22 June 2012 14:07
>
> *To:* For Xerte technical developers
> *Subject:* [Xerte-dev] Re: Outstanding stuff
>
>
>
> I have now completed the first phase of retiring the pageWizard folder of
> the xerte svn
>
>
>
> I have set up the xerte svn / runtime / pages / folder to act as the
> definitive source for model (.rlm) and wizard (.xwd) files.
>
>
>
> It should now be possible to duplicate the experience of running an
> installed version of xerte by running the xerte.exe from the runtime folder.
>
>
>
> I have not removed anything from the pageWizards folder as I would prefer
> to wait to do this until Julian and Tom have confirmed that they are happy
> that all is OK with the changes to the runtime / pages folder.
>
>
>
> Once I know everyone is happy :-) then I will delete the duplicated
> folders from the pageWizard section. It would be helpful if this can be
> confirmed as soon as possible so that we can minimise the time when two
> sets of duplicated files are available with the potential for confusion
> this can present.
>
>
>
> There are a few points to note.
>
>
>
> 1.      Once we move to the new version the svn folder templates /
> pageTemplates / will become redundant as pageTemplates type projects will
> be generated from the existing models and wizards folders rather than
> packaged in an xtp file.
>
> 2.      the current versions of template.xml (i.e. in runtime / pages and
> in templates / pageTemplates ) both contain some page definitions that need
> removing in order to present the user with an empty project. There is also
> a reference to language="en-GB" - should this be language="en-gb"?
>
> 3.      The current xerte svn / pages / folder contains a folder called
> "mapstraction" which is not currently contained in the xerte beta.
>
> 4.      It appears that the Xerte svn / pageWizards / nl-nl folder is not
> up to date when compared with the xerte.exe beta set of nl-nl files. So it
> may be that the nl-nl files are being worked on outside of the repository?
> So for now I have copied the xwd files from the Xerte beta nl-nl folder
> into xerte svn / runtime / pages / wizards / nl-nl
>
> 5.      My copy of the xerte svn is showing ! marks against the model
> files in runtime / pages / models / is this indicative of any issue that
> needs resolving?
>
> Kind regards
>
>
>
> Johnathan
>
>
>
>
>
>
>
>
>
> On 22 June 2012 12:03, Julian Tenney <Julian.Tenney at nottingham.ac.uk>
> wrote:
>
>
>
> Not sure, probably not. It willsee them as new files, and the old files as
> deleted. I think you can ;’move’ stuff within the repo though – That
> software is pretty clever, I’d be amazed they hadn’t thought of stuff like
> this…
>
>
>
> One thing, as a commiter I’m not sure if you can change the project
> structure, so let me know if you can’t add / remove folders.
>
>
>
> *From:* xerte-dev-bounces at lists.nottingham.ac.uk [mailto:
> xerte-dev-bounces at lists.nottingham.ac.uk] *On Behalf Of *Kemp Johnathan
>
> *Sent:* 22 June 2012 12:01
>
> *To:* For Xerte technical developers
>
> *Subject:* [Xerte-dev] Re: Outstanding stuff
>
>
>
> OK will do.
>
>
>
> With respect to how turtle svn works
>
>
>
> If I create a folder in "en-gb" in Xerte svn / runtime / pages / wizards /
>
>
>
> and then copy all the contents ( including the .svn folder ) of the  xerte
> svn / runtime / pageWizards / en-GB folder  into the new en-gb folder ,
>
>
>
> will this preserve the update history of the files now that they are in a
> new location?
>
>
>
> Kind regards
>
>
>
> Johnathan
>
>
>
>
>
> On 22 June 2012 11:18, Julian Tenney <Julian.Tenney at nottingham.ac.uk>
> wrote:
>
> Then go ahead and set up the runtime folder as you need it: it should be
> an exact copy of the installed folder, so we can easily run the exe and
> have a developer’s xerte run on your machines for testing etc,
>
>
>
> *From:* xerte-dev-bounces at lists.nottingham.ac.uk [mailto:
> xerte-dev-bounces at lists.nottingham.ac.uk] *On Behalf Of *Kemp Johnathan
>
> *Sent:* 22 June 2012 11:15
>
> *To:* For Xerte technical developers
>
> *Subject:* [Xerte-dev] Re: Outstanding stuff
>
>
>
> The pages only display once you have created a pages project.
>
>
>
> A word of warning.
>
>
>
> You may recall some discussions from a while back regarding the location
> of the latest rlm and xwd files.
>
>
>
> The latest files are still in
>
>
>
> Xerte svn / pageWizards / models
>
> Xerte svn / pageWizards / en-GB
>
>
>
> The beta release of Xerte has the following folder structure
>
>
>
> Xerte / pages / models
>
> Xerte / pages / wizards / en-gb
>
>
>
> The runtime folder has the structure
>
>
>
> Xerte svn / runtime / pages / models
>
> Xerte svn / runtime / wizards / en
>
>
>
> This means that if you try running xerte.exe from the runtime folder that
> at present you are likely to hit two problems
>
> 1.      The folder structure for locating the wizards does not match the
> release version expectations
>
> 2.      Many of the model and xwd files are not the latest version.
>
> I think that the sooner we can have the runtime section set up to mirror
> the release version, with the same folder structure and the most recent set
> of files the better.
>
>
>
> During the development I believe Tom has preferred to work in the
> pageWizards section and I have carried out my development work in that
> section. IMHO as we now move towards releasing the next version part of the
> tidying up process must be to retire the pageWizards section and to have
> the runtime section as the definitive source of all files.
>
>
>
> It was always my intention, when I set up the pageWizards folder in the
> svn that this would be temporary.
>
>
>
> I don't mind carrying out the tidy up, but have not done so because I
> don't want to lose any versioning history or to cause any confusion whilst
> development is still taking place.
>
>
>
> " We need some documentation here."
>
>
>
> I have put some documentation together for the new page types that I have
> been responsible for.
>
>
>
> I can put together a brief explanation about how to create a pages
> project, unless you prefer to include this in the help file.
>
>
>
> Kind regards
>
>
>
> Johnathan
>
>
>
> On 22 June 2012 08:57, Julian Tenney <Julian.Tenney at nottingham.ac.uk>
> wrote:
>
> Silly question time: when I run xerte from /runtime/Xerte.exe, why don’t I
> see all the pages on the menu?
>
>
>
> Do I need to create a pages project before I can see them / add one ?
>
>
>
> We need some documentation here.
>
>
>
> *From:* xerte-dev-bounces at lists.nottingham.ac.uk [mailto:
> xerte-dev-bounces at lists.nottingham.ac.uk] *On Behalf Of *Dave Burnett
>
> *Sent:* 21 June 2012 17:50
>
> *To:* xerte-dev at lists.nottingham.ac.uk
>
> *Subject:* [Xerte-dev] Re: Outstanding stuff
>
>
>
> >It appears that for some reason once you open a page form and do View /
> Preview and then close the form, the View / Preview menu option stops
> working - no idea why.
>
>
>
> Perhaps some code that prevents spawning of multiple preview windows not
> being initialized?
>
>
>
> I have code at the top of some pages that says "if you've already run this
> logic (duplicate some pages) don't do it again".
>
> I trip myself up occasionally when I place other code *that I do want
> executed each time* inside that condition.
>
>
>
> So, what condition(s) must hold in order for View/Preview to function?
>
> Can we display the state of those conditions while we run through multiple
> View/Preview cycles?
>
>
>
>
> ------------------------------
>
> Date: Thu, 21 Jun 2012 17:31:01 +0100
>
> From: johnathan.kemp at ntlworld.com
>
> To: xerte-dev at lists.nottingham.ac.uk
>
> Subject: [Xerte-dev] Re: Outstanding stuff
>
> I have taken a copy of the wizard.swf file from the xerte svn
> runtime/tools folder and swapped it into my xerte installation and the
> problem does not appear to be fixed.
>
>
>
> However the problem is a little more subtle than I first realised.
>
>
>
> Open Xerte
>
> Open a pages project (I used one with a plain text page that had been
> added to the default project)
>
> Open the wizard for the plain text page
>
> In the wizard form for the page do View / Preview (result - the preview
> works)
>
> Close the preview.
>
> Do View Preview in the page wizard form (again preview works)
>
> Close the page wizard form.
>
> Open the page wizard form once more.
>
> Do View Preview in the page wizard form (preview fails to take place)
>
> Use the forms play button instead and preview will work.
>
>
>
> It appears that for some reason once you open a page form and do View /
> Preview and then close the form, the View / Preview menu option stops
> working - no idea why.
>
>
>
> Kind regards
>
>
>
> Johnathan
>
>
>
>
>
>
>
> On 21 June 2012 14:45, Julian Tenney <Julian.Tenney at nottingham.ac.uk>
> wrote:
>
> It’s in the wizard, towwards the bottom of the code, search for
> ‘viewMenu’, I think that’ll drop you right in…
>
>
>
> *From:* xerte-dev-bounces at lists.nottingham.ac.uk [mailto:
> xerte-dev-bounces at lists.nottingham.ac.uk] *On Behalf Of *Kemp Johnathan
>
> *Sent:* 21 June 2012 14:28
>
> *To:* For Xerte technical developers
>
> *Subject:* [Xerte-dev] Re: Outstanding stuff
>
>
>
> Re: the preview link
>
>
>
> Which file would this relate to editor.swf?
>
>
>
> I found the fault in the beta release I downloaded from Tom's site.
>
>
>
> If you confirm which file this code is in I will substitute the latest
> version from the svn in my Xerte install and then test again.
>
>
>
> Kind regards
>
>
>
> Johnathan
>
>
>
>
>
>
>
> On 21 June 2012 10:34, Julian Tenney <Julian.Tenney at nottingham.ac.uk>
> wrote:
>
> Hi,
>
>
>
> I know we are waiting on some final finishing off, : I just looked at the
> spreadsheet: re issue 4, the icons for the new pages wizards in the editor:
> I put those symbols in the editor library so it might just need rebuilding?
>
>
>
> Re: the preview link not working from the menu: I can’t see anything wrong
> with this???
>
>
>
> viewMenuListener.change = function(obj) {
>
>        if (obj.menuItem.attributes.label ==
> languageData.viewmenu[0].menuPreview) {
>
>               preview();
>
>        }
>
> }
>
>
>
> So not sure if this I still an issue?
>
>
>
> Last few things – let’s get this finished now,
>
>
>
> J
>
>
>
> This message and any attachment are intended solely for the addressee and
> may contain confidential information. If you have received this message in
> error, please send it back to me, and immediately delete it. Please do not
> use, copy or disclose the information contained in this message or in any
> attachment. Any views or opinions expressed by the author of this email do
> not necessarily reflect the views of the University of Nottingham.
>
> This message has been checked for viruses but the contents of an
> attachment may still contain software viruses which could damage your
> computer system: you are advised to perform your own checks. Email
> communications with the University of Nottingham may be monitored as
> permitted by UK legislation.
>
> _______________________________________________
>
> Xerte-dev mailing list
>
> Xerte-dev at lists.nottingham.ac.uk
>
> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>
>
>
> This message and any attachment are intended solely for the addressee and
> may contain confidential information. If you have received this message in
> error, please send it back to me, and immediately delete it.   Please do
> not use, copy or disclose the information contained in this message or in
> any attachment.  Any views or opinions expressed by the author of this
> email do not necessarily reflect the views of the University of Nottingham.
>
>
>
> This message has been checked for viruses but the contents of an attachment
>
> may still contain software viruses which could damage your computer system:
>
> you are advised to perform your own checks. Email communications with the
>
> University of Nottingham may be monitored as permitted by UK legislation.
>
>
>
> _______________________________________________
>
> Xerte-dev mailing list
>
> Xerte-dev at lists.nottingham.ac.uk
>
> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>
>
>
> This message and any attachment are intended solely for the addressee and
> may contain confidential information. If you have received this message in
> error, please send it back to me, and immediately delete it.   Please do
> not use, copy or disclose the information contained in this message or in
> any attachment.  Any views or opinions expressed by the author of this
> email do not necessarily reflect the views of the University of Nottingham.
>
>
>
> This message has been checked for viruses but the contents of an attachment
>
> may still contain software viruses which could damage your computer system:
>
> you are advised to perform your own checks. Email communications with the
>
> University of Nottingham may be monitored as permitted by UK legislation.
>
>
>
> _______________________________________________ Xerte-dev mailing list
> Xerte-dev at lists.nottingham.ac.uk
> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev This message and
> any attachment are intended solely for the addressee and may contain
> confidential information. If you have received this message in error,
> please send it back to me, and immediately delete it. Please do not use,
> copy or disclose the information contained in this message or in any
> attachment. Any views or opinions expressed by the author of this email do
> not necessarily reflect the views of the University of Nottingham. This
> message has been checked for viruses but the contents of an attachment may
> still contain software viruses which could damage your computer system: you
> are advised to perform your own checks. Email communications with the
> University of Nottingham may be monitored as permitted by UK legislation.
>
> _______________________________________________
>
> Xerte-dev mailing list
>
> Xerte-dev at lists.nottingham.ac.uk
>
> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>
>
>
> This message and any attachment are intended solely for the addressee and
> may contain confidential information. If you have received this message in
> error, please send it back to me, and immediately delete it.   Please do
> not use, copy or disclose the information contained in this message or in
> any attachment.  Any views or opinions expressed by the author of this
> email do not necessarily reflect the views of the University of Nottingham.
>
>
>
> This message has been checked for viruses but the contents of an attachment
>
> may still contain software viruses which could damage your computer system:
>
> you are advised to perform your own checks. Email communications with the
>
> University of Nottingham may be monitored as permitted by UK legislation.
>
>
>
> _______________________________________________
>
> Xerte-dev mailing list
>
> Xerte-dev at lists.nottingham.ac.uk
>
> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>
>
>
> This message and any attachment are intended solely for the addressee and
> may contain confidential information. If you have received this message in
> error, please send it back to me, and immediately delete it.   Please do
> not use, copy or disclose the information contained in this message or in
> any attachment.  Any views or opinions expressed by the author of this
> email do not necessarily reflect the views of the University of Nottingham.
>
>
>
> This message has been checked for viruses but the contents of an attachment
>
> may still contain software viruses which could damage your computer system:
>
> you are advised to perform your own checks. Email communications with the
>
> University of Nottingham may be monitored as permitted by UK legislation.
>
>
>
>
>
> _______________________________________________
>
> Xerte-dev mailing list
>
> Xerte-dev at lists.nottingham.ac.uk
>
> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>
>
>
> This message and any attachment are intended solely for the addressee and
> may contain confidential information. If you have received this message in
> error, please send it back to me, and immediately delete it.   Please do
> not use, copy or disclose the information contained in this message or in
> any attachment.  Any views or opinions expressed by the author of this
> email do not necessarily reflect the views of the University of Nottingham.
>
>
>
> This message has been checked for viruses but the contents of an attachment
>
> may still contain software viruses which could damage your computer system:
>
> you are advised to perform your own checks. Email communications with the
>
> University of Nottingham may be monitored as permitted by UK legislation.
>
>
>
>
>
>
>
>
>
> _______________________________________________
> Xerte-dev mailing list
> Xerte-dev at lists.nottingham.ac.uk
> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>
> This message and any attachment are intended solely for the addressee and
> may contain confidential information. If you have received this message in
> error, please send it back to me, and immediately delete it.   Please do
> not use, copy or disclose the information contained in this message or in
> any attachment.  Any views or opinions expressed by the author of this
> email do not necessarily reflect the views of the University of Nottingham.
>
> This message has been checked for viruses but the contents of an attachment
> may still contain software viruses which could damage your computer system:
> you are advised to perform your own checks. Email communications with the
> University of Nottingham may be monitored as permitted by UK legislation.
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.nottingham.ac.uk/pipermail/xerte-dev/attachments/20120622/4c9aebc2/attachment-0001.html>