From c0603769be62bc6ede4723079e2d439122f1ea7a Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sep 11 2015 06:05:17 +0000 Subject: Resolves: rhbz#1256843 no obvious means to close template dialog --- diff --git a/0001-Resolves-rhbz-1256843-no-obvious-means-to-close-temp.patch b/0001-Resolves-rhbz-1256843-no-obvious-means-to-close-temp.patch new file mode 100644 index 0000000..2f2e11c --- /dev/null +++ b/0001-Resolves-rhbz-1256843-no-obvious-means-to-close-temp.patch @@ -0,0 +1,786 @@ +From c33062fc07ac20b1ac28bd000fd3c57016d72e34 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Tue, 1 Sep 2015 11:59:32 +0100 +Subject: [PATCH] Resolves: rhbz#1256843 no obvious means to close template + dialog + +under gnome-shell which doesn't put an "X" to close things in +the wm decorations if the GDK DIALOG hint it set + +prior to tdf#72587 this was a modeless dialog and in that case +it doesn't have a parent, in which case the hint is NORMAL +and it used to get close decorations. + +easist thing to do is to remain modal so the crashes and +confusion of tdf#72587 remain fixed but add a close to it to +behave like all the other dialogs do + +Change-Id: I64450be0ad1bc7b06196e1342679e15b60fc60d9 +--- + sfx2/uiconfig/ui/templatedlg.ui | 653 +++++++++++++++++++++------------------- + 1 file changed, 346 insertions(+), 307 deletions(-) + +diff --git a/sfx2/uiconfig/ui/templatedlg.ui b/sfx2/uiconfig/ui/templatedlg.ui +index de8270c..6ed0172 100644 +--- a/sfx2/uiconfig/ui/templatedlg.ui ++++ b/sfx2/uiconfig/ui/templatedlg.ui +@@ -1,111 +1,327 @@ + + + +- ++ + +- ++ + 800 +- 560 ++ 600 + False +- True + 6 + Template Manager +- +- +- True ++ True ++ normal ++ ++ + False +- 6 + vertical ++ 2 ++ ++ ++ False ++ end ++ ++ ++ gtk-close ++ True ++ True ++ True ++ True ++ True ++ True ++ ++ ++ True ++ True ++ 0 ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ + +- ++ + True +- True +- True +- True ++ False ++ vertical + +- ++ + True +- False ++ True + True + True +- vertical +- 6 + +- ++ + True + False + True ++ True ++ vertical + 6 + +- ++ + True + False + True ++ 6 + +- ++ + True + False +- repository +- Repository +- True +- sfx2/imglst/actionview026.png +- +- +- False +- True +- +- +- +- +- False +- import +- Import +- True +- sfx2/imglst/actionview010.png +- +- +- False +- True +- +- +- +- +- False +- delete +- Delete +- True +- sfx2/imglst/actionview025.png ++ True ++ ++ ++ True ++ False ++ repository ++ Repository ++ True ++ sfx2/imglst/actionview026.png ++ ++ ++ False ++ True ++ ++ ++ ++ ++ False ++ import ++ Import ++ True ++ sfx2/imglst/actionview010.png ++ ++ ++ False ++ True ++ ++ ++ ++ ++ False ++ delete ++ Delete ++ True ++ sfx2/imglst/actionview025.png ++ ++ ++ False ++ True ++ ++ ++ ++ ++ False ++ save ++ Save ++ True ++ sfx2/imglst/actionview028.png ++ ++ ++ False ++ True ++ ++ ++ ++ ++ True ++ False ++ new_folder ++ New Folder ++ True ++ sfx2/imglst/actionview029.png ++ ++ ++ False ++ True ++ ++ + + + False +- True ++ True ++ 0 + + + +- ++ + False +- save +- Save +- True +- sfx2/imglst/actionview028.png ++ True ++ ++ ++ False ++ template_save ++ Save ++ True ++ sfx2/imglst/actionview028.png ++ ++ ++ False ++ True ++ ++ ++ ++ ++ True ++ False ++ open ++ Open ++ True ++ sfx2/imglst/actionview030.png ++ ++ ++ False ++ True ++ ++ ++ ++ ++ True ++ False ++ edit ++ Edit ++ True ++ sfx2/imglst/actiontemplates019.png ++ ++ ++ False ++ True ++ ++ ++ ++ ++ True ++ False ++ properties ++ Properties ++ True ++ sfx2/imglst/actiontemplates016.png ++ ++ ++ False ++ True ++ ++ ++ ++ ++ True ++ False ++ default ++ Set as Default ++ True ++ sfx2/imglst/actiontemplates015.png ++ ++ ++ False ++ True ++ ++ ++ ++ ++ True ++ False ++ move ++ Move to Folder ++ True ++ sfx2/imglst/actiontemplates017.png ++ ++ ++ False ++ True ++ ++ ++ ++ ++ True ++ False ++ export ++ Export ++ True ++ sfx2/imglst/actiontemplates020.png ++ ++ ++ False ++ True ++ ++ ++ ++ ++ True ++ False ++ template_delete ++ Delete ++ True ++ sfx2/imglst/actiontemplates018.png ++ ++ ++ False ++ True ++ ++ + + + False +- True ++ True ++ 1 + + + +- ++ + True + False +- new_folder +- New Folder +- True +- sfx2/imglst/actionview029.png ++ end ++ True ++ ++ ++ True ++ False ++ search ++ Search ++ True ++ sfx2/imglst/actionaction012.png ++ ++ ++ False ++ True ++ ++ ++ ++ ++ True ++ False ++ action_menu ++ Action Menu ++ True ++ sfx2/imglst/actionaction013.png ++ ++ ++ False ++ True ++ ++ ++ ++ ++ True ++ False ++ template_link ++ Get more templates for %PRODUCTNAME ++ True ++ sfx2/imglst/actionview010.png ++ ++ ++ False ++ True ++ ++ + + + False +- True ++ True ++ 2 + + + +@@ -116,120 +332,10 @@ + + + +- +- False ++ ++ True + True +- +- +- False +- template_save +- Save +- True +- sfx2/imglst/actionview028.png +- +- +- False +- True +- +- +- +- +- True +- False +- open +- Open +- True +- sfx2/imglst/actionview030.png +- +- +- False +- True +- +- +- +- +- True +- False +- edit +- Edit +- True +- sfx2/imglst/actiontemplates019.png +- +- +- False +- True +- +- +- +- +- True +- False +- properties +- Properties +- True +- sfx2/imglst/actiontemplates016.png +- +- +- False +- True +- +- +- +- +- True +- False +- default +- Set as Default +- True +- sfx2/imglst/actiontemplates015.png +- +- +- False +- True +- +- +- +- +- True +- False +- move +- Move to Folder +- True +- sfx2/imglst/actiontemplates017.png +- +- +- False +- True +- +- +- +- +- True +- False +- export +- Export +- True +- sfx2/imglst/actiontemplates020.png +- +- +- False +- True +- +- +- +- +- True +- False +- template_delete +- Delete +- True +- sfx2/imglst/actiontemplates018.png +- +- +- False +- True +- +- ++ ● + + + False +@@ -238,53 +344,11 @@ + + + +- ++ + True + False +- end + True +- +- +- True +- False +- search +- Search +- True +- sfx2/imglst/actionaction012.png +- +- +- False +- True +- +- +- +- +- True +- False +- action_menu +- Action Menu +- True +- sfx2/imglst/actionaction013.png +- +- +- False +- True +- +- +- +- +- True +- False +- template_link +- Get more templates for %PRODUCTNAME +- True +- sfx2/imglst/actionview010.png +- +- +- False +- True +- +- ++ True + + + False +@@ -292,123 +356,98 @@ + 2 + + ++ ++ ++ True ++ True ++ 0 ++ True ++ True ++ ++ ++ False ++ True ++ 3 ++ ++ ++ ++ ++ True ++ True ++ 0 ++ True ++ True ++ ++ ++ False ++ True ++ 4 ++ ++ ++ ++ ++ ++ ++ True ++ False ++ Documents + + +- False +- True +- 0 ++ False + + + +- +- True +- True +- ● ++ ++ ++ ++ ++ True ++ False ++ Spreadsheets + + +- False +- True + 1 ++ False + + + +- ++ ++ ++ ++ + True +- True +- True +- True ++ False ++ Presentations + + +- False +- True + 2 ++ False + + + +- +- True +- True +- 0 +- True +- True +- +- +- False +- True +- 3 +- ++ + +- +- +- True +- True +- 0 +- True +- True ++ ++ ++ True ++ False ++ Drawings + + +- False +- True +- 4 ++ 3 ++ False + + + +- +- +- +- True +- False +- Documents +- + +- False +- +- +- +- +- +- +- +- True +- False +- Spreadsheets +- +- +- 1 +- False +- +- +- +- +- +- +- +- True +- False +- Presentations +- +- +- 2 +- False +- +- +- +- +- +- +- +- True +- False +- Drawings +- +- +- 3 +- False ++ False ++ True ++ 0 + + + + +- False ++ True + True + 0 + +-- +2.4.0 + diff --git a/libreoffice.spec b/libreoffice.spec index 2a0d844..2381fc9 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -330,6 +330,7 @@ Patch21: 0001-implement-equalize-width-and-height-for-impress-draw.patch Patch22: 0001-f22-openjdk-for-ppc64le-has-both-these-dirs-but-jawt.patch Patch23: 0001-implement-undo-for-equalize-marked-objects.patch Patch24: 0001-time-stamp-object-selections-and-use-newest-as-ref-f.patch +Patch25: 0001-Resolves-rhbz-1256843-no-obvious-means-to-close-temp.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice