Re: [Shotwell] shotwell and map widget

[Andreas Brauchli]

Hi

On Nov 23, 2016 23:17, "Jens Georg"  wrote:
>>
>> That's also my feeling from a quick glance at the conflicts.
>> True, the UI integration must be rewritten but it looks +/-
copy-paste-and-adapt from your changes.
>
>
> Done locally. Do you want a pull request?

Absolutely! thanks

>>
>>
>
> ___
> shotwell-list mailing list
> shotwell-list@gnome.org
> https://mail.gnome.org/mailman/listinfo/shotwell-list
>
___
shotwell-list mailing list
shotwell-list@gnome.org
https://mail.gnome.org/mailman/listinfo/shotwell-list

Re: [Shotwell] shotwell and map widget

[Norbert Preining]

Hi
> Done locally. Do you want a pull request?

Thanks a lot.

I would be interested in testing it out, can you push your branch
somewhere (shotwell git has already many branches, so one could
add that one).

Norbert

--
PREINING Norbert + TeX Live & Debian Developer + http://www.preining.info
GPG: 0x860CDC13fp: F7D8 A928 26E3 16A1 9FA0  ACF0 6CAC A448 860C DC13
___
shotwell-list mailing list
shotwell-list@gnome.org
https://mail.gnome.org/mailman/listinfo/shotwell-list

Re: [Shotwell] shotwell and map widget

[Max]

On 2016년 11월 23일 09:42, Jens Georg wrote:

There's a plan, but there is still no clue which tile provider to use
for that.


I know someone at mapbox. I could ask if they are willing to support 
this project.


___
shotwell-list mailing list
shotwell-list@gnome.org
https://mail.gnome.org/mailman/listinfo/shotwell-list

Re: [Shotwell] shotwell and map widget

[Andreas Brauchli]

Hi

On Nov 23, 2016 22:57, "Jens Georg"  wrote:
>
> On Wed, 2016-11-23 at 14:58 +0100, Andreas Brauchli wrote:
> > Hey
> > On Nov 23, 2016 2:19 PM, "Jens Georg"  wrote:
> > >
> > >
> > >>> There's a plan, but there is still no clue which tile provider to
> > use for
> > >>> that.
> > >>
> > >>
> > >> Ok, that are good news.
> > >>
> > >>> What's the issue with rebasing it against master?
> > >>
> > >>
> > >> Well, lots of conflicts that are not trivial... the most
> > persistent one
> > >> is in src/library/LibraryWIndow.vala, but there are big diffs in
> > various
> > >> .ui files:
> > >>
> > >> Unmerged paths:
> > >>   (use "git add ..." to mark resolution)
> > >>
> > >> both modified:   src/library/LibraryWindow.vala
> > >
> > >
> > > That is probably the alignment stuff
> > Here yes but mainly it's the Action removal thingy
> > >
> > >
> > >> both modified:   ui/events_directory.ui
> > >> both modified:   ui/import.ui
> > >> both modified:   ui/media.ui
> > >> both modified:   ui/offline.ui
> > >> both modified:   ui/photo.ui
> > >> both modified:   ui/trash.ui
> > >
> > >
> > > That you can easily solve by ignoring the commit, I think.
> > > But agree, that needs fixing. I will check it, unless andreas feels
> > like
> > > fixing what I broke (sorry about that).
> > I periodically rebase and I'll get to it eventually. For now my
> > branch is about two weeks behind.
> > No worries about breaking stuff, Jens, I appreciate living code.
> > Cheers
>
> It's not that bad. The change in LibraryWindow is rather trivial.
> Though the patch that adds the menu item more or less needs rewriting
> on the UI part.

That's also my feeling from a quick glance at the conflicts.
True, the UI integration must be rewritten but it looks +/-
copy-paste-and-adapt from your changes.

Cheers

>
> ___
> shotwell-list mailing list
> shotwell-list@gnome.org
> https://mail.gnome.org/mailman/listinfo/shotwell-list
___
shotwell-list mailing list
shotwell-list@gnome.org
https://mail.gnome.org/mailman/listinfo/shotwell-list

Re: [Shotwell] shotwell and map widget

[Andreas Brauchli]

Hey

On Nov 23, 2016 2:19 PM, "Jens Georg"  wrote:
>
>
>>> There's a plan, but there is still no clue which tile provider to use
for
>>> that.
>>
>>
>> Ok, that are good news.
>>
>>> What's the issue with rebasing it against master?
>>
>>
>> Well, lots of conflicts that are not trivial... the most persistent one
>> is in src/library/LibraryWIndow.vala, but there are big diffs in various
>> .ui files:
>>
>> Unmerged paths:
>>   (use "git add ..." to mark resolution)
>>
>> both modified:   src/library/LibraryWindow.vala
>
>
> That is probably the alignment stuff
Here yes but mainly it's the Action removal thingy

>
>
>> both modified:   ui/events_directory.ui
>> both modified:   ui/import.ui
>> both modified:   ui/media.ui
>> both modified:   ui/offline.ui
>> both modified:   ui/photo.ui
>> both modified:   ui/trash.ui
>
>
> That you can easily solve by ignoring the commit, I think.
> But agree, that needs fixing. I will check it, unless andreas feels like
> fixing what I broke (sorry about that).
I periodically rebase and I'll get to it eventually. For now my branch is
about two weeks behind.

No worries about breaking stuff, Jens, I appreciate living code.

Cheers

>
> ___
> shotwell-list mailing list
> shotwell-list@gnome.org
> https://mail.gnome.org/mailman/listinfo/shotwell-list
___
shotwell-list mailing list
shotwell-list@gnome.org
https://mail.gnome.org/mailman/listinfo/shotwell-list

Re: [Shotwell] shotwell and map widget

[Jens Georg]

There's a plan, but there is still no clue which tile provider to use 
for

that.


Ok, that are good news.


What's the issue with rebasing it against master?


Well, lots of conflicts that are not trivial... the most persistent one
is in src/library/LibraryWIndow.vala, but there are big diffs in 
various

.ui files:

Unmerged paths:
  (use "git add ..." to mark resolution)

both modified:   src/library/LibraryWindow.vala


That is probably the alignment stuff


both modified:   ui/events_directory.ui
both modified:   ui/import.ui
both modified:   ui/media.ui
both modified:   ui/offline.ui
both modified:   ui/photo.ui
both modified:   ui/trash.ui


That you can easily solve by ignoring the commit, I think.
But agree, that needs fixing. I will check it, unless andreas feels like
fixing what I broke (sorry about that).
___
shotwell-list mailing list
shotwell-list@gnome.org
https://mail.gnome.org/mailman/listinfo/shotwell-list

Re: [Shotwell] shotwell and map widget

[Jens Georg]

what is the current status of the map widget? I have tried to rebase 
your

latest set of patches onto current master, without much success.

Is there any plan to include the map widget into the master branch?


There's a plan, but there is still no clue which tile provider to use 
for that.


What's the issue with rebasing it against master?
___
shotwell-list mailing list
shotwell-list@gnome.org
https://mail.gnome.org/mailman/listinfo/shotwell-list