Re: Moving LyX XMPP Chat to features/chat2

2014-05-04 Thread Tommaso Cucinotta
On 28/04/14 08:10, Vincent van Ravesteijn wrote: > > + /// > > + Dialog * findOrBuild(std::string const & name, bool hide_it); > > private: > > - Dialog * findOrBuild(std::string const & name, bool hide_it); > - /// > Dialog * build(std::string const & name); > > Why ?

Re: Moving LyX XMPP Chat to features/chat2

2014-05-04 Thread Vincent van Ravesteijn
Tommaso Cucinotta schreef op 4-5-2014 21:48: On 28/04/14 10:36, Vincent van Ravesteijn wrote: It would be easier to review if you would push the branch to the features.git repository (which is accessible to everyone). Hi, I also pushed the branch to features.git as branch "chat3". Now I've g

Re: Moving LyX XMPP Chat to features/chat2

2014-05-04 Thread Tommaso Cucinotta
On 28/04/14 10:36, Vincent van Ravesteijn wrote: > It would be easier to review if you would push the branch to the features.git > repository (which is accessible to everyone). Hi, I also pushed the branch to features.git as branch "chat3". Now I've got into this issue: $ git checkout featur

Re: Moving LyX XMPP Chat to features/chat2

2014-05-04 Thread Tommaso Cucinotta
Hi, I just created a tommaso/features/chat3 new branch with a rework of the LyX chat feature, taking most of Vincent's comments. Most of the patches are now squashed into the initial commit. For now the GuiChatMessenger stays in qt4/, as it relies on Qt libraries, and it also depends on GuiCha

Re: Moving LyX XMPP Chat to features/chat2

2014-04-28 Thread Tommaso Cucinotta
On 28/04/14 08:48, Vincent van Ravesteijn wrote: > Below are my opinions. Please read from bottom to top. Hi, thanks for these. I see I definitely need a lyxchat3 rework before the merge. I'll try to do that, but it will take one or a couple of weeks. A few remarks: -) Vincent suggests to crea

Re: Moving LyX XMPP Chat to features/chat2

2014-04-28 Thread Vincent van Ravesteijn
On Mon, Apr 28, 2014 at 2:19 AM, Tommaso Cucinotta wrote: > On 20/11/13 14:01, Kornel Benko wrote: > > I like it. Feels good, especially on the fresh new window. To get it > into master should be the first think after releasing 2.1 IMHO. Kornel > > That seems the right time then! > > Currently,

Re: Moving LyX XMPP Chat to features/chat2

2014-04-28 Thread Vincent van Ravesteijn
On Mon, Apr 28, 2014 at 2:19 AM, Tommaso Cucinotta wrote: > On 20/11/13 14:01, Kornel Benko wrote: > > I like it. Feels good, especially on the fresh new window. To get it > into master should be the first think after releasing 2.1 IMHO. Kornel > > That seems the right time then! > > Currently,

Re: Moving LyX XMPP Chat to features/chat2

2014-04-28 Thread Vincent van Ravesteijn
> > From: Tommaso Cucinotta > Date: Wed, 16 Oct 2013 21:55:40 + (+0100) > Subject: LyX XMPP Chat > X-Git-Url: > http://git.lyx.org/?p=developers%2Ftommaso%2Flyx.git;a=commitdiff_plain;h=9646b7553bb4a3916e8b99f9e2dc200e7d534dfb > > LyX XMPP Chat > --- > > @@ -186,7 +190,8 @@ SOURCEFILESCORE = \

Re: Moving LyX XMPP Chat to features/chat2

2014-04-27 Thread Vincent van Ravesteijn
On Mon, Apr 28, 2014 at 2:19 AM, Tommaso Cucinotta wrote: > On 20/11/13 14:01, Kornel Benko wrote: >> I like it. Feels good, especially on the fresh new window. To get it into >> master should be the first think after releasing 2.1 IMHO. Kornel > > That seems the right time then! > > Currently, th

Re: Moving LyX XMPP Chat to features/chat2

2014-04-27 Thread Tommaso Cucinotta
On 20/11/13 14:01, Kornel Benko wrote: > I like it. Feels good, especially on the fresh new window. To get it into > master should be the first think after releasing 2.1 IMHO. Kornel That seems the right time then! Currently, this is a patchset of 21 commits http://git.lyx.org/?p=developers/

Re: Moving LyX XMPP Chat to features/chat2

2013-12-22 Thread Tommaso Cucinotta
On 20/11/13 14:01, Kornel Benko wrote: > I like it. Feels good, especially on the fresh new window. > > To get it into master should be the first think after releasing 2.1 IMHO. So, what's the current trunk situation ? I've just had some extra bits of time to update/rebase the features/chat2 bran

Re: Moving LyX XMPP Chat to features/chat2

2013-11-20 Thread Kornel Benko
Am Mittwoch, 20. November 2013 um 00:51:04, schrieb Tommaso Cucinotta > On 18/11/13 08:44, Vincent van Ravesteijn wrote: > > Yes, if Kornel is not very actively involved in refactoring stuff > > etc., it should be well possible for him to reset once in a while, or > > to rebase his local work ont

Re: Moving LyX XMPP Chat to features/chat2

2013-11-19 Thread Tommaso Cucinotta
On 18/11/13 08:44, Vincent van Ravesteijn wrote: > Yes, if Kornel is not very actively involved in refactoring stuff > etc., it should be well possible for him to reset once in a while, or > to rebase his local work onto your branch. So I kept rebasing it a few further times... > Well, I hope my

Re: Moving LyX XMPP Chat to features/chat2

2013-11-18 Thread Vincent van Ravesteijn
On Sat, Nov 16, 2013 at 1:49 AM, Tommaso Cucinotta wrote: > On 15/11/13 20:24, Kornel Benko wrote: > > I probably misunderstood, what to send. > > it was ok. I just wanted to check whether your origin was actually the > main lyx repo or mine, so you actually must have cloned the whole repo > deve

Re: Moving LyX XMPP Chat to features/chat2

2013-11-18 Thread Vincent van Ravesteijn
On Fri, Nov 15, 2013 at 5:58 PM, Kornel Benko wrote: > Am Mittwoch, 13. November 2013 um 10:31:53, schrieb Vincent van Ravesteijn > > > > > > The errors will not be the result of a 'git checkout' command. It more > > looks like a git pull. This is the reason, I don't advice to use git > pull. >

Re: Moving LyX XMPP Chat to features/chat2

2013-11-16 Thread Kornel Benko
Am Samstag, 16. November 2013 um 00:49:16, schrieb Tommaso Cucinotta > On 15/11/13 20:24, Kornel Benko wrote: > > I probably misunderstood, what to send. > > it was ok. I just wanted to check whether your origin was actually the main > lyx repo or mine, so you actually must have cloned the whol

Re: Moving LyX XMPP Chat to features/chat2

2013-11-15 Thread Tommaso Cucinotta
On 15/11/13 20:24, Kornel Benko wrote: > I probably misunderstood, what to send. it was ok. I just wanted to check whether your origin was actually the main lyx repo or mine, so you actually must have cloned the whole repo developers/tommaso as an independent folder (calling it as origin), that'

Re: Moving LyX XMPP Chat to features/chat2

2013-11-15 Thread Kornel Benko
Am Freitag, 15. November 2013 um 19:56:18, schrieb Tommaso Cucinotta > On 15/11/13 16:58, Kornel Benko wrote: > > What the mockery ... Nothing I try helps here. I for sure did not commit or > > change anything. > > do u mind sending the part of your .lyx/config defining your "origin" repo, > a

Re: Moving LyX XMPP Chat to features/chat2

2013-11-15 Thread Tommaso Cucinotta
On 15/11/13 16:58, Kornel Benko wrote: > What the mockery ... Nothing I try helps here. I for sure did not commit or > change anything. do u mind sending the part of your .lyx/config defining your "origin" repo, as well as your "features/chat2" branch ? Thx, T.

Re: Moving LyX XMPP Chat to features/chat2

2013-11-15 Thread Kornel Benko
Am Mittwoch, 13. November 2013 um 10:31:53, schrieb Vincent van Ravesteijn > > > The errors will not be the result of a 'git checkout' command. It more > looks like a git pull. This is the reason, I don't advice to use git pull. > > If you would have done a 'git fetch', you will retrieve the new

Re: Moving LyX XMPP Chat to features/chat2

2013-11-14 Thread Vincent van Ravesteijn
Tommaso Cucinotta schreef op 14-11-2013 11:43: On 13/11/13 09:31, Vincent van Ravesteijn wrote: If you would have done a 'git fetch', you will retrieve the new commits. Then, you want to reset the features/chat2 branch to the new one tommasso pushed: $ git checkout features/chat2 $ git reset --

Re: Moving LyX XMPP Chat to features/chat2

2013-11-14 Thread Tommaso Cucinotta
On 13/11/13 09:31, Vincent van Ravesteijn wrote: > If you would have done a 'git fetch', you will retrieve the new > commits. Then, you want to reset the features/chat2 branch to the new > one tommasso pushed: > > $ git checkout features/chat2 > $ git reset --hard /features/chat2 On a machine of

Re: Moving LyX XMPP Chat to features/chat2

2013-11-13 Thread Vincent van Ravesteijn
On Wed, Nov 13, 2013 at 10:25 AM, Kornel Benko wrote: > Am Mittwoch, 13. November 2013 um 10:02:30, schrieb Kornel Benko < > kor...@lyx.org> > > Am Dienstag, 12. November 2013 um 22:21:48, schrieb Tommaso Cucinotta < > tomm...@lyx.org> > > > Kornel, > > > > > > I'm just thinking of dropping entir

Re: Moving LyX XMPP Chat to features/chat2

2013-11-13 Thread Kornel Benko
Am Mittwoch, 13. November 2013 um 10:02:30, schrieb Kornel Benko > Am Dienstag, 12. November 2013 um 22:21:48, schrieb Tommaso Cucinotta > > > Kornel, > > > > I'm just thinking of dropping entirely features/chat, and > > continuing on features/chat2. > > No problem. I have only sk.po changed

Re: Moving LyX XMPP Chat to features/chat2

2013-11-13 Thread Kornel Benko
Am Dienstag, 12. November 2013 um 22:21:48, schrieb Tommaso Cucinotta > Kornel, > > I'm just thinking of dropping entirely features/chat, and > continuing on features/chat2. No problem. I have only sk.po changed here. > Not sure about what happened with features/chat, but from > the web view I