[Libreoffice-commits] core.git: Changes to 'refs/changes/49/3249/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/89/3089/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/46/3246/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/37/437/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/77/3077/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/52/3252/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/52/3252/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/37/437/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/98/3298/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/39/439/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/59/3259/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/39/439/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/75/3075/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/55/2655/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/97/3297/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/41/2641/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/59/3259/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/04/2704/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/54/3354/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/3353/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/77/3077/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/98/3298/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/97/3297/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/79/3079/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/91/3091/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/75/3075/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/51/3251/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/51/3251/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/04/2704/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/76/3076/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/04/2704/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/79/3079/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/54/3354/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/3353/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/39/3239/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/44/3244/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/43/3243/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/33/433/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/3353/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/78/3078/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/90/3090/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/33/433/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/48/3248/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/38/3238/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/58/3258/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/67/2667/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/43/3243/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/48/3248/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/00/3300/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/36/436/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/60/3260/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/42/3242/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/88/3088/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/56/3256/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/57/3257/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/90/3090/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/47/3247/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/58/3258/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/32/432/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/51/3051/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/3253/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/38/438/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/54/3054/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/99/3299/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/34/434/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/40/3240/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/40/3240/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/99/3299/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/3253/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/54/3254/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/45/3245/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/78/478/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/52/3052/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/38/438/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/54/3254/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/45/3245/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/35/435/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/35/435/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/41/3241/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/41/3241/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/55/3255/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/55/3255/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-ux-advise] Template manager issues pending
I did the rest of them already, ill push it tomorrow and ill send you a msg after, so you can test it. On Sun, May 19, 2013 at 8:01 PM, Cor Nouws oo...@nouenoff.nl wrote: Joren wrote (20-05-13 02:00) Willing to help: SURE! Able to help ... mmh, I don't know :-). At least I can test on Mac if new patches comes out (or if you have a draft patch I can verify/test it on mac. I'm not sure I can develop something for mac (without bugging other devs to help me out :) ). So please tell me where I can be of any help in this project/task. It's about _adding_ a checkbox to the File Open dialog. But Rafael knows more about it. -- - Cor - http://nl.libreoffice.org - www.librelex.org ___ Libreoffice-ux-advise mailing list Libreoffice-ux-advise@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise
Re: [Libreoffice-ux-advise] Template manager issues pending
Well i dont have that much free time to spend on libreoffice sadly, just a few hours here and there so my progress on fixing and improving the template manager is kinda slow. About the dialog so far theres no design or talk about copying and handling styles. Any ideas for the style functionality?? Im currently working on bug 61396 (Editing a template outside of the repository), only managed to add the checkbox option to the gtk+, kde4 and native dialogs, still pending the windows one and mac, but i dont have access to a mac, so its hard to work on that one. On Fri, May 10, 2013 at 10:36 AM, Cor Nouws oo...@nouenoff.nl wrote: Hi all, Worked myself through the list with template related issues and - apart from all great progress - found a few that are still open. And with 4.1 approaching rapidly... 60589 - [Template manager]: Can not copy styles between different files and templates 61396 - FILEOPEN: [Template Manager]Possibility to edit a template that is not in the repository, is lacking and related 59427 - [Template Manager] low discoverability of new template manager - we could use File → Organize templates menu I know there were some mails on issue 61396 already. I've not seen any on the others. Though I'm not able to do a lot, I'm willing to try to contribute with thinking about design, use cases, testing and such. Any ideas, things to share at this moment? thanks, Cor -- - Cor - http://nl.libreoffice.org - www.librelex.org ___ Libreoffice-ux-advise mailing list Libreoffice-ux-advise@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise
[Libreoffice-commits] core.git: 2 commits - sfx2/inc sfx2/source
sfx2/inc/templatedlg.hxx |4
sfx2/source/control/templatelocalview.cxx |1
sfx2/source/doc/templatedlg.cxx | 168 +++---
3 files changed, 87 insertions(+), 86 deletions(-)
New commits:
commit a9223251b925abf23618722fef915e30c0e4c5b6
Author: Rafael Dominguez venccsra...@gmail.com
Date: Wed May 8 17:51:55 2013 -0430
Display folder name in breadcrum when opening template manager.
Change-Id: Ie822d840af826b1d8d477a55fc92aa6b0cc512e9
diff --git a/sfx2/source/control/templatelocalview.cxx
b/sfx2/source/control/templatelocalview.cxx
index 3a622b4..994c8c2 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -165,6 +165,7 @@ void TemplateLocalView::showRegion(const OUString rName)
{
if (maRegions[i]-maTitle == rName)
{
+maFTName.SetText(rName);
showRegion(maRegions[i]);
break;
}
commit 421b516cc7aa6accfcc67fc7c062c9665bcc01d9
Author: Rafael Dominguez venccsra...@gmail.com
Date: Wed May 8 17:24:10 2013 -0430
Give view variables a proper name that reflect their use.
Change-Id: Ie1d4cb0e77a43ce1ea2115e781b3a62d60961e11
diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index 8eeeab8..c7b40f6 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -143,8 +143,8 @@ private:
ToolBox *mpTemplateBar;
TemplateSearchView *mpSearchView;
TemplateAbstractView *mpCurView;
-TemplateLocalView *maView;
-TemplateRemoteView *mpOnlineView;
+TemplateLocalView *mpLocalView;
+TemplateRemoteView *mpRemoteView;
PopupMenu *mpActionMenu;
PopupMenu *mpRepositoryMenu;
PopupMenu *mpTemplateDefaultMenu;
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index b7c4582..e9892a6 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -159,8 +159,8 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window
*parent)
mpActionBar( new ToolBox(maTabPage, SfxResId(TBX_ACTION_ACTION))),
mpTemplateBar( new ToolBox(maTabPage, SfxResId(TBX_ACTION_TEMPLATES))),
mpSearchView(new TemplateSearchView(maTabPage)),
- maView(new TemplateLocalView(maTabPage,SfxResId(TEMPLATE_VIEW))),
- mpOnlineView(new TemplateRemoteView(maTabPage, WB_VSCROLL,false)),
+ mpLocalView(new TemplateLocalView(maTabPage,SfxResId(TEMPLATE_VIEW))),
+ mpRemoteView(new TemplateRemoteView(maTabPage, WB_VSCROLL,false)),
maSelTemplates(cmpSelectionItems),
maSelFolders(cmpSelectionItems),
mbIsSaveMode(false),
@@ -206,27 +206,27 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window
*parent)
mpSearchEdit-SetUpdateDataHdl(LINK(this,SfxTemplateManagerDlg,SearchUpdateHdl));
mpSearchEdit-EnableUpdateData();
-maView-SetStyle(maView-GetStyle() | WB_VSCROLL);
-maView-setItemMaxTextLength(TEMPLATE_ITEM_MAX_TEXT_LENGTH);
+mpLocalView-SetStyle(mpLocalView-GetStyle() | WB_VSCROLL);
+mpLocalView-setItemMaxTextLength(TEMPLATE_ITEM_MAX_TEXT_LENGTH);
-
maView-setItemDimensions(TEMPLATE_ITEM_MAX_WIDTH,TEMPLATE_ITEM_THUMBNAIL_MAX_HEIGHT,
+
mpLocalView-setItemDimensions(TEMPLATE_ITEM_MAX_WIDTH,TEMPLATE_ITEM_THUMBNAIL_MAX_HEIGHT,
TEMPLATE_ITEM_MAX_HEIGHT-TEMPLATE_ITEM_THUMBNAIL_MAX_HEIGHT,
TEMPLATE_ITEM_PADDING);
-maView-setItemStateHdl(LINK(this,SfxTemplateManagerDlg,TVItemStateHdl));
-maView-setOpenRegionHdl(LINK(this,SfxTemplateManagerDlg,OpenRegionHdl));
-
maView-setOpenTemplateHdl(LINK(this,SfxTemplateManagerDlg,OpenTemplateHdl));
+
mpLocalView-setItemStateHdl(LINK(this,SfxTemplateManagerDlg,TVItemStateHdl));
+
mpLocalView-setOpenRegionHdl(LINK(this,SfxTemplateManagerDlg,OpenRegionHdl));
+
mpLocalView-setOpenTemplateHdl(LINK(this,SfxTemplateManagerDlg,OpenTemplateHdl));
// Set online view position and dimensions
-mpOnlineView-setItemMaxTextLength(TEMPLATE_ITEM_MAX_TEXT_LENGTH);
+mpRemoteView-setItemMaxTextLength(TEMPLATE_ITEM_MAX_TEXT_LENGTH);
-
mpOnlineView-setItemDimensions(TEMPLATE_ITEM_MAX_WIDTH,TEMPLATE_ITEM_THUMBNAIL_MAX_HEIGHT,
+
mpRemoteView-setItemDimensions(TEMPLATE_ITEM_MAX_WIDTH,TEMPLATE_ITEM_THUMBNAIL_MAX_HEIGHT,
TEMPLATE_ITEM_MAX_HEIGHT-TEMPLATE_ITEM_THUMBNAIL_MAX_HEIGHT,
TEMPLATE_ITEM_PADDING);
-
mpOnlineView-setItemStateHdl(LINK(this,SfxTemplateManagerDlg,TVItemStateHdl));
-
mpOnlineView-setOpenRegionHdl(LINK(this,SfxTemplateManagerDlg,OpenRegionHdl));
-
mpOnlineView-setOpenTemplateHdl(LINK(this,SfxTemplateManagerDlg,OpenTemplateHdl));
+
mpRemoteView-setItemStateHdl(LINK(this,SfxTemplateManagerDlg,TVItemStateHdl));
+
mpRemoteView-setOpenRegionHdl(LINK(this,SfxTemplateManagerDlg,OpenRegionHdl));
+
mpRemoteView-setOpenTemplateHdl(LINK
[Libreoffice-commits] core.git: icon-themes/galaxy sfx2/inc sfx2/source
icon-themes/galaxy/sfx2/imglst/actionview030.png |binary
sfx2/inc/templatedlg.hxx |1 +
sfx2/source/doc/templatedlg.cxx | 13 +
sfx2/source/doc/templatedlg.hrc |2 ++
sfx2/source/doc/templatedlg.src | 11 +++
5 files changed, 27 insertions(+)
New commits:
commit f9f421d4428c901aa0bc9483ac3835e7950c657d
Author: Rafael Dominguez venccsra...@gmail.com
Date: Wed May 8 19:11:13 2013 -0430
Add open action to template manager toolbar.
Change-Id: I5cec8814776f2658c990fb45193736a60178965b
diff --git a/icon-themes/galaxy/sfx2/imglst/actionview030.png
b/icon-themes/galaxy/sfx2/imglst/actionview030.png
new file mode 100644
index 000..53c5ee8
Binary files /dev/null and b/icon-themes/galaxy/sfx2/imglst/actionview030.png
differ
diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index c7b40f6..c5feb96 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -80,6 +80,7 @@ private:
void OnTemplateImport ();
void OnTemplateSearch ();
+void OnTemplateOpen ();
void OnTemplateEdit ();
void OnTemplateProperties ();
void OnTemplateDelete ();
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index e9892a6..2db2c8b 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -314,6 +314,7 @@ void SfxTemplateManagerDlg::setSaveMode(bool bMode)
mpTemplateBar-ShowItem(TBI_TEMPLATE_SAVE);
mpTemplateBar-ShowItem(TBI_TEMPLATE_PROPERTIES);
mpTemplateBar-ShowItem(TBI_TEMPLATE_DEFAULT);
+mpTemplateBar-HideItem(TBI_TEMPLATE_OPEN);
mpTemplateBar-HideItem(TBI_TEMPLATE_EDIT);
mpTemplateBar-HideItem(TBI_TEMPLATE_MOVE);
mpTemplateBar-HideItem(TBI_TEMPLATE_EXPORT);
@@ -525,6 +526,9 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg,TBXTemplateHdl)
{
switch(mpTemplateBar-GetCurItemId())
{
+case TBI_TEMPLATE_OPEN:
+OnTemplateOpen();
+break;
case TBI_TEMPLATE_EDIT:
OnTemplateEdit();
break;
@@ -877,6 +881,7 @@ void SfxTemplateManagerDlg::OnTemplateState (const
ThumbnailViewItem *pItem)
{
if (!mbIsSaveMode)
{
+mpTemplateBar-HideItem(TBI_TEMPLATE_OPEN);
mpTemplateBar-HideItem(TBI_TEMPLATE_EDIT);
mpTemplateBar-HideItem(TBI_TEMPLATE_PROPERTIES);
mpTemplateBar-HideItem(TBI_TEMPLATE_DEFAULT);
@@ -907,6 +912,7 @@ void SfxTemplateManagerDlg::OnTemplateState (const
ThumbnailViewItem *pItem)
{
if (!mbIsSaveMode)
{
+mpTemplateBar-ShowItem(TBI_TEMPLATE_OPEN);
mpTemplateBar-ShowItem(TBI_TEMPLATE_EDIT);
mpTemplateBar-ShowItem(TBI_TEMPLATE_PROPERTIES);
mpTemplateBar-ShowItem(TBI_TEMPLATE_DEFAULT);
@@ -1166,6 +1172,13 @@ void SfxTemplateManagerDlg::OnTemplateSearch ()
mpSearchEdit-GrabFocus();
}
+void SfxTemplateManagerDlg::OnTemplateOpen ()
+{
+ThumbnailViewItem *pItem =
const_castThumbnailViewItem*(*maSelTemplates.begin());
+
+OpenTemplateHdl(pItem);
+}
+
void SfxTemplateManagerDlg::OnTemplateEdit ()
{
uno::Sequence PropertyValue aArgs(3);
diff --git a/sfx2/source/doc/templatedlg.hrc b/sfx2/source/doc/templatedlg.hrc
index dec2b52..40bdfa05 100644
--- a/sfx2/source/doc/templatedlg.hrc
+++ b/sfx2/source/doc/templatedlg.hrc
@@ -43,6 +43,8 @@
#define TBI_TEMPLATE_FOLDER_NEW 29
+#define TBI_TEMPLATE_OPEN 30
+
#define STR_ACTION_REFRESH 263
#define STR_ACTION_SORT_NAME264
diff --git a/sfx2/source/doc/templatedlg.src b/sfx2/source/doc/templatedlg.src
index 32f3319..c205b99 100644
--- a/sfx2/source/doc/templatedlg.src
+++ b/sfx2/source/doc/templatedlg.src
@@ -241,6 +241,17 @@ TabPage TAB_TEMPLATE_MANAGER
ToolBoxItem
{
+Identifier = TBI_TEMPLATE_OPEN;
+Text [ en-US ] = Open;
+
+ItemImage = Image
+{
+ImageBitmap = Bitmap { File = actionview030.png; };
+};
+};
+
+ToolBoxItem
+{
Identifier = TBI_TEMPLATE_EDIT;
Text [ en-US ] = Edit;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/thumbnailview.cxx | 19 ---
1 file changed, 16 insertions(+), 3 deletions(-)
New commits:
commit 5d19f429ab81aa236543d6a11a193de8c2cc5c59
Author: Rafael Dominguez venccsra...@gmail.com
Date: Fri Apr 12 20:28:55 2013 -0430
Down-arrow jump to last item when there is no item immediately below.
Change-Id: I23f5f002826e2ecc25ff19d18372cb637feb1310
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index f2643a6..96dc91a 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -564,10 +564,23 @@ void ThumbnailView::KeyInput( const KeyEvent rKEvt )
break;
case KEY_DOWN:
{
-if ( bFoundLast nLastPos mFilteredItemList.size( ) -
mnCols )
+if ( bFoundLast )
{
-bValidRange = true;
-nNextPos = nLastPos + mnCols;
+//If we are in the second last row just go the one in
+//the row below, if theres not row below just go to the
+//last item but for the last row dont do anything.
+if ( nLastPos mFilteredItemList.size( ) - mnCols )
+{
+bValidRange = true;
+nNextPos = nLastPos + mnCols;
+}
+else
+{
+int curRow = nLastPos/mnCols;
+
+if (curRow mnLines-1)
+nNextPos = mFilteredItemList.size()-1;
+}
}
pNext = mFilteredItemList[nNextPos];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: XDocumentTemplates behaviour
Ok gonna do that then On Thu, Apr 18, 2013 at 3:01 AM, Miklos Vajna vmik...@suse.cz wrote: Hi, On Wed, Apr 10, 2013 at 06:47:56PM -0430, Rafael Dominguez venccsra...@gmail.com wrote: So my question is that is it possible to change the behaviour of storeTemplate to call storeAsURL instead of storeToURL? or is there any workaround i can use to fix the problem?? We already have storeTemplate and addTemplate in that interface, what about adding a third variant -- e.g. storeAsTemplate -- that does what you need? Note that it's still a published interface, so if you go ahead with that change, don't push it directly to master, but to gerrit, and include API CHANGE in the first line fo the commit message. Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sfx2/source
sfx2/source/doc/templatedlg.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 7e16f5c0e8409aba10149501629b05bbcdd8939a Author: Rafael Dominguez venccsra...@gmail.com Date: Wed Apr 10 10:25:31 2013 -0430 Set Template Manager dialog minimum size. Change-Id: I2d30bf2c3fb33b8297477f80704aa057911a2bba Reviewed-on: https://gerrit.libreoffice.org/3353 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index a5edb7b..82289ba 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -244,6 +244,8 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window *parent) mpViewBar-RemoveItem(nPos); } +SetMinOutputSizePixel(GetOutputSizePixel()); + mpViewBar-Show(); mpActionBar-Show(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sfx2/source
sfx2/source/control/templatelocalview.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 94cb2604ea75a504ecab5f500701099e00859b7c
Author: Rafael Dominguez venccsra...@gmail.com
Date: Wed Apr 10 10:36:09 2013 -0430
Remove thumbnail from local view if we erase it throught the search view.
Change-Id: I3ec486313bedcc633b020a2feea3d30730da98f0
Reviewed-on: https://gerrit.libreoffice.org/3354
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sfx2/source/control/templatelocalview.cxx
b/sfx2/source/control/templatelocalview.cxx
index 884897c..f1a3421 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -352,7 +352,11 @@ bool TemplateLocalView::removeTemplate (const sal_uInt16
nItemId, const sal_uInt
pIter = pItem-maTemplates.erase(pIter);
-RemoveItem(nItemId);
+if (maRegions[i]-mnRegionId == mnCurRegionId-1)
+{
+RemoveItem(nItemId);
+Invalidate();
+}
// Update Doc Idx for all templates that follow
for (; pIter != pItem-maTemplates.end(); ++pIter)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sfx2/source
sfx2/source/control/templatelocalview.cxx |6 +-
sfx2/source/doc/templatedlg.cxx |2 ++
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 9b991a1764317959edff5af3fa7261b65dcdc18c
Author: Rafael Dominguez venccsra...@gmail.com
Date: Wed Apr 10 10:36:09 2013 -0430
Remove thumbnail from local view if we erase it throught the search view.
Change-Id: I42e5fe1f806712b2b912f945c164b0e239ecaa54
diff --git a/sfx2/source/control/templatelocalview.cxx
b/sfx2/source/control/templatelocalview.cxx
index 5defbbf..945e256 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -352,7 +352,11 @@ bool TemplateLocalView::removeTemplate (const sal_uInt16
nItemId, const sal_uInt
pIter = pItem-maTemplates.erase(pIter);
-RemoveItem(nItemId);
+if (maRegions[i]-mnRegionId == mnCurRegionId-1)
+{
+RemoveItem(nItemId);
+Invalidate();
+}
// Update Doc Idx for all templates that follow
for (; pIter != pItem-maTemplates.end(); ++pIter)
commit d2b272c19d684f993da09c8961870db78e93b8c2
Author: Rafael Dominguez venccsra...@gmail.com
Date: Wed Apr 10 10:25:31 2013 -0430
Set Template Manager dialog minimum size.
Change-Id: Ifa5091a5159d3832d3b8c8846eff57b6bfcf9854
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 9793d3c..19ee371 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -245,6 +245,8 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window
*parent)
mpViewBar-RemoveItem(nPos);
}
+SetMinOutputSizePixel(GetOutputSizePixel());
+
mpViewBar-Show();
mpActionBar-Show();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH libreoffice-4-0] Remove thumbnail from local view if we erase it throught the...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3354
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/54/3354/1
Remove thumbnail from local view if we erase it throught the search view.
Change-Id: I3ec486313bedcc633b020a2feea3d30730da98f0
---
M sfx2/source/control/templatelocalview.cxx
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/sfx2/source/control/templatelocalview.cxx
b/sfx2/source/control/templatelocalview.cxx
index 884897c..f1a3421 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -352,7 +352,11 @@
pIter = pItem-maTemplates.erase(pIter);
-RemoveItem(nItemId);
+if (maRegions[i]-mnRegionId == mnCurRegionId-1)
+{
+RemoveItem(nItemId);
+Invalidate();
+}
// Update Doc Idx for all templates that follow
for (; pIter != pItem-maTemplates.end(); ++pIter)
--
To view, visit https://gerrit.libreoffice.org/3354
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ec486313bedcc633b020a2feea3d30730da98f0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Set Template Manager dialog minimum size.
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3353 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/53/3353/1 Set Template Manager dialog minimum size. Change-Id: I2d30bf2c3fb33b8297477f80704aa057911a2bba --- M sfx2/source/doc/templatedlg.cxx 1 file changed, 2 insertions(+), 0 deletions(-) diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 3097f1f..f1098fb 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -244,6 +244,8 @@ mpViewBar-RemoveItem(nPos); } +SetMinOutputSizePixel(GetOutputSizePixel()); + mpViewBar-Show(); mpActionBar-Show(); -- To view, visit https://gerrit.libreoffice.org/3353 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2d30bf2c3fb33b8297477f80704aa057911a2bba Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - 3 commits - sfx2/source
sfx2/source/control/templatelocalview.cxx |4 +-
sfx2/source/control/thumbnailview.cxx | 42 --
sfx2/source/control/thumbnailviewacc.cxx |2 -
3 files changed, 31 insertions(+), 17 deletions(-)
New commits:
commit c5a8e0f1dc87ebba5a4ae79fdcdfbdd4aaebce87
Author: Rafael Dominguez venccsra...@gmail.com
Date: Sun Apr 7 21:17:51 2013 -0430
Fetch thumbnails position and id from filter array instead.
Change-Id: I35bd8b47eeba3e2f8e2ea74afbf1fe8e48390bab
Reviewed-on: https://gerrit.libreoffice.org/3299
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index a122080..d08173c 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -971,8 +971,20 @@ void ThumbnailView::RemoveItem( sal_uInt16 nItemId )
if ( nPos == THUMBNAILVIEW_ITEM_NOTFOUND )
return;
-if ( nPos mItemList.size() ) {
-ValueItemList::iterator it = mItemList.begin();
+if ( nPos mFilteredItemList.size() ) {
+
+// delete item from the thumbnail list
+for (size_t i = 0, n = mItemList.size(); i n; ++i)
+{
+if (mItemList[i]-mnId == nItemId)
+{
+mItemList.erase(mItemList.begin()+i);
+break;
+}
+}
+
+// delete item from the filter item list
+ValueItemList::iterator it = mFilteredItemList.begin();
::std::advance( it, nPos );
if ((*it)-isSelected())
@@ -982,7 +994,8 @@ void ThumbnailView::RemoveItem( sal_uInt16 nItemId )
}
delete *it;
-mItemList.erase( it );
+mFilteredItemList.erase( it );
+mpStartSelRange = mFilteredItemList.end();
}
// reset variables
@@ -1026,8 +1039,8 @@ void ThumbnailView::updateItems (const
std::vectorThumbnailViewItem* items)
size_t ThumbnailView::GetItemPos( sal_uInt16 nItemId ) const
{
-for ( size_t i = 0, n = mItemList.size(); i n; ++i ) {
-if ( mItemList[i]-mnId == nItemId ) {
+for ( size_t i = 0, n = mFilteredItemList.size(); i n; ++i ) {
+if ( mFilteredItemList[i]-mnId == nItemId ) {
return i;
}
}
@@ -1036,7 +1049,7 @@ size_t ThumbnailView::GetItemPos( sal_uInt16 nItemId )
const
sal_uInt16 ThumbnailView::GetItemId( size_t nPos ) const
{
-return ( nPos mItemList.size() ) ? mItemList[nPos]-mnId : 0 ;
+return ( nPos mFilteredItemList.size() ) ? mFilteredItemList[nPos]-mnId
: 0 ;
}
sal_uInt16 ThumbnailView::GetItemId( const Point rPos ) const
@@ -1073,11 +1086,11 @@ void ThumbnailView::SelectItem( sal_uInt16 nItemId )
if ( nItemPos == THUMBNAILVIEW_ITEM_NOTFOUND )
return;
-ThumbnailViewItem* pItem = mItemList[nItemPos];
+ThumbnailViewItem* pItem = mFilteredItemList[nItemPos];
if (!pItem-isSelected())
{
-mItemList[nItemPos]-setSelection(true);
-maItemStateHdl.Call(mItemList[nItemPos]);
+pItem-setSelection(true);
+maItemStateHdl.Call(pItem);
if (IsReallyVisible() IsUpdateMode())
Invalidate();
@@ -1156,11 +1169,11 @@ void ThumbnailView::DeselectItem( sal_uInt16 nItemId )
if ( nItemPos == THUMBNAILVIEW_ITEM_NOTFOUND )
return;
-ThumbnailViewItem* pItem = mItemList[nItemPos];
+ThumbnailViewItem* pItem = mFilteredItemList[nItemPos];
if (pItem-isSelected())
{
-mItemList[nItemPos]-setSelection(false);
-maItemStateHdl.Call(mItemList[nItemPos]);
+pItem-setSelection(false);
+maItemStateHdl.Call(pItem);
if (IsReallyVisible() IsUpdateMode())
Invalidate();
@@ -1175,7 +1188,7 @@ bool ThumbnailView::IsItemSelected( sal_uInt16 nItemId )
const
if ( nItemPos == THUMBNAILVIEW_ITEM_NOTFOUND )
return false;
-ThumbnailViewItem* pItem = mItemList[nItemPos];
+ThumbnailViewItem* pItem = mFilteredItemList[nItemPos];
return pItem-isSelected();
}
@@ -1201,7 +1214,7 @@ OUString ThumbnailView::GetItemText( sal_uInt16 nItemId )
const
size_t nPos = GetItemPos( nItemId );
if ( nPos != THUMBNAILVIEW_ITEM_NOTFOUND )
-return mItemList[nPos]-maTitle;
+return mFilteredItemList[nPos]-maTitle;
return OUString();
}
diff --git a/sfx2/source/control/thumbnailviewacc.cxx
b/sfx2/source/control/thumbnailviewacc.cxx
index 393bd9e..c89f1b0 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -350,7 +350,7 @@ uno::Reference accessibility::XAccessible SAL_CALL
ThumbnailViewAcc::getAcces
if( THUMBNAILVIEW_ITEM_NONEITEM != nItemPos )
{
-ThumbnailViewItem *const pItem = mpParent-mItemList[nItemPos];
+ThumbnailViewItem *const pItem =
mpParent-mFilteredItemList[nItemPos];
xRet = pItem-GetAccessible
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - 2 commits - sfx2/inc sfx2/source
sfx2/inc/sfx2/templatelocalview.hxx |2 +
sfx2/source/control/templatelocalview.cxx | 11 ++
sfx2/source/doc/templatedlg.cxx | 50 +-
sfx2/source/doc/templatedlg.src | 12 +++
4 files changed, 60 insertions(+), 15 deletions(-)
New commits:
commit 94d3d78aa7b7258f0a2f397d36599928342959e6
Author: Rafael Dominguez venccsra...@gmail.com
Date: Sun Apr 7 22:26:28 2013 -0430
fdo#61389 - Display Properties, Set as default actions in save mode.
It dosent make sense to display delete action since we are saving
a template same for edit.
Change-Id: I83368f80a29f60c8d24b47fe3682ca93a2373a98
Reviewed-on: https://gerrit.libreoffice.org/3301
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 6f78ebe..3097f1f 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -307,6 +307,14 @@ void SfxTemplateManagerDlg::setSaveMode(bool bMode)
mpViewBar-ShowItem(TBI_TEMPLATE_SAVE);
mpViewBar-HideItem(TBI_TEMPLATE_IMPORT);
mpViewBar-HideItem(TBI_TEMPLATE_REPOSITORY);
+
+mpTemplateBar-ShowItem(TBI_TEMPLATE_SAVE);
+mpTemplateBar-ShowItem(TBI_TEMPLATE_PROPERTIES);
+mpTemplateBar-ShowItem(TBI_TEMPLATE_DEFAULT);
+mpTemplateBar-HideItem(TBI_TEMPLATE_EDIT);
+mpTemplateBar-HideItem(TBI_TEMPLATE_MOVE);
+mpTemplateBar-HideItem(TBI_TEMPLATE_EXPORT);
+mpTemplateBar-HideItem(TBI_TEMPLATE_DELETE);
}
else
{
@@ -850,16 +858,22 @@ void SfxTemplateManagerDlg::OnTemplateState (const
ThumbnailViewItem *pItem)
if (pItem-isSelected())
{
-if (!mbIsSaveMode)
+if (maSelTemplates.empty())
{
-if (maSelTemplates.empty())
+mpViewBar-Show(false);
+mpTemplateBar-Show();
+}
+else if (maSelTemplates.size() != 1 || !bInSelection)
+{
+if (!mbIsSaveMode)
{
-mpViewBar-Show(false);
-mpTemplateBar-Show();
+mpTemplateBar-HideItem(TBI_TEMPLATE_EDIT);
+mpTemplateBar-HideItem(TBI_TEMPLATE_PROPERTIES);
+mpTemplateBar-HideItem(TBI_TEMPLATE_DEFAULT);
}
-else if (maSelTemplates.size() != 1 || !bInSelection)
+else
{
-mpTemplateBar-HideItem(TBI_TEMPLATE_EDIT);
+mpTemplateBar-HideItem(TBI_TEMPLATE_SAVE);
mpTemplateBar-HideItem(TBI_TEMPLATE_PROPERTIES);
mpTemplateBar-HideItem(TBI_TEMPLATE_DEFAULT);
}
@@ -874,16 +888,22 @@ void SfxTemplateManagerDlg::OnTemplateState (const
ThumbnailViewItem *pItem)
{
maSelTemplates.erase(pItem);
-if (!mbIsSaveMode)
+if (maSelTemplates.empty())
+{
+mpTemplateBar-Show(false);
+mpViewBar-Show();
+}
+else if (maSelTemplates.size() == 1)
{
-if (maSelTemplates.empty())
+if (!mbIsSaveMode)
{
-mpTemplateBar-Show(false);
-mpViewBar-Show();
+mpTemplateBar-ShowItem(TBI_TEMPLATE_EDIT);
+mpTemplateBar-ShowItem(TBI_TEMPLATE_PROPERTIES);
+mpTemplateBar-ShowItem(TBI_TEMPLATE_DEFAULT);
}
-else if (maSelTemplates.size() == 1)
+else
{
-mpTemplateBar-ShowItem(TBI_TEMPLATE_EDIT);
+mpTemplateBar-ShowItem(TBI_TEMPLATE_SAVE);
mpTemplateBar-ShowItem(TBI_TEMPLATE_PROPERTIES);
mpTemplateBar-ShowItem(TBI_TEMPLATE_DEFAULT);
}
diff --git a/sfx2/source/doc/templatedlg.src b/sfx2/source/doc/templatedlg.src
index 60c2857..9beb3da 100644
--- a/sfx2/source/doc/templatedlg.src
+++ b/sfx2/source/doc/templatedlg.src
@@ -212,6 +212,18 @@ TabPage TAB_TEMPLATE_MANAGER
{
ToolBoxItem
{
+Identifier = TBI_TEMPLATE_SAVE;
+Hide = TRUE;
+Text [ en-US ] = Save;
+
+ItemImage = Image
+{
+ImageBitmap = Bitmap { File = actionview028.png ; };
+};
+};
+
+ToolBoxItem
+{
Identifier = TBI_TEMPLATE_EDIT;
Text [ en-US ] = Edit;
commit 372f50605347d750ecb3e50c05ec4c27636b48d9
Author: Rafael Dominguez venccsra...@gmail.com
Date: Sun Apr 7 21:46:11 2013 -0430
Display correct region name in error messages.
Change-Id: Icf4149272f67df6681bdad711362dd7d3802d04a
Reviewed-on: https://gerrit.libreoffice.org/3300
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested
XDocumentTemplates behaviour
Im working on the new template manager dialog and i got a problem when saving a a new blank document as a template, i use the storeTemplate method of XDocumentTemplates class, but it doesnt update the document URL, so after a while checking the problem i found that the issue is that XDocumentTemplates calls storeToURL method of XStorage class instead of storeAsURL as the save command. So my question is that is it possible to change the behaviour of storeTemplate to call storeAsURL instead of storeToURL? or is there any workaround i can use to fix the problem?? PS: The only code where this is used besides Template manager is in http://opengrok.libreoffice.org/xref/core/sfx2/source/doc/doctempl.cxx#879but im not sure if thats active or not and it might have an impact on extensions using the method but i think it wont be problematic since it will just update the document URL info and the document frame if you have it currently opened, which is just reflecting the action you did, so i think no harm there. Thanks ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 5 commits - sfx2/inc sfx2/source
sfx2/inc/sfx2/templatelocalview.hxx |2 +
sfx2/source/control/templatelocalview.cxx | 15 +++--
sfx2/source/control/thumbnailview.cxx | 42 -
sfx2/source/control/thumbnailviewacc.cxx |2 -
sfx2/source/doc/templatedlg.cxx | 50 +-
sfx2/source/doc/templatedlg.src | 12 +++
6 files changed, 91 insertions(+), 32 deletions(-)
New commits:
commit ff7a40c588bc37e5d6bcaf197ff46d86bdbd93a7
Author: Rafael Dominguez venccsra...@gmail.com
Date: Sun Apr 7 22:26:28 2013 -0430
fdo#61389 - Display Properties, Set as default actions in save mode.
It dosent make sense to display delete action since we are saving
a template same for edit.
Change-Id: I5532d3a7a7f5e6200419c2b7159c4d6fe40d16ea
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index d589454..9793d3c 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -308,6 +308,14 @@ void SfxTemplateManagerDlg::setSaveMode(bool bMode)
mpViewBar-ShowItem(TBI_TEMPLATE_SAVE);
mpViewBar-HideItem(TBI_TEMPLATE_IMPORT);
mpViewBar-HideItem(TBI_TEMPLATE_REPOSITORY);
+
+mpTemplateBar-ShowItem(TBI_TEMPLATE_SAVE);
+mpTemplateBar-ShowItem(TBI_TEMPLATE_PROPERTIES);
+mpTemplateBar-ShowItem(TBI_TEMPLATE_DEFAULT);
+mpTemplateBar-HideItem(TBI_TEMPLATE_EDIT);
+mpTemplateBar-HideItem(TBI_TEMPLATE_MOVE);
+mpTemplateBar-HideItem(TBI_TEMPLATE_EXPORT);
+mpTemplateBar-HideItem(TBI_TEMPLATE_DELETE);
}
else
{
@@ -858,16 +866,22 @@ void SfxTemplateManagerDlg::OnTemplateState (const
ThumbnailViewItem *pItem)
if (pItem-isSelected())
{
-if (!mbIsSaveMode)
+if (maSelTemplates.empty())
{
-if (maSelTemplates.empty())
+mpViewBar-Show(false);
+mpTemplateBar-Show();
+}
+else if (maSelTemplates.size() != 1 || !bInSelection)
+{
+if (!mbIsSaveMode)
{
-mpViewBar-Show(false);
-mpTemplateBar-Show();
+mpTemplateBar-HideItem(TBI_TEMPLATE_EDIT);
+mpTemplateBar-HideItem(TBI_TEMPLATE_PROPERTIES);
+mpTemplateBar-HideItem(TBI_TEMPLATE_DEFAULT);
}
-else if (maSelTemplates.size() != 1 || !bInSelection)
+else
{
-mpTemplateBar-HideItem(TBI_TEMPLATE_EDIT);
+mpTemplateBar-HideItem(TBI_TEMPLATE_SAVE);
mpTemplateBar-HideItem(TBI_TEMPLATE_PROPERTIES);
mpTemplateBar-HideItem(TBI_TEMPLATE_DEFAULT);
}
@@ -882,16 +896,22 @@ void SfxTemplateManagerDlg::OnTemplateState (const
ThumbnailViewItem *pItem)
{
maSelTemplates.erase(pItem);
-if (!mbIsSaveMode)
+if (maSelTemplates.empty())
+{
+mpTemplateBar-Show(false);
+mpViewBar-Show();
+}
+else if (maSelTemplates.size() == 1)
{
-if (maSelTemplates.empty())
+if (!mbIsSaveMode)
{
-mpTemplateBar-Show(false);
-mpViewBar-Show();
+mpTemplateBar-ShowItem(TBI_TEMPLATE_EDIT);
+mpTemplateBar-ShowItem(TBI_TEMPLATE_PROPERTIES);
+mpTemplateBar-ShowItem(TBI_TEMPLATE_DEFAULT);
}
-else if (maSelTemplates.size() == 1)
+else
{
-mpTemplateBar-ShowItem(TBI_TEMPLATE_EDIT);
+mpTemplateBar-ShowItem(TBI_TEMPLATE_SAVE);
mpTemplateBar-ShowItem(TBI_TEMPLATE_PROPERTIES);
mpTemplateBar-ShowItem(TBI_TEMPLATE_DEFAULT);
}
diff --git a/sfx2/source/doc/templatedlg.src b/sfx2/source/doc/templatedlg.src
index 1761118..27c7145 100644
--- a/sfx2/source/doc/templatedlg.src
+++ b/sfx2/source/doc/templatedlg.src
@@ -229,6 +229,18 @@ TabPage TAB_TEMPLATE_MANAGER
{
ToolBoxItem
{
+Identifier = TBI_TEMPLATE_SAVE;
+Hide = TRUE;
+Text [ en-US ] = Save;
+
+ItemImage = Image
+{
+ImageBitmap = Bitmap { File = actionview028.png ; };
+};
+};
+
+ToolBoxItem
+{
Identifier = TBI_TEMPLATE_EDIT;
Text [ en-US ] = Edit;
commit ebebaf709af8bdfaf65cb7747c38fadc9ca02259
Author: Rafael Dominguez venccsra...@gmail.com
Date: Sun Apr 7 21:46:11 2013 -0430
Display correct region name in error messages.
Change-Id: I1e3eddf9be2a75faabf0b0be91f30d7e8d43d3e4
diff --git a/sfx2/inc/sfx2/templatelocalview.hxx
b/sfx2/inc/sfx2/templatelocalview.hxx
index bd1b431..6cefaf1 100644
[PATCH libreoffice-4-0] Mark thumbnailview item as unselected when updating filter.
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3297 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/97/3297/1 Mark thumbnailview item as unselected when updating filter. Change-Id: Ifc98603045364419a6f76316fea96c2e668c333e --- M sfx2/source/control/thumbnailview.cxx 1 file changed, 1 insertion(+), 0 deletions(-) diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 8d03d5a..a122080 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -1253,6 +1253,7 @@ } pItem-show(false); +pItem-setSelection(false); maItemStateHdl.Call(pItem); } -- To view, visit https://gerrit.libreoffice.org/3297 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc98603045364419a6f76316fea96c2e668c333e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Update template item path when moving it to another folder.
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3298 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/98/3298/1 Update template item path when moving it to another folder. Change-Id: I4de701e32dfe1244ba29704633d7d15f829a9e7a --- M sfx2/source/control/templatelocalview.cxx 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index 6dd82df..a4437c3 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -398,7 +398,7 @@ aTemplateItem.nDocId = nTargetIdx; aTemplateItem.nRegionId = nTargetRegion; aTemplateItem.aName = pViewItem-maTitle; -aTemplateItem.aPath = pViewItem-getPath(); +aTemplateItem.aPath = mpDocTemplates-GetPath(nTargetRegion,nTargetIdx); aTemplateItem.aThumbnail = pViewItem-maPreview1; pTarget-maTemplates.push_back(aTemplateItem); @@ -495,7 +495,7 @@ aTemplateItem.nDocId = nTargetIdx; aTemplateItem.nRegionId = nTargetRegion; aTemplateItem.aName = pViewItem-maTitle; -aTemplateItem.aPath = pViewItem-getPath(); +aTemplateItem.aPath = mpDocTemplates-GetPath(nTargetRegion,nTargetIdx); aTemplateItem.aThumbnail = pViewItem-maPreview1; pTarget-maTemplates.push_back(aTemplateItem); -- To view, visit https://gerrit.libreoffice.org/3298 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4de701e32dfe1244ba29704633d7d15f829a9e7a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Fetch thumbnails position and id from filter array instead.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3299
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/99/3299/1
Fetch thumbnails position and id from filter array instead.
Change-Id: I35bd8b47eeba3e2f8e2ea74afbf1fe8e48390bab
---
M sfx2/source/control/thumbnailview.cxx
M sfx2/source/control/thumbnailviewacc.cxx
2 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index a122080..d08173c 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -971,8 +971,20 @@
if ( nPos == THUMBNAILVIEW_ITEM_NOTFOUND )
return;
-if ( nPos mItemList.size() ) {
-ValueItemList::iterator it = mItemList.begin();
+if ( nPos mFilteredItemList.size() ) {
+
+// delete item from the thumbnail list
+for (size_t i = 0, n = mItemList.size(); i n; ++i)
+{
+if (mItemList[i]-mnId == nItemId)
+{
+mItemList.erase(mItemList.begin()+i);
+break;
+}
+}
+
+// delete item from the filter item list
+ValueItemList::iterator it = mFilteredItemList.begin();
::std::advance( it, nPos );
if ((*it)-isSelected())
@@ -982,7 +994,8 @@
}
delete *it;
-mItemList.erase( it );
+mFilteredItemList.erase( it );
+mpStartSelRange = mFilteredItemList.end();
}
// reset variables
@@ -1026,8 +1039,8 @@
size_t ThumbnailView::GetItemPos( sal_uInt16 nItemId ) const
{
-for ( size_t i = 0, n = mItemList.size(); i n; ++i ) {
-if ( mItemList[i]-mnId == nItemId ) {
+for ( size_t i = 0, n = mFilteredItemList.size(); i n; ++i ) {
+if ( mFilteredItemList[i]-mnId == nItemId ) {
return i;
}
}
@@ -1036,7 +1049,7 @@
sal_uInt16 ThumbnailView::GetItemId( size_t nPos ) const
{
-return ( nPos mItemList.size() ) ? mItemList[nPos]-mnId : 0 ;
+return ( nPos mFilteredItemList.size() ) ? mFilteredItemList[nPos]-mnId
: 0 ;
}
sal_uInt16 ThumbnailView::GetItemId( const Point rPos ) const
@@ -1073,11 +1086,11 @@
if ( nItemPos == THUMBNAILVIEW_ITEM_NOTFOUND )
return;
-ThumbnailViewItem* pItem = mItemList[nItemPos];
+ThumbnailViewItem* pItem = mFilteredItemList[nItemPos];
if (!pItem-isSelected())
{
-mItemList[nItemPos]-setSelection(true);
-maItemStateHdl.Call(mItemList[nItemPos]);
+pItem-setSelection(true);
+maItemStateHdl.Call(pItem);
if (IsReallyVisible() IsUpdateMode())
Invalidate();
@@ -1156,11 +1169,11 @@
if ( nItemPos == THUMBNAILVIEW_ITEM_NOTFOUND )
return;
-ThumbnailViewItem* pItem = mItemList[nItemPos];
+ThumbnailViewItem* pItem = mFilteredItemList[nItemPos];
if (pItem-isSelected())
{
-mItemList[nItemPos]-setSelection(false);
-maItemStateHdl.Call(mItemList[nItemPos]);
+pItem-setSelection(false);
+maItemStateHdl.Call(pItem);
if (IsReallyVisible() IsUpdateMode())
Invalidate();
@@ -1175,7 +1188,7 @@
if ( nItemPos == THUMBNAILVIEW_ITEM_NOTFOUND )
return false;
-ThumbnailViewItem* pItem = mItemList[nItemPos];
+ThumbnailViewItem* pItem = mFilteredItemList[nItemPos];
return pItem-isSelected();
}
@@ -1201,7 +1214,7 @@
size_t nPos = GetItemPos( nItemId );
if ( nPos != THUMBNAILVIEW_ITEM_NOTFOUND )
-return mItemList[nPos]-maTitle;
+return mFilteredItemList[nPos]-maTitle;
return OUString();
}
diff --git a/sfx2/source/control/thumbnailviewacc.cxx
b/sfx2/source/control/thumbnailviewacc.cxx
index 393bd9e..c89f1b0 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -350,7 +350,7 @@
if( THUMBNAILVIEW_ITEM_NONEITEM != nItemPos )
{
-ThumbnailViewItem *const pItem = mpParent-mItemList[nItemPos];
+ThumbnailViewItem *const pItem =
mpParent-mFilteredItemList[nItemPos];
xRet = pItem-GetAccessible( mbIsTransientChildrenDisabled );
}
}
--
To view, visit https://gerrit.libreoffice.org/3299
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I35bd8b47eeba3e2f8e2ea74afbf1fe8e48390bab
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
