[Libreoffice-commits] core.git: Changes to 'refs/changes/59/3659/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/3659/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/70/5970/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/99/4799/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/17/6717/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/29/6729/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/97/4697/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/17/6717/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/08/6708/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/7245/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/99/4799/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/29/6729/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/97/4697/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/70/5970/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/29/6729/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/08/6708/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/7245/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/7245/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/22/5022/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/26/5226/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/3976/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/26/6826/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/26/6826/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/12/4312/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/00/7200/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/22/5022/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/73/6073/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/14/3914/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/3275/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/07/6607/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/07/5507/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/29/5729/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/08/6708/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/00/7200/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/29/5729/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/43/7243/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/01/7201/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/73/6073/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/07/5507/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/43/7243/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/08/4208/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/26/5226/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/07/6607/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/07/6607/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/89/6089/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/3275/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/26/6826/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/852/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/01/5801/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/00/7200/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/01/7201/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/01/7201/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/01/5801/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/6089/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/23/6923/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/23/6923/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/23/6923/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/49/4049/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/49/4049/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/49/4049/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/3645/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/3645/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/UIConfig_cui.mk |1 cui/source/dialogs/cuigaldlg.cxx|2 - cui/source/dialogs/gallery.src |4 -- cui/source/inc/gallery.hrc |1 cui/uiconfig/ui/queryupdategalleryfilelistdialog.ui | 34 5 files changed, 36 insertions(+), 6 deletions(-) New commits: commit 2056f93f2d9f62741045e2aee0ed4d31001febef Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Wed Jan 1 08:34:41 2014 +0300 convert update file list queryboxes to .ui Change-Id: I9e9ad3674c6b45181b4fc3d4e252431b0dcab06d Reviewed-on: https://gerrit.libreoffice.org/7243 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk index cde65d0..d059ad0 100644 --- a/cui/UIConfig_cui.mk +++ b/cui/UIConfig_cui.mk @@ -125,6 +125,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\ cui/uiconfig/ui/querynoloadedfiledialog \ cui/uiconfig/ui/querynosavefiledialog \ cui/uiconfig/ui/querysavelistdialog \ + cui/uiconfig/ui/queryupdategalleryfilelistdialog \ cui/uiconfig/ui/recordnumberdialog \ cui/uiconfig/ui/rotationtabpage \ cui/uiconfig/ui/scriptorganizer \ diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index ea9afc1..c3fba41 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -983,7 +983,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFileTypeHdl) { aLastFilterName = aText; -if( QueryBox( this, WB_YES_NO, OUString( CUI_RES( RID_SVXSTR_GALLERY_SEARCH ) ) ).Execute() == RET_YES ) +if( MessageDialog( this, QueryUpdateFileListDialog,cui/ui/queryupdategalleryfilelistdialog.ui ).Execute() == RET_YES ) SearchFiles(); } diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src index d1a7413..076b949 100644 --- a/cui/source/dialogs/gallery.src +++ b/cui/source/dialogs/gallery.src @@ -257,10 +257,6 @@ String RID_SVXSTR_GALLERY_NOFILES { Text [ en-US ] = No Files ; }; -String RID_SVXSTR_GALLERY_SEARCH -{ -Text [ en-US ] = Do you want to update the file list? ; -}; String RID_SVXSTR_GALLERYPROPS_OBJECT { Text [ en-US ] = Object;Objects ; diff --git a/cui/source/inc/gallery.hrc b/cui/source/inc/gallery.hrc index e255e75..d142711 100644 --- a/cui/source/inc/gallery.hrc +++ b/cui/source/inc/gallery.hrc @@ -28,7 +28,6 @@ // Gallery-Strings #define RID_SVXSTR_GALLERY_NOFILES (RID_CUI_GALLERY_START + 12) -#define RID_SVXSTR_GALLERY_SEARCH (RID_CUI_GALLERY_START + 30) #define RID_SVXSTR_GALLERYPROPS_OBJECT (RID_CUI_GALLERY_START + 39) #define RID_SVXSTR_GALLERY_READONLY (RID_CUI_GALLERY_START + 43) #define RID_SVXSTR_GALLERY_ALLFILES (RID_CUI_GALLERY_START + 44) diff --git a/cui/uiconfig/ui/queryupdategalleryfilelistdialog.ui b/cui/uiconfig/ui/queryupdategalleryfilelistdialog.ui new file mode 100644 index 000..5dc0cac --- /dev/null +++ b/cui/uiconfig/ui/queryupdategalleryfilelistdialog.ui @@ -0,0 +1,34 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkMessageDialog id=QueryUpdateFileListDialog +property name=can_focusFalse/property +property name=border_width12/property +property name=title translatable=yesUpdate the file list?/property +property name=resizableFalse/property +property name=type_hintdialog/property +property name=skip_taskbar_hintTrue/property +property name=message_typequestion/property +property name=buttonsyes-no/property +property name=text translatable=yesDo you want to update the file list?/property +child internal-child=vbox + object class=GtkBox id=messagedialog-vbox4 +property name=can_focusFalse/property +property name=orientationvertical/property +property name=spacing24/property +child internal-child=action_area + object class=GtkButtonBox id=messagedialog-action_area4 +property name=can_focusFalse/property +property name=layout_styleend/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=pack_typeend/property +property name=position0/property + /packing +/child + /object +/child + /object +/interface ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk
svx/UIConfig_svx.mk|2 + svx/inc/gallery.hrc|2 - svx/source/gallery2/galbrws1.cxx |2 - svx/source/gallery2/galbrws2.cxx |2 - svx/source/gallery2/gallery.src|8 -- svx/uiconfig/ui/querydeleteobjectdialog.ui | 34 + svx/uiconfig/ui/querydeletethemedialog.ui | 34 + 7 files changed, 72 insertions(+), 12 deletions(-) New commits: commit dee757ad33b763180336240f27811d0d4e5aa130 Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Wed Jan 1 13:32:52 2014 +0300 convert delete object and theme queryboxes to .ui Change-Id: Id8d54c55ab1b8c7e618654874bc8b9af949ec970 Reviewed-on: https://gerrit.libreoffice.org/7245 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk index c337ea5..9cb6a18 100644 --- a/svx/UIConfig_svx.mk +++ b/svx/UIConfig_svx.mk @@ -30,6 +30,8 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\ svx/uiconfig/ui/optgridpage \ svx/uiconfig/ui/passwd \ svx/uiconfig/ui/querydeletecontourdialog \ + svx/uiconfig/ui/querydeleteobjectdialog \ + svx/uiconfig/ui/querydeletethemedialog \ svx/uiconfig/ui/querymodifyimagemapchangesdialog \ svx/uiconfig/ui/querynewcontourdialog \ svx/uiconfig/ui/querysavecontchangesdialog \ diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc index 526011f..1897612 100644 --- a/svx/inc/gallery.hrc +++ b/svx/inc/gallery.hrc @@ -35,7 +35,6 @@ #define RID_SVXSTR_EXTFORMAT3_UI(RID_SVX_GALLERY_START + 20) #define RID_SVXSTR_GALLERY_FOPENERROR (RID_SVX_GALLERY_START + 11) #define RID_SVXSTR_GALLERY_NOTHEME (RID_SVX_GALLERY_START + 13) -#define RID_SVXSTR_GALLERY_DELETEOBJ(RID_SVX_GALLERY_START + 14) #define RID_SVXSTR_GALLERY_ACTUALIZE_PROGRESS (RID_SVX_GALLERY_START + 25) #define RID_SVXSTR_GALLERY_FILTER (RID_SVX_GALLERY_START + 26) #define RID_SVXSTR_GALLERY_LENGTH (RID_SVX_GALLERY_START + 27) @@ -48,7 +47,6 @@ #define RID_SVXSTR_GALLERY_IMPORTTHEME (RID_SVX_GALLERY_START + 41) #define RID_SVXSTR_GALLERY_CREATETHEME (RID_SVX_GALLERY_START + 42) #define RID_SVXSTR_GALLERY_DIALOGID (RID_SVX_GALLERY_START + 80) -#define RID_SVXSTR_GALLERY_DELETETHEME (RID_SVX_GALLERY_START + 83) #define RID_SVXSTR_GALLERY_TITLE(RID_SVX_GALLERY_START + 84) #define RID_SVXSTR_GALLERY_PATH (RID_SVX_GALLERY_START + 85) #define RID_SVXSTR_GALLERY_ICONVIEW (RID_SVX_GALLERY_START + 86) diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 7285b84..84fbb56 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -373,7 +373,7 @@ void GalleryBrowser1::ImplExecute( sal_uInt16 nId ) case( MN_DELETE ): { -if( QueryBox( NULL, WB_YES_NO, GAL_RESSTR(RID_SVXSTR_GALLERY_DELETETHEME)).Execute() == RET_YES ) +if( MessageDialog( NULL, QueryDeleteThemeDialog,svx/ui/querydeletethemedialog.ui).Execute() == RET_YES ) mpGallery-RemoveTheme( mpThemes-GetSelectEntry() ); } break; diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 2767816..3574b7a 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -1195,7 +1195,7 @@ void GalleryBrowser2::Execute( sal_uInt16 nId ) case( MN_DELETE ): { if( !mpCurTheme-IsReadOnly() -QueryBox(NULL, WB_YES_NO, GAL_RESSTR(RID_SVXSTR_GALLERY_DELETEOBJ)).Execute() == RET_YES ) +MessageDialog(NULL, QueryDeleteObjectDialog,svx/ui/querydeleteobjectdialog.ui).Execute() == RET_YES ) { mpCurTheme-RemoveObject( mnCurActionPos ); } diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src index b5f7767..bd3a976 100644 --- a/svx/source/gallery2/gallery.src +++ b/svx/source/gallery2/gallery.src @@ -73,14 +73,6 @@ String RID_SVXSTR_GALLERY_NOTHEME { Text [ en-US ] = Invalid Theme Name! ; }; -String RID_SVXSTR_GALLERY_DELETEOBJ -{ -Text [ en-US ] = Do you really want to\ndelete this object? ; -}; -String RID_SVXSTR_GALLERY_DELETETHEME -{ -Text [ en-US ] = Do you really want to\ndelete this theme? ; -}; String RID_SVXSTR_EXTFORMAT1_SYS { Text = wav ; diff --git a/svx/uiconfig/ui/querydeleteobjectdialog.ui b/svx/uiconfig/ui/querydeleteobjectdialog.ui new file mode 100644 index 000..f49711b --- /dev/null +++ b/svx/uiconfig/ui/querydeleteobjectdialog.ui @@ -0,0 +1,34 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkMessageDialog id
[Libreoffice-commits] core.git: sd/source sd/uiconfig sd/UIConfig_sdraw.mk
sd/UIConfig_sdraw.mk |1 sd/source/ui/app/strings.src |4 -- sd/source/ui/inc/strings.hrc |2 - sd/source/ui/view/drviews6.cxx |9 ++ sd/uiconfig/sdraw/ui/queryunlinkimagedialog.ui | 35 + 5 files changed, 40 insertions(+), 11 deletions(-) New commits: commit 6cbccc8efa49dbf4ff21cabbfb9e74059d67b170 Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Thu Dec 26 13:16:51 2013 +0300 convert unlink image querybox to .ui Change-Id: I46458d497757162be283effb624a7c769aeb5354 Reviewed-on: https://gerrit.libreoffice.org/7200 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk index 5f8ce22..cb2c84b 100644 --- a/sd/UIConfig_sdraw.mk +++ b/sd/UIConfig_sdraw.mk @@ -80,6 +80,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\ sd/uiconfig/sdraw/ui/namedesign \ sd/uiconfig/sdraw/ui/paranumberingtab \ sd/uiconfig/sdraw/ui/printeroptions \ + sd/uiconfig/sdraw/ui/queryunlinkimagedialog \ sd/uiconfig/sdraw/ui/tabledesigndialog \ sd/uiconfig/sdraw/ui/vectorize \ )) diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src index b7f916c..b8b5237 100644 --- a/sd/source/ui/app/strings.src +++ b/sd/source/ui/app/strings.src @@ -798,10 +798,6 @@ String STR_FILEFORMAT_NAME { Text [ en-US ] = File name without extension ; }; -String STR_RELEASE_GRAPHICLINK -{ -Text [ en-US ] = This image is linked to a document. Do you want to unlink the image in order to edit it? ; -}; String STR_NEW_CUSTOMSHOW { Text [ en-US ] = New Custom Slide Show ; diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc index 819d31d..dcc6042 100644 --- a/sd/source/ui/inc/strings.hrc +++ b/sd/source/ui/inc/strings.hrc @@ -284,8 +284,6 @@ #define STR_FILEFORMAT_PATH (RID_APP_START+509) #define STR_FILEFORMAT_NAME (RID_APP_START+510) -#define STR_RELEASE_GRAPHICLINK (RID_APP_START+511) - #define STR_NEW_CUSTOMSHOW (RID_APP_START+512) #define STR_COPY_CUSTOMSHOW (RID_APP_START+513) diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 6aa6238..14f7e6c 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -301,19 +301,18 @@ void DrawViewShell::ExecBmpMask( SfxRequest rReq ) if ( pObj !mpDrawView-IsTextEdit() ) { SdrGrafObj* pNewObj = (SdrGrafObj*) pObj-Clone(); -sal_BoolbCont = sal_True; +bool bCont = true; if( pNewObj-IsLinkedGraphic() ) { -QueryBox aQBox( (Window*) GetActiveWindow(), WB_YES_NO | WB_DEF_YES, -SD_RESSTR( STR_RELEASE_GRAPHICLINK ) ); +MessageDialog aQueryBox( (Window*) GetActiveWindow(),QueryUnlinkImageDialog,modules/sdraw/ui/queryunlinkimagedialog.ui); -if( RET_YES == aQBox.Execute() ) +if (RET_YES == aQueryBox.Execute()) pNewObj-ReleaseGraphicLink(); else { delete pNewObj; -bCont = sal_False; +bCont = false; } } diff --git a/sd/uiconfig/sdraw/ui/queryunlinkimagedialog.ui b/sd/uiconfig/sdraw/ui/queryunlinkimagedialog.ui new file mode 100644 index 000..c372e2b --- /dev/null +++ b/sd/uiconfig/sdraw/ui/queryunlinkimagedialog.ui @@ -0,0 +1,35 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkMessageDialog id=QueryUnlinkImageDialog +property name=can_focusFalse/property +property name=border_width12/property +property name=title translatable=yesRelease image's link?/property +property name=resizableFalse/property +property name=type_hintdialog/property +property name=skip_taskbar_hintTrue/property +property name=message_typequestion/property +property name=buttonsyes-no/property +property name=text translatable=yesThis image is linked to a document./property +property name=secondary_text translatable=yes Do you want to unlink the image in order to edit it?/property +child internal-child=vbox + object class=GtkBox id=messagedialog-vbox4 +property name=can_focusFalse/property +property name=orientationvertical/property +property name=spacing24/property +child internal-child=action_area + object class=GtkButtonBox id=messagedialog-action_area4 +property name=can_focusFalse/property +property name=layout_styleend/property + /object + packing
[Libreoffice-commits] core.git: svx/source svx/uiconfig svx/UIConfig_svx.mk
svx/UIConfig_svx.mk |2 svx/source/dialog/imapdlg.cxx | 11 +--- svx/source/dialog/imapdlg.hrc |7 -- svx/source/dialog/imapdlg.src |9 --- svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui | 52 svx/uiconfig/ui/querysaveimagemapchangesdialog.ui | 52 6 files changed, 111 insertions(+), 22 deletions(-) New commits: commit 4c26083959637ffa9ca8bc1eed99f3c218447123 Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Thu Dec 26 15:11:57 2013 +0300 convert save and modify imageMaps queryboxes to .ui Change-Id: I222ce47187e46f7de9916bd559846d28c30d4562 Reviewed-on: https://gerrit.libreoffice.org/7201 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk index f2a8087..e82509c 100644 --- a/svx/UIConfig_svx.mk +++ b/svx/UIConfig_svx.mk @@ -28,8 +28,10 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\ svx/uiconfig/ui/optgridpage \ svx/uiconfig/ui/passwd \ svx/uiconfig/ui/querydeletecontourdialog \ + svx/uiconfig/ui/querymodifyimagemapchangesdialog \ svx/uiconfig/ui/querynewcontourdialog \ svx/uiconfig/ui/querysavecontchangesdialog \ + svx/uiconfig/ui/querysaveimagemapchangesdialog \ svx/uiconfig/ui/queryunlinkgraphicsdialog \ svx/uiconfig/ui/redlinecontrol \ svx/uiconfig/ui/redlinefilterpage \ diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 8c1b46f..3cc0bb63 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -40,6 +40,7 @@ #include sfx2/docfile.hxx #include unotools/localedatawrapper.hxx #include comphelper/processfactory.hxx +#include vcl/layout.hxx #define _IMAPDLG_PRIVATE #include svx/imapdlg.hxx @@ -225,8 +226,7 @@ sal_Bool SvxIMapDlg::Close() if ( aTbxIMapDlg1.IsItemEnabled( TBI_APPLY ) ) { -QueryBoxaQBox( this, WB_YES_NO_CANCEL | WB_DEF_YES, - SVX_RESSTR( STR_IMAPDLG_MODIFY ) ); +MessageDialog aQBox( this,QueryModifyImageMapChangesDialog,svx/ui/querymodifyimagemapchangesdialog.ui); const long nRet = aQBox.Execute(); if( nRet == RET_YES ) @@ -240,8 +240,7 @@ sal_Bool SvxIMapDlg::Close() } else if( pIMapWnd-IsChanged() ) { -QueryBoxaQBox( this, WB_YES_NO_CANCEL | WB_DEF_YES, - SVX_RESSTR( STR_IMAPDLG_SAVE ) ); +MessageDialog aQBox( this,QuerySaveImageMapChangesDialog,svx/ui/querysaveimagemapchangesdialog.ui); const long nRet = aQBox.Execute(); if( nRet == RET_YES ) @@ -727,8 +726,8 @@ IMPL_LINK_NOARG(SvxIMapDlg, UpdateHdl) if ( pOwnData-pUpdateEditingObject != pCheckObj ) { if ( pIMapWnd-IsChanged() - ( QueryBox( this, WB_YES_NO | WB_DEF_YES, - SVX_RESSTR( STR_IMAPDLG_SAVE ) ).Execute() == RET_YES ) ) + ( MessageDialog( this,QuerySaveImageMapChangesDialog, + svx/ui/querysaveimagemapchangesdialog.ui ).Execute() == RET_YES ) ) { DoSave(); } diff --git a/svx/source/dialog/imapdlg.hrc b/svx/source/dialog/imapdlg.hrc index 40ba35b..bcc2569 100644 --- a/svx/source/dialog/imapdlg.hrc +++ b/svx/source/dialog/imapdlg.hrc @@ -86,11 +86,4 @@ /**/ - -#define STR_IMAPDLG_SAVE(RID_SVX_IMAPDLG_START + 5) -#define STR_IMAPDLG_MODIFY (RID_SVX_IMAPDLG_START + 6) - - -/**/ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/imapdlg.src b/svx/source/dialog/imapdlg.src index 730ef28..486217a 100644 --- a/svx/source/dialog/imapdlg.src +++ b/svx/source/dialog/imapdlg.src @@ -344,14 +344,5 @@ Menu RID_SVXMN_IMAP /**/ -String STR_IMAPDLG_SAVE -{ -Text [ en-US ] = The ImageMap has been modified.\nDo you want to save the changes?; -}; - -String STR_IMAPDLG_MODIFY -{ -Text [ en-US ] = The ImageMap has been modified.\nDo you want to save the changes? ; -}; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui b/svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui new file mode 100644 index 000..33e388e --- /dev/null +++ b/svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui @@ -0,0 +1,52 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkMessageDialog id=QueryModifyImageMapChangesDialog +property name=can_focusFalse/property +property name=border_width12/property +property name=title translatable=yesSave ImageMap changes
[Libreoffice-commits] core.git: svx/source svx/uiconfig svx/UIConfig_svx.mk
svx/UIConfig_svx.mk |4 ++ svx/source/dialog/_contdlg.cxx| 10 ++--- svx/source/dialog/contdlg.hrc |4 -- svx/source/dialog/contdlg.src | 21 -- svx/uiconfig/ui/querydeletecontourdialog.ui | 36 ++ svx/uiconfig/ui/querynewcontourdialog.ui | 34 + svx/uiconfig/ui/querysavecontchangesdialog.ui | 52 ++ svx/uiconfig/ui/queryunlinkgraphicsdialog.ui | 35 + 8 files changed, 166 insertions(+), 30 deletions(-) New commits: commit 6931f431331d4cb5b5619c29d5f615f4245a66be Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Wed Dec 4 13:40:46 2013 +0300 convert Contour queryboxes to .ui Change-Id: Ie6dad2409a7d58a1c01973e8740f436cb597cb99 Reviewed-on: https://gerrit.libreoffice.org/6923 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk index 1780983..fb29eb1 100644 --- a/svx/UIConfig_svx.mk +++ b/svx/UIConfig_svx.mk @@ -21,6 +21,10 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\ svx/uiconfig/ui/linkwarndialog \ svx/uiconfig/ui/optgridpage \ svx/uiconfig/ui/passwd \ + svx/uiconfig/ui/querydeletecontourdialog \ + svx/uiconfig/ui/querynewcontourdialog \ + svx/uiconfig/ui/querysavecontchangesdialog \ + svx/uiconfig/ui/queryunlinkgraphicsdialog \ svx/uiconfig/ui/redlinecontrol \ svx/uiconfig/ui/redlinefilterpage \ svx/uiconfig/ui/redlineviewpage \ diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index d0fcd9e..a3051b4 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -43,6 +43,7 @@ #include vcl/svapp.hxx #include vcl/virdev.hxx #include dlgunit.hxx +#include vcl/layout.hxx SFX_IMPL_FLOATINGWINDOW_WITHID( SvxContourDlgChildWindow, SID_CONTOUR_DLG ); @@ -303,8 +304,7 @@ sal_Bool SvxSuperContourDlg::Close() if ( aTbx1.IsItemEnabled( TBI_APPLY ) ) { -QueryBoxaQBox( this, WB_YES_NO_CANCEL | WB_DEF_YES, - CONT_RESID(STR_CONTOURDLG_MODIFY).toString() ); +MessageDialog aQBox( this,QuerySaveContourChangesDialog,svx/ui/querysavecontchangesdialog.ui); const long nRet = aQBox.Execute(); if ( nRet == RET_YES ) @@ -439,7 +439,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx ) { if ( aTbx1.IsItemChecked( TBI_WORKPLACE ) ) { -QueryBox aQBox( this, WB_YES_NO | WB_DEF_NO, CONT_RESID(STR_CONTOURDLG_WORKPLACE).toString() ); +MessageDialog aQBox( this,QueryDeleteContourDialog,svx/ui/querydeletecontourdialog.ui); if ( !aContourWnd.IsContourChanged() || ( aQBox.Execute() == RET_YES ) ) aContourWnd.SetWorkplaceMode( sal_True ); @@ -535,7 +535,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx ) aStbStatus.Invalidate(); else if ( bGraphicLinked ) { -QueryBox aQBox( this, WB_YES_NO | WB_DEF_YES, CONT_RESID(STR_CONTOURDLG_LINKED).toString() ); +MessageDialog aQBox( this,QueryUnlinkGraphicsDialog,svx/ui/queryunlinkgraphicsdialog.ui); if ( aQBox.Execute() != RET_YES ) { @@ -733,7 +733,7 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow*, pWnd ) if( !!aMask ) { -QueryBoxaQBox( this, WB_YES_NO | WB_DEF_YES, CONT_RESID(STR_CONTOURDLG_NEWPIPETTE).toString() ); +MessageDialog aQBox( this,QueryNewContourDialog,svx/ui/querynewcontourdialog.ui); sal_BoolbNewContour; aRedoGraphic = Graphic(); diff --git a/svx/source/dialog/contdlg.hrc b/svx/source/dialog/contdlg.hrc index 07afc01..aec18aa 100644 --- a/svx/source/dialog/contdlg.hrc +++ b/svx/source/dialog/contdlg.hrc @@ -61,9 +61,5 @@ /**/ -#define STR_CONTOURDLG_MODIFY (RID_SVX_CONTOURDLG_START + 2) -#define STR_CONTOURDLG_NEWPIPETTE (RID_SVX_CONTOURDLG_START + 3) -#define STR_CONTOURDLG_WORKPLACE(RID_SVX_CONTOURDLG_START + 4) -#define STR_CONTOURDLG_LINKED (RID_SVX_CONTOURDLG_START + 5) /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/contdlg.src b/svx/source/dialog/contdlg.src index 41bee84..519b73c 100644 --- a/svx/source/dialog/contdlg.src +++ b/svx/source/dialog/contdlg.src @@ -220,26 +220,5 @@ FloatingWindow RID_SVXDLG_CONTOUR }; /**/ -String STR_CONTOURDLG_MODIFY -{ -Text [ en-US ] = The contour has been modified.\nDo you want to save the changes? ; -}; - -String
[Libreoffice-commits] core.git: sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/UIConfig_swriter.mk |1 sw/source/ui/app/app.src|4 - sw/source/ui/dochdl/swdtflvr.cxx|2 sw/source/ui/inc/app.hrc|1 sw/source/ui/uiview/view2.cxx |2 sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui | 34 6 files changed, 37 insertions(+), 7 deletions(-) New commits: commit b5fced896632a3c07586702b461545667b33966e Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Wed Nov 27 13:33:09 2013 +0300 convert Rotate into standard orientation querybox to .ui Change-Id: Id85362c0930a4156e569bd4c6b13aa94213f09c7 Reviewed-on: https://gerrit.libreoffice.org/6826 Tested-by: Caolán McNamara caol...@redhat.com Reviewed-by: Caolán McNamara caol...@redhat.com diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index 5b3a755..441cc43 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -159,6 +159,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/querycontinuebegindialog \ sw/uiconfig/swriter/ui/querycontinueenddialog \ sw/uiconfig/swriter/ui/querydefaultcompatdialog \ + sw/uiconfig/swriter/ui/queryrotateintostandarddialog \ sw/uiconfig/swriter/ui/querysavelabeldialog \ sw/uiconfig/swriter/ui/queryshowchangesdialog \ sw/uiconfig/swriter/ui/mmcreatingdialog \ diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src index bc8cd0e..a7863ce 100644 --- a/sw/source/ui/app/app.src +++ b/sw/source/ui/app/app.src @@ -708,10 +708,6 @@ ToolBox RID_MODULE_TOOLBOX Scroll = TRUE ; }; -String STR_ROTATE_TO_STANDARD_ORIENTATION -{ -Text [ en-US ] = This image is rotated. Would you like to rotate it into standard orientation?; -}; String STR_CAPTION_TABLE { diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index 045cf6c..98e9d1d 100644 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -381,7 +381,7 @@ namespace sal_uInt16 aRotation = aMetadata.getRotation(); if (aRotation != 0) { -QueryBox aQueryBox(0, WB_YES_NO | WB_DEF_YES, SW_RES(STR_ROTATE_TO_STANDARD_ORIENTATION) ); +MessageDialog aQueryBox( 0,QueryRotateIntoStandardOrientationDialog,modules/swriter/ui/queryrotateintostandarddialog.ui); if (aQueryBox.Execute() == RET_YES) { GraphicNativeTransform aTransform( aGraphic ); diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc index 3734788..c5ac3f5 100644 --- a/sw/source/ui/inc/app.hrc +++ b/sw/source/ui/inc/app.hrc @@ -101,7 +101,6 @@ #define STR_SIMPLE (RC_APP_BEGIN + 129) #define STR_AUTHMRK_EDIT(RC_APP_BEGIN + 130) #define STR_AUTHMRK_INSERT (RC_APP_BEGIN + 131) -#define STR_ROTATE_TO_STANDARD_ORIENTATION (RC_APP_BEGIN + 132) #define STR_CAPTION_TABLE (RC_APP_BEGIN + 133) #define STR_CAPTION_FRAME (RC_APP_BEGIN + 134) #define STR_CAPTION_GRAPHIC (RC_APP_BEGIN + 135) diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index 7c9aa10..9c04f53 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -225,7 +225,7 @@ int SwView::InsertGraphic( const OUString rPath, const OUString rFilter, sal_uInt16 aRotation = aMetadata.getRotation(); if (aRotation != 0) { -QueryBox aQueryBox(GetWindow(), WB_YES_NO | WB_DEF_YES, SW_RES(STR_ROTATE_TO_STANDARD_ORIENTATION) ); +MessageDialog aQueryBox( GetWindow(),QueryRotateIntoStandardOrientationDialog,modules/swriter/ui/queryrotateintostandarddialog.ui); if (aQueryBox.Execute() == RET_YES) { GraphicNativeTransform aTransform( aGraphic ); diff --git a/sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui b/sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui new file mode 100644 index 000..b50cdd9 --- /dev/null +++ b/sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui @@ -0,0 +1,34 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkMessageDialog id=QueryRotateIntoStandardOrientationDialog +property name=can_focusFalse/property +property name=border_width12/property +property name=title translatable=yesRotate into standard orientation?/property +property name=resizableFalse/property +property name=type_hintdialog/property +property name=skip_taskbar_hintTrue/property +property name=message_typequestion/property +property name=buttonsyes-no/property +property name=text translatable=yesThis image is rotated. Would you like to rotate it into standard orientation
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/UIConfig_cui.mk |1 cui/source/inc/cuires.hrc |1 cui/source/tabpages/strings.src |4 --- cui/source/tabpages/tphatch.cxx |3 -- cui/uiconfig/ui/querychangelineenddialog.ui |1 cui/uiconfig/ui/querydeletehatchdialog.ui | 34 ++ cui/uiconfig/ui/querydeletelinestyledialog.ui |1 cui/uiconfig/ui/queryduplicatedialog.ui |1 cui/uiconfig/ui/querynoloadedfiledialog.ui|1 cui/uiconfig/ui/querynosavefiledialog.ui |1 cui/uiconfig/ui/querysavelistdialog.ui|1 11 files changed, 42 insertions(+), 7 deletions(-) New commits: commit 533b91f87be3147a9a6bdb2e1b20165aa4921e37 Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Mon Nov 18 13:42:05 2013 +0300 convert delete hatch querybox to .ui Change-Id: If550ac8ad58ea7ff05650692d1a506c5088d05e2 Reviewed-on: https://gerrit.libreoffice.org/6708 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk index 830689b..474189a 100644 --- a/cui/UIConfig_cui.mk +++ b/cui/UIConfig_cui.mk @@ -106,6 +106,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\ cui/uiconfig/ui/querychangelineenddialog \ cui/uiconfig/ui/querydeletechartcolordialog \ cui/uiconfig/ui/querydeletedictionarydialog \ + cui/uiconfig/ui/querydeletehatchdialog \ cui/uiconfig/ui/querydeletelineenddialog \ cui/uiconfig/ui/querydeletelinestyledialog \ cui/uiconfig/ui/queryduplicatedialog \ diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 4a887c2..99fdaa2 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -86,7 +86,6 @@ #define RID_SVXSTR_ASK_CHANGE_LINESTYLE (RID_SVX_START + 177) #define RID_SVXSTR_DESC_HATCH (RID_SVX_START + 232) -#define RID_SVXSTR_ASK_DEL_HATCH(RID_SVX_START + 234) #define RID_SVXSTR_ASK_CHANGE_HATCH (RID_SVX_START + 235) #define RID_SVXSTR_CHANGE (RID_SVX_START + 181) #define RID_SVXSTR_ADD (RID_SVX_START + 182) diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src index 6d9d524..db8c177 100644 --- a/cui/source/tabpages/strings.src +++ b/cui/source/tabpages/strings.src @@ -59,10 +59,6 @@ String RID_SVXSTR_DESC_HATCH { Text [ en-US ] = Please enter a name for the hatching: ; }; -String RID_SVXSTR_ASK_DEL_HATCH -{ -Text [ en-US ] = Do you want to delete the hatching? ; -}; String RID_SVXSTR_ASK_CHANGE_HATCH { Text [ en-US ] = The hatching type was modified but not saved. \nModify the selected hatching type or add a new hatching type. ; diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index d6c4d60..6ebda18 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -626,8 +626,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickDeleteHdl_Impl) if( nPos != LISTBOX_ENTRY_NOTFOUND ) { -QueryBox aQueryBox( GetParentDialog(), WinBits( WB_YES_NO | WB_DEF_NO ), -OUString( CUI_RES( RID_SVXSTR_ASK_DEL_HATCH ) ) ); +MessageDialog aQueryBox( GetParentDialog(),AskDelHatchDialog,cui/ui/querydeletehatchdialog.ui); if( aQueryBox.Execute() == RET_YES ) { diff --git a/cui/uiconfig/ui/querychangelineenddialog.ui b/cui/uiconfig/ui/querychangelineenddialog.ui index 397afaf..8712336 100644 --- a/cui/uiconfig/ui/querychangelineenddialog.ui +++ b/cui/uiconfig/ui/querychangelineenddialog.ui @@ -5,6 +5,7 @@ property name=can_focusFalse/property property name=border_width12/property property name=title translatable=yesSave arrowhead ?/property +property name=resizableFalse/property property name=type_hintdialog/property property name=skip_taskbar_hintTrue/property property name=message_typewarning/property diff --git a/cui/uiconfig/ui/querydeletehatchdialog.ui b/cui/uiconfig/ui/querydeletehatchdialog.ui new file mode 100644 index 000..cd80209 --- /dev/null +++ b/cui/uiconfig/ui/querydeletehatchdialog.ui @@ -0,0 +1,34 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkMessageDialog id=AskDelHatchDialog +property name=can_focusFalse/property +property name=border_width12/property +property name=title translatable=yesDelete hatching?/property +property name=resizableFalse/property +property name=type_hintdialog/property +property name=skip_taskbar_hintTrue/property +property name=message_typequestion/property +property name=buttonsyes-no/property +property name=text translatable=yesDo you want to delete the hatching?/property +child internal-child=vbox + object class=GtkBox id=messagedialog-vbox +property name=can_focusFalse/property
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/UIConfig_cui.mk|1 cui/source/inc/cuires.hrc |1 cui/source/tabpages/strings.src|4 --- cui/source/tabpages/tpbitmap.cxx |3 -- cui/uiconfig/ui/querydeletebitmapdialog.ui | 34 + 5 files changed, 36 insertions(+), 7 deletions(-) New commits: commit f138a539ddd77265343fbdd1eadb4c4d990b0e38 Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Tue Nov 19 10:41:09 2013 +0300 convert delete bitmap querybox to .ui Change-Id: Ie789954555012f766e48f9605f84e0ca5b2bca6d Reviewed-on: https://gerrit.libreoffice.org/6717 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk index 474189a..5973275 100644 --- a/cui/UIConfig_cui.mk +++ b/cui/UIConfig_cui.mk @@ -104,6 +104,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\ cui/uiconfig/ui/positionsizedialog \ cui/uiconfig/ui/possizetabpage \ cui/uiconfig/ui/querychangelineenddialog \ + cui/uiconfig/ui/querydeletebitmapdialog \ cui/uiconfig/ui/querydeletechartcolordialog \ cui/uiconfig/ui/querydeletedictionarydialog \ cui/uiconfig/ui/querydeletehatchdialog \ diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 99fdaa2..c8507a6 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -78,7 +78,6 @@ #define RID_SVXSTR_DESC_GRADIENT(RID_SVX_START + 163) #define RID_SVXSTR_ASK_DEL_GRADIENT (RID_SVX_START + 165) #define RID_SVXSTR_ASK_CHANGE_GRADIENT (RID_SVX_START + 166) -#define RID_SVXSTR_ASK_DEL_BITMAP (RID_SVX_START + 171) #define RID_SVXSTR_ASK_CHANGE_BITMAP(RID_SVX_START + 172) #define RID_SVXSTR_DESC_NEW_BITMAP (RID_SVX_START + 168) #define RID_SVXSTR_DESC_EXT_BITMAP (RID_SVX_START + 169) diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src index db8c177..dee7e7e 100644 --- a/cui/source/tabpages/strings.src +++ b/cui/source/tabpages/strings.src @@ -39,10 +39,6 @@ String RID_SVXSTR_DESC_EXT_BITMAP { Text [ en-US ] = Please enter a name for the external bitmap: ; }; -String RID_SVXSTR_ASK_DEL_BITMAP -{ -Text [ en-US ] = Are you sure you want to delete the bitmap? ; -}; String RID_SVXSTR_ASK_CHANGE_BITMAP { Text [ en-US ] = The bitmap was modified without saving. \nModify the selected bitmap or add a new bitmap. ; diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index d3647e3..81373db 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -729,8 +729,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickDeleteHdl_Impl) if( nPos != LISTBOX_ENTRY_NOTFOUND ) { -QueryBox aQueryBox( GetParentDialog(), WinBits( WB_YES_NO | WB_DEF_NO ), -OUString( CUI_RES( RID_SVXSTR_ASK_DEL_BITMAP ) ) ); +MessageDialog aQueryBox( GetParentDialog(),AskDelBitmapDialog,cui/ui/querydeletebitmapdialog.ui); if( aQueryBox.Execute() == RET_YES ) { diff --git a/cui/uiconfig/ui/querydeletebitmapdialog.ui b/cui/uiconfig/ui/querydeletebitmapdialog.ui new file mode 100644 index 000..01f6e9b --- /dev/null +++ b/cui/uiconfig/ui/querydeletebitmapdialog.ui @@ -0,0 +1,34 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkMessageDialog id=AskDelBitmapDialog +property name=can_focusFalse/property +property name=border_width12/property +property name=title translatable=yesDelete bitmap?/property +property name=resizableFalse/property +property name=type_hintdialog/property +property name=skip_taskbar_hintTrue/property +property name=message_typequestion/property +property name=buttonsyes-no/property +property name=text translatable=yesAre you sure you want to delete the bitmap?/property +child internal-child=vbox + object class=GtkBox id=messagedialog-vbox +property name=can_focusFalse/property +property name=orientationvertical/property +property name=spacing24/property +child internal-child=action_area + object class=GtkButtonBox id=messagedialog-action_area +property name=can_focusFalse/property +property name=layout_stylecenter/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=pack_typeend/property +property name=position0/property + /packing +/child + /object +/child + /object +/interface ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/UIConfig_cui.mk |2 + cui/source/inc/cuires.hrc|2 - cui/source/tabpages/strings.src |8 -- cui/source/tabpages/tpcolor.cxx |3 -- cui/source/tabpages/tpgradnt.cxx |3 -- cui/uiconfig/ui/querydeletecolordialog.ui| 34 +++ cui/uiconfig/ui/querydeletegradientdialog.ui | 34 +++ 7 files changed, 72 insertions(+), 14 deletions(-) New commits: commit 7b069f4bc8138e03abf455998452dd0f6f8ed9ac Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Wed Nov 20 09:55:06 2013 +0300 convert delete gradient/color queryboxes to .ui Conflicts: cui/UIConfig_cui.mk Change-Id: Ie45c1c0d549fc879043d7f108f33e67adc4721fd Reviewed-on: https://gerrit.libreoffice.org/6729 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk index 5973275..d985912 100644 --- a/cui/UIConfig_cui.mk +++ b/cui/UIConfig_cui.mk @@ -106,7 +106,9 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\ cui/uiconfig/ui/querychangelineenddialog \ cui/uiconfig/ui/querydeletebitmapdialog \ cui/uiconfig/ui/querydeletechartcolordialog \ + cui/uiconfig/ui/querydeletecolordialog \ cui/uiconfig/ui/querydeletedictionarydialog \ + cui/uiconfig/ui/querydeletegradientdialog \ cui/uiconfig/ui/querydeletehatchdialog \ cui/uiconfig/ui/querydeletelineenddialog \ cui/uiconfig/ui/querydeletelinestyledialog \ diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index c8507a6..f856a25 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -76,7 +76,6 @@ #define RID_SVXSTR_EDIT_GRAPHIC (RID_SVX_START + 509) #define RID_SVXSTR_DESC_GRADIENT(RID_SVX_START + 163) -#define RID_SVXSTR_ASK_DEL_GRADIENT (RID_SVX_START + 165) #define RID_SVXSTR_ASK_CHANGE_GRADIENT (RID_SVX_START + 166) #define RID_SVXSTR_ASK_CHANGE_BITMAP(RID_SVX_START + 172) #define RID_SVXSTR_DESC_NEW_BITMAP (RID_SVX_START + 168) @@ -89,7 +88,6 @@ #define RID_SVXSTR_CHANGE (RID_SVX_START + 181) #define RID_SVXSTR_ADD (RID_SVX_START + 182) #define RID_SVXSTR_DESC_COLOR (RID_SVX_START + 215) -#define RID_SVXSTR_ASK_DEL_COLOR(RID_SVX_START + 217) #define RID_SVXSTR_ASK_CHANGE_COLOR (RID_SVX_START + 218) #define RID_SVXSTR_TABLE(RID_SVX_START + 220) #define RID_SVXSTR_CONNECTOR(RID_SVX_START + 221) diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src index dee7e7e..7eefbe5 100644 --- a/cui/source/tabpages/strings.src +++ b/cui/source/tabpages/strings.src @@ -23,10 +23,6 @@ String RID_SVXSTR_DESC_GRADIENT { Text [ en-US ] = Please enter a name for the gradient: ; }; -String RID_SVXSTR_ASK_DEL_GRADIENT -{ -Text [ en-US ] = Do you want to delete the gradient? ; -}; String RID_SVXSTR_ASK_CHANGE_GRADIENT { Text [ en-US ] = The gradient was modified without saving. \nModify the selected gradient or add a new gradient. ; @@ -71,10 +67,6 @@ String RID_SVXSTR_DESC_COLOR { Text [ en-US ] = Please enter a name for the new color: ; }; -String RID_SVXSTR_ASK_DEL_COLOR -{ -Text [ en-US ] = Do you want to delete the color? ; -}; String RID_SVXSTR_ASK_CHANGE_COLOR { Text [ en-US ] = The color was modified without saving.\nModify the selected color or add a new color. ; diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 379e3da..c677ee3 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -866,8 +866,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl) if( nPos != LISTBOX_ENTRY_NOTFOUND ) { -QueryBox aQueryBox( GetParentDialog(), WinBits( WB_YES_NO | WB_DEF_NO ), -OUString( CUI_RES( RID_SVXSTR_ASK_DEL_COLOR ) ) ); +MessageDialog aQueryBox( GetParentDialog(),AskDelColorDialog,cui/ui/querydeletecolordialog.ui); if( aQueryBox.Execute() == RET_YES ) { diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 001c042..10d708e 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -583,8 +583,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickDeleteHdl_Impl) if( nPos != LISTBOX_ENTRY_NOTFOUND ) { -QueryBox aQueryBox( GetParentDialog(), WinBits( WB_YES_NO | WB_DEF_NO ), -OUString( CUI_RES( RID_SVXSTR_ASK_DEL_GRADIENT ) ) ); +MessageDialog aQueryBox( GetParentDialog(),AskDelGradientDialog,cui/ui/querydeletegradientdialog.ui); if ( aQueryBox.Execute() == RET_YES ) { diff --git a/cui/uiconfig/ui/querydeletecolordialog.ui b/cui/uiconfig/ui/querydeletecolordialog.ui
[Libreoffice-commits] core.git: include/sfx2 sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk
include/sfx2/newstyle.hxx |8 +- sfx2/UIConfig_sfx.mk|1 sfx2/source/dialog/newstyle.cxx | 24 +++- sfx2/source/dialog/newstyle.hrc |4 - sfx2/source/dialog/newstyle.src | 36 sfx2/uiconfig/ui/newstyle.ui| 120 6 files changed, 135 insertions(+), 58 deletions(-) New commits: commit eb505c259d0d7bd05d1bb5be5a14ad8613c2a9c7 Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Thu Nov 7 15:12:10 2013 +0300 Convert New Style dialog to widget UI Change-Id: Idaea69f674e1e84e3e1e649006c2d92176897fe0 Reviewed-on: https://gerrit.libreoffice.org/6607 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/include/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx index 9584396..368d154 100644 --- a/include/sfx2/newstyle.hxx +++ b/include/sfx2/newstyle.hxx @@ -33,10 +33,8 @@ class SfxStyleSheetBasePool; class SFX2_DLLPUBLIC SfxNewStyleDlg : public ModalDialog { private: -FixedLine aColFL; -ComboBoxaColBox; -OKButtonaOKBtn; -CancelButtonaCancelBtn; +ComboBox* m_pColBox; +OKButton* m_pOKBtn; QueryBoxaQueryOverwriteBox; SfxStyleSheetBasePool rPool; @@ -48,7 +46,7 @@ public: SfxNewStyleDlg( Window* pParent, SfxStyleSheetBasePool ); ~SfxNewStyleDlg(); -OUStringGetName() const { return comphelper::string::stripStart(aColBox.GetText(), ' '); } +OUStringGetName() const { return comphelper::string::stripStart(m_pColBox-GetText(), ' '); } }; #endif diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk index a2629d2..1ae9091 100644 --- a/sfx2/UIConfig_sfx.mk +++ b/sfx2/UIConfig_sfx.mk @@ -19,6 +19,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\ sfx2/uiconfig/ui/errorfindemaildialog \ sfx2/uiconfig/ui/licensedialog \ sfx2/uiconfig/ui/managestylepage \ + sfx2/uiconfig/ui/newstyle \ sfx2/uiconfig/ui/optprintpage \ sfx2/uiconfig/ui/password \ sfx2/uiconfig/ui/printeroptionsdialog \ diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx index 2995a71..5f8e24e 100644 --- a/sfx2/source/dialog/newstyle.cxx +++ b/sfx2/source/dialog/newstyle.cxx @@ -31,7 +31,7 @@ IMPL_LINK( SfxNewStyleDlg, OKHdl, Control *, pControl ) { (void)pControl; //unused -const OUString aName( aColBox.GetText() ); +const OUString aName( m_pColBox-GetText() ); SfxStyleSheetBase* pStyle = rPool.Find( aName, rPool.GetSearchFamily(), SFXSTYLEBIT_ALL ); if ( pStyle ) { @@ -54,7 +54,7 @@ IMPL_LINK( SfxNewStyleDlg, OKHdl, Control *, pControl ) IMPL_LINK_INLINE_START( SfxNewStyleDlg, ModifyHdl, ComboBox *, pBox ) { -aOKBtn.Enable( !comphelper::string::remove(pBox-GetText(), ' ').isEmpty() ); +m_pOKBtn-Enable( !comphelper::string::remove(pBox-GetText(), ' ').isEmpty() ); return 0; } IMPL_LINK_INLINE_END( SfxNewStyleDlg, ModifyHdl, ComboBox *, pBox ) @@ -63,28 +63,26 @@ IMPL_LINK_INLINE_END( SfxNewStyleDlg, ModifyHdl, ComboBox *, pBox ) SfxNewStyleDlg::SfxNewStyleDlg( Window* pParent, SfxStyleSheetBasePool rInPool ) : -ModalDialog( pParent, SfxResId( DLG_NEW_STYLE_BY_EXAMPLE ) ), +ModalDialog( pParent, CreateStyleDialog, sfx/ui/newstyle.ui ), -aColFL ( this, SfxResId( FL_COL ) ), -aColBox ( this, SfxResId( LB_COL ) ), -aOKBtn ( this, SfxResId( BT_OK ) ), -aCancelBtn ( this, SfxResId( BT_CANCEL ) ), aQueryOverwriteBox ( this, SfxResId( MSG_OVERWRITE ) ), rPool( rInPool ) { -FreeResource(); +get(m_pColBox, stylename); +m_pColBox-set_width_request(m_pColBox-approximate_char_width() * 25); +m_pColBox-set_height_request(m_pColBox-GetTextHeight() * 10); +get(m_pOKBtn, ok); -aOKBtn.SetClickHdl(LINK(this, SfxNewStyleDlg, OKHdl)); -aColBox.SetModifyHdl(LINK(this, SfxNewStyleDlg, ModifyHdl)); -aColBox.SetDoubleClickHdl(LINK(this, SfxNewStyleDlg, OKHdl)); -//aColBox.SetAccessibleName(SfxResId(FL_COL).toString()); +m_pOKBtn-SetClickHdl(LINK(this, SfxNewStyleDlg, OKHdl)); +m_pColBox-SetModifyHdl(LINK(this, SfxNewStyleDlg, ModifyHdl)); +m_pColBox-SetDoubleClickHdl(LINK(this, SfxNewStyleDlg, OKHdl)); SfxStyleSheetBase *pStyle = rPool.First(); while ( pStyle ) { -aColBox.InsertEntry(pStyle-GetName()); +m_pColBox-InsertEntry(pStyle-GetName()); pStyle = rPool.Next(); } } diff --git a/sfx2/source/dialog/newstyle.hrc b/sfx2/source/dialog/newstyle.hrc index 0262c89..4725dbd 100644 --- a/sfx2/source/dialog/newstyle.hrc +++ b/sfx2/source/dialog/newstyle.hrc @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define BT_OK 100 -#define BT_CANCEL 101 -#define LB_COL 1
[Libreoffice-commits] core.git: include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk
include/svx/dialogs.hrc |3 include/svx/passwd.hxx | 21 +-- svx/UIConfig_svx.mk |1 svx/inc/helpid.hrc |1 svx/source/dialog/passwd.cxx | 69 -- svx/source/dialog/passwd.hrc | 44 --- svx/source/dialog/passwd.src | 97 +-- svx/uiconfig/ui/passwd.ui| 270 +++ 8 files changed, 319 insertions(+), 187 deletions(-) New commits: commit ff3203c5c567ed14a8ff2e80408c304d3cdd84e0 Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Mon Sep 30 11:22:50 2013 +0300 Convert change password dialog to widget UI Change-Id: I0ff0eda77b849927fe6cffe5cf203c46ba9ef340 Reviewed-on: https://gerrit.libreoffice.org/6089 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index 4c1ba17..4c3d681 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -200,7 +200,6 @@ // for Toolbox-Control style #define RID_SVXTBX_STYLE(RID_SVX_START + 120) -#define RID_SVXDLG_PASSWORD (RID_SVX_START + 141) #define RID_SVXDLG_COMPRESSGRAPHICS (RID_SVX_START + 142) // Dialog for functions @@ -995,6 +994,8 @@ #define RID_SVXSTR_DOC_MODIFIED_YES (SVX_OOO_BUILD_START + 4) // 1234 #define RID_SVXSTR_DOC_MODIFIED_NO (SVX_OOO_BUILD_START + 5) // 1235 #define RID_SVXSTR_DOC_LOAD (SVX_OOO_BUILD_START + 6) // 1236 +#define RID_SVXSTR_ERR_OLD_PASSWD(SVX_OOO_BUILD_START + 7) // 1237 +#define RID_SVXSTR_ERR_REPEAT_PASSWD (SVX_OOO_BUILD_START + 8) // 1238 // sidebar-related resources (defined in the appropriate .hrc's) #define RID_SVX_SIDEBAR_BEGIN(RID_SVX_START + 1240) diff --git a/include/svx/passwd.hxx b/include/svx/passwd.hxx index 532ee6e0..1009597 100644 --- a/include/svx/passwd.hxx +++ b/include/svx/passwd.hxx @@ -33,17 +33,12 @@ class SVX_DLLPUBLIC SvxPasswordDialog : public SfxModalDialog { private: -FixedLine aOldFL; -FixedText aOldPasswdFT; -EditaOldPasswdED; -FixedLine aNewFL; -FixedText aNewPasswdFT; -EditaNewPasswdED; -FixedText aRepeatPasswdFT; -EditaRepeatPasswdED; -OKButtonaOKBtn; -CancelButtonaEscBtn; -HelpButton aHelpBtn; +FixedText* m_pOldFL; +FixedText* m_pOldPasswdFT; +Edit* m_pOldPasswdED; +Edit* m_pNewPasswdED; +Edit* m_pRepeatPasswdED; +OKButton* m_pOKBtn; OUStringaOldPasswdErrStr; OUStringaRepeatPasswdErrStr; @@ -59,8 +54,8 @@ public: SvxPasswordDialog( Window* pParent, sal_Bool bAllowEmptyPasswords = sal_False, sal_Bool bDisableOldPassword = sal_False ); ~SvxPasswordDialog(); -OUStringGetOldPassword() const { return aOldPasswdED.GetText(); } -OUStringGetNewPassword() const { return aNewPasswdED.GetText(); } +OUStringGetOldPassword() const { return m_pOldPasswdED-GetText(); } +OUStringGetNewPassword() const { return m_pNewPasswdED-GetText(); } voidSetCheckPasswordHdl( const Link rLink ) { aCheckPasswordHdl = rLink; } }; diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk index 7b98a08..cb4c759 100644 --- a/svx/UIConfig_svx.mk +++ b/svx/UIConfig_svx.mk @@ -19,6 +19,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\ svx/uiconfig/ui/headfootformatpage \ svx/uiconfig/ui/findreplacedialog \ svx/uiconfig/ui/optgridpage \ + svx/uiconfig/ui/passwd \ svx/uiconfig/ui/redlinecontrol \ svx/uiconfig/ui/redlinefilterpage \ svx/uiconfig/ui/redlineviewpage \ diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc index e9e1666..2e41991 100644 --- a/svx/inc/helpid.hrc +++ b/svx/inc/helpid.hrc @@ -143,7 +143,6 @@ #define HID_MNU_ZOOM_OPTIMAL SVX_HID_MNU_ZOOM_OPTIMAL #define HID_MNU_ZOOM_PAGE_WIDTH SVX_HID_MNU_ZOOM_PAGE_WIDTH #define HID_MNU_ZOOM_WHOLE_PAGE SVX_HID_MNU_ZOOM_WHOLE_PAGE -#define HID_PASSWORD SVX_HID_PASSWORD #define HID_POPUP_COLOR SVX_HID_POPUP_COLOR #define HID_POPUP_COLOR_CTRL SVX_HID_POPUP_COLOR_CTRL #define HID_POPUP_FONTWORK_ALIGN SVX_HID_POPUP_FONTWORK_ALIGN diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index 2e80408..25b2314 100644 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -23,7 +23,6 @@ #include svx/passwd.hxx #include svx/dialmgr.hxx #include svx/dialogs.hrc -#include passwd.hrc // class SvxPasswordDialog --- @@ -33,20 +32,20 @@ IMPL_LINK_NOARG(SvxPasswordDialog
[Libreoffice-commits] core.git: extensions/AllLangResTarget_pcr.mk extensions/Module_extensions.mk extensions/source extensions/UIConfig_spropctrlr.mk extras/source scp2/source
extensions/AllLangResTarget_pcr.mk |1 extensions/Module_extensions.mk|1 extensions/UIConfig_spropctrlr.mk | 16 extensions/source/propctrlr/taborder.cxx | 75 ++-- extensions/source/propctrlr/taborder.hrc | 36 -- extensions/source/propctrlr/taborder.hxx | 15 extensions/source/propctrlr/taborder.src | 96 - extensions/source/propctrlr/uiconfig/spropctrlr/ui/taborder.ui | 170 ++ extras/source/glade/libreoffice-catalog.xml.in |3 scp2/source/ooo/file_ooo.scp |1 10 files changed, 238 insertions(+), 176 deletions(-) New commits: commit 2f7f7e7717075867080433ba09188a09830584ab Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Tue Sep 17 08:46:10 2013 +0300 Convert tab order dialog to widget UI Change-Id: I2aebcf6486b80af31f1a06e9ae38e5610bee0cb4 Reviewed-on: https://gerrit.libreoffice.org/5970 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/extensions/AllLangResTarget_pcr.mk b/extensions/AllLangResTarget_pcr.mk index ad32eb5..415cb55 100644 --- a/extensions/AllLangResTarget_pcr.mk +++ b/extensions/AllLangResTarget_pcr.mk @@ -28,7 +28,6 @@ $(eval $(call gb_SrsTarget_add_files,pcr/res,\ extensions/source/propctrlr/propres.src \ extensions/source/propctrlr/formres.src \ extensions/source/propctrlr/pcrmiscres.src \ - extensions/source/propctrlr/taborder.src \ extensions/source/propctrlr/fontdialog.src \ extensions/source/propctrlr/selectlabeldialog.src \ extensions/source/propctrlr/formlinkdialog.src \ diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 0f7857e..20fc58c 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Module_add_targets,extensions,\ Library_dbp \ Library_pcr \ UIConfig_sbibliography \ + UIConfig_spropctrlr \ )) endif diff --git a/extensions/UIConfig_spropctrlr.mk b/extensions/UIConfig_spropctrlr.mk new file mode 100644 index 000..4a4becc --- /dev/null +++ b/extensions/UIConfig_spropctrlr.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UIConfig_UIConfig,modules/spropctrlr)) + +$(eval $(call gb_UIConfig_add_uifiles,modules/spropctrlr,\ + extensions/source/propctrlr/uiconfig/spropctrlr/ui/taborder \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index bbb0f6f..285aedc 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -18,7 +18,6 @@ */ #include taborder.hxx -#include taborder.hrc #include modulepcr.hxx #include formresid.hrc @@ -29,7 +28,8 @@ #include com/sun/star/form/FormComponentType.hpp #include com/sun/star/form/runtime/FormController.hpp #include vcl/scrbar.hxx -#include svtools/treelistentry.hxx +#include svtools/treelistentry.hxx +#include vcl/builder.hxx // namespace pcr @@ -74,27 +74,25 @@ namespace pcr // TabOrderDialog::TabOrderDialog( Window* _pParent, const Reference XTabControllerModel _rxTabModel, const Reference XControlContainer _rxControlCont, const Reference XComponentContext _rxORB ) -:ModalDialog( _pParent, PcrRes( RID_DLG_TABORDER ) ) +:ModalDialog( _pParent, TabOrderDialog, modules/spropctrlr/ui/taborder.ui) ,m_xModel( _rxTabModel ) ,m_xControlContainer( _rxControlCont ) ,m_xORB( _rxORB ) -,aFT_Controls( this, PcrRes( FT_CONTROLS ) ) -,aLB_Controls( this, PcrRes( CTRL_TREE ) ) -,aPB_OK( this, PcrRes( PB_OK ) ) -,aPB_CANCEL( this, PcrRes( PB_CANCEL ) ) -,aPB_HELP( this, PcrRes( PB_HELP ) ) -,aPB_MoveUp( this, PcrRes( PB_MOVE_UP ) ) -,aPB_MoveDown( this, PcrRes( PB_MOVE_DOWN ) ) -,aPB_AutoOrder( this, PcrRes( PB_AUTO_ORDER ) ) ,pImageList( NULL ) { +get(m_pLB_Controls, CTRLtree); +get(m_pPB_OK, ok); +get(m_pPB_MoveUp, upB); +get(m_pPB_MoveDown, downB); +get(m_pPB_AutoOrder, autoB); + DBG_CTOR(TabOrderDialog,NULL); -aPB_MoveUp.SetClickHdl( LINK( this, TabOrderDialog, MoveUpClickHdl
[Libreoffice-commits] core.git: chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk
chart2/UIConfig_chart2.mk |1 chart2/source/controller/dialogs/tp_AxisLabel.cxx | 184 - chart2/source/controller/dialogs/tp_AxisLabel.hxx | 43 +- chart2/source/controller/dialogs/tp_AxisLabel.src | 187 - chart2/uiconfig/ui/tp_axisLabel.ui| 425 ++ 5 files changed, 536 insertions(+), 304 deletions(-) New commits: commit 07aade88b05c3388b3344b8c244b0815b61ac141 Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Wed Sep 4 10:52:43 2013 +0300 tp_axisLabel.ui widgets Change-Id: I279d2989e6a3a8f0aa279c5aa8eb13251a6052da Reviewed-on: https://gerrit.libreoffice.org/5801 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk index ea08c58..999547c 100644 --- a/chart2/UIConfig_chart2.mk +++ b/chart2/UIConfig_chart2.mk @@ -36,6 +36,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\ chart2/uiconfig/ui/smoothlinesdlg \ chart2/uiconfig/ui/steppedlinesdlg \ chart2/uiconfig/ui/titlerotationtabpage \ + chart2/uiconfig/ui/tp_axisLabel \ chart2/uiconfig/ui/tp_SeriesToAxis \ )) diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index 606052f..59ad0b5 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -36,30 +36,7 @@ namespace chart { SchAxisLabelTabPage::SchAxisLabelTabPage( Window* pParent, const SfxItemSet rInAttrs ) : -SfxTabPage( pParent, SchResId( TP_AXIS_LABEL ), rInAttrs ), - -aCbShowDescription( this, SchResId( CB_AXIS_LABEL_SCHOW_DESCR ) ), - -aFlOrder( this, SchResId( FL_AXIS_LABEL_ORDER ) ), -aRbSideBySide( this, SchResId( RB_AXIS_LABEL_SIDEBYSIDE ) ), -aRbUpDown( this, SchResId( RB_AXIS_LABEL_UPDOWN ) ), -aRbDownUp( this, SchResId( RB_AXIS_LABEL_DOWNUP ) ), -aRbAuto( this, SchResId( RB_AXIS_LABEL_AUTOORDER ) ), - -aFlSeparator( this, SchResId( FL_SEPARATOR ) ), -aFlTextFlow( this, SchResId( FL_AXIS_LABEL_TEXTFLOW ) ), -aCbTextOverlap( this, SchResId( CB_AXIS_LABEL_TEXTOVERLAP ) ), -aCbTextBreak( this, SchResId( CB_AXIS_LABEL_TEXTBREAK ) ), - -aFlOrient( this, SchResId( FL_AXIS_LABEL_ORIENTATION ) ), -aCtrlDial( this, SchResId( CT_AXIS_LABEL_DIAL ) ), -aFtRotate( this, SchResId( FT_AXIS_LABEL_DEGREES ) ), -aNfRotate( this, SchResId( NF_AXIS_LABEL_ORIENT ) ), -aCbStacked( this, SchResId( PB_AXIS_LABEL_TEXTSTACKED ) ), -aOrientHlp( aCtrlDial, aNfRotate, aCbStacked ), - -m_aFtTextDirection( this, SchResId( FT_AXIS_TEXTDIR ) ), -m_aLbTextDirection( this, SchResId( LB_AXIS_TEXTDIR ), m_aFtTextDirection ), +SfxTabPage( pParent, AxisLabelTabPage,modules/schart/ui/tp_axisLabel.ui, rInAttrs ), m_bShowStaggeringControls( true ), @@ -69,22 +46,39 @@ SchAxisLabelTabPage::SchAxisLabelTabPage( Window* pParent, const SfxItemSet rIn m_bHasInitialStacking( true ), m_bComplexCategories( false ) { -FreeResource(); - -aCbStacked.EnableTriState( sal_False ); -aOrientHlp.AddDependentWindow( aFlOrient ); -aOrientHlp.AddDependentWindow( aFtRotate, STATE_CHECK ); - -aCbShowDescription.SetClickHdl( LINK( this, SchAxisLabelTabPage, ToggleShowLabel ) ); - -// Make the fixed line separator vertical. -aFlSeparator.SetStyle (aFlSeparator.GetStyle() | WB_VERT); +get(m_pCbShowDescription, showlabelsCB); +get(m_pFlOrder, orderL); +get(m_pRbSideBySide, tile); +get(m_pRbUpDown, odd); +get(m_pRbDownUp, even); +get(m_pRbAuto, auto); +get(m_pFlTextFlow, textflowL); +get(m_pCbTextOverlap, overlapCB); +get(m_pCbTextBreak, breakCB); +get(m_pFlOrient, labelTextOrient); +get(m_pCtrlDial,dialCtrl); +get(m_pFtRotate,degreeL); +get(m_pNfRotate,OrientDegree); +get(m_pCbStacked,stackedCB); +get(m_pFtTextDirection,textdirL); +get(m_pLbTextDirection,textdirLB); +get(m_pFtABCD,labelABCD); +m_pCtrlDial-SetText(m_pFtABCD-GetText()); +m_pOrientHlp = new svx::OrientationHelper(*m_pCtrlDial, *m_pNfRotate, *m_pCbStacked); +m_pOrientHlp-Enable( sal_True ); + + +m_pCbStacked-EnableTriState( sal_False ); +m_pOrientHlp-AddDependentWindow( *m_pFlOrient ); +m_pOrientHlp-AddDependentWindow( *m_pFtRotate, STATE_CHECK ); + +m_pCbShowDescription-SetClickHdl( LINK( this, SchAxisLabelTabPage, ToggleShowLabel ) ); Construct(); } SchAxisLabelTabPage::~SchAxisLabelTabPage() -{} +{delete m_pOrientHlp;} void SchAxisLabelTabPage::Construct() { @@ -98,16 +92,16 @@ SfxTabPage* SchAxisLabelTabPage::Create( Window* pParent, const SfxItemSet rAtt sal_Bool SchAxisLabelTabPage::FillItemSet( SfxItemSet rOutAttrs ) { bool bStacked = false
[Libreoffice-commits] core.git: chart2/AllLangResTarget_chartcontroller.mk chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk extras/source
chart2/AllLangResTarget_chartcontroller.mk|1 chart2/UIConfig_chart2.mk |1 chart2/source/controller/dialogs/TextDirectionListBox.cxx | 21 + chart2/source/controller/dialogs/tp_TitleRotation.cxx | 47 +-- chart2/source/controller/dialogs/tp_TitleRotation.hxx | 16 - chart2/source/controller/dialogs/tp_TitleRotation.src | 87 -- chart2/source/controller/inc/HelpIds.hrc |3 chart2/source/controller/inc/TextDirectionListBox.hxx |2 chart2/uiconfig/ui/titlerotationtabpage.ui| 188 ++ extras/source/glade/libreoffice-catalog.xml.in|5 10 files changed, 246 insertions(+), 125 deletions(-) New commits: commit 0e2ef09316246c10140b1b25036f5c44dfc432ba Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Sun Sep 1 15:28:18 2013 +0300 titlerotationtabpage.ui widgets Change-Id: I187ec2b6bbee10820fcea5b770972fc63b2f7117 Reviewed-on: https://gerrit.libreoffice.org/5729 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk index ce4309f..3c0cde9 100644 --- a/chart2/AllLangResTarget_chartcontroller.mk +++ b/chart2/AllLangResTarget_chartcontroller.mk @@ -60,7 +60,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\ chart2/source/controller/dialogs/tp_PolarOptions.src \ chart2/source/controller/dialogs/tp_RangeChooser.src \ chart2/source/controller/dialogs/tp_Scale.src \ -chart2/source/controller/dialogs/tp_TitleRotation.src \ chart2/source/controller/dialogs/tp_Trendline.src \ chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src \ )) diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk index 1ad18c7..ea08c58 100644 --- a/chart2/UIConfig_chart2.mk +++ b/chart2/UIConfig_chart2.mk @@ -35,6 +35,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\ chart2/uiconfig/ui/insertgriddlg \ chart2/uiconfig/ui/smoothlinesdlg \ chart2/uiconfig/ui/steppedlinesdlg \ + chart2/uiconfig/ui/titlerotationtabpage \ chart2/uiconfig/ui/tp_SeriesToAxis \ )) diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx index af699e4..25efde3 100644 --- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx +++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx @@ -22,6 +22,7 @@ #include Strings.hrc #include svl/languageoptions.hxx #include vcl/window.hxx +#include vcl/builder.hxx namespace chart { @@ -41,6 +42,26 @@ TextDirectionListBox::TextDirectionListBox( Window* pParent, const ResId rResId } } +TextDirectionListBox::TextDirectionListBox( Window* pParent, Window* pWindow1, Window* pWindow2 ) : +svx::FrameDirectionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_DROPDOWN) +{ +InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_LTR ), FRMDIR_HORI_LEFT_TOP ); +InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_RTL ), FRMDIR_HORI_RIGHT_TOP ); +InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_SUPER ), FRMDIR_ENVIRONMENT ); + +if( !SvtLanguageOptions().IsCTLFontEnabled() ) +{ +Hide(); +if( pWindow1 ) pWindow1-Hide(); +if( pWindow2 ) pWindow2-Hide(); +} +} + +extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTextDirectionListBox(Window *pParent, VclBuilder::stringmap ) + { + return new TextDirectionListBox(pParent); + } + TextDirectionListBox::~TextDirectionListBox() { } diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx index 225398a..e79b3b3 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx @@ -34,34 +34,31 @@ namespace chart SchAlignmentTabPage::SchAlignmentTabPage(Window* pWindow, const SfxItemSet rInAttrs, bool bWithRotation) : -SfxTabPage(pWindow, SchResId(TP_ALIGNMENT), rInAttrs), -aFlAlign( this, SchResId( FL_ALIGN ) ), -aCtrlDial ( this, SchResId( CTR_DIAL ) ), -aFtRotate ( this, SchResId( FT_DEGREES ) ), -aNfRotate ( this, SchResId( NF_ORIENT ) ), -aCbStacked ( this, SchResId( BTN_TXTSTACKED ) ), -aOrientHlp ( aCtrlDial, aNfRotate, aCbStacked ), -aFtTextDirection( this, SchResId( FT_TEXTDIR ) ), -aLbTextDirection( this, SchResId( LB_TEXTDIR ), aFtTextDirection ) +SfxTabPage(pWindow, TitleRotationTabPage,modules/schart/ui/titlerotationtabpage.ui, rInAttrs) { -FreeResource(); - -aCbStacked.EnableTriState( sal_False ); -aOrientHlp.AddDependentWindow( aFtRotate, STATE_CHECK ); +get(m_pCtrlDial,dialCtrl); +get(m_pFtRotate,degreeL); +get(m_pNfRotate
[Libreoffice-commits] core.git: sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/UIConfig_scalc.mk |1 sc/source/ui/dbgui/validate.cxx | 62 - sc/source/ui/dbgui/validate.src | 84 sc/source/ui/inc/validate.hrc | 12 - sc/source/ui/inc/validate.hxx | 15 -- sc/uiconfig/scalc/ui/erroralerttabpage.ui | 200 ++ 6 files changed, 236 insertions(+), 138 deletions(-) New commits: commit d0c166ad33042403c5ecf9367c3362542cb3549a Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Mon Aug 19 10:01:25 2013 +0300 erroralerttabpage.ui widgets Change-Id: Ia0a11f636b864e5dd7c8ef6f4e8d1c3bb6f0a26f Reviewed-on: https://gerrit.libreoffice.org/5507 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 7776682..9274dd6 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -71,6 +71,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/deletecells \ sc/uiconfig/scalc/ui/deletecontents \ sc/uiconfig/scalc/ui/descriptivestatisticsdialog \ + sc/uiconfig/scalc/ui/erroralerttabpage \ sc/uiconfig/scalc/ui/externaldata \ sc/uiconfig/scalc/ui/filldlg \ sc/uiconfig/scalc/ui/footerdialog \ diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 83419ae..07c3c19 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -764,20 +764,16 @@ ScTPValidationError::ScTPValidationError( Window* pParent, const SfxItemSet rArgSet ) : SfxTabPage ( pParent, - ScResId( TP_VALIDATION_ERROR ), - rArgSet ), -aTsbShow( this, ScResId( TSB_SHOW ) ), -aFlContent ( this, ScResId( FL_CONTENT ) ), -aFtAction ( this, ScResId( FT_ACTION ) ), -aLbAction ( this, ScResId( LB_ACTION ) ), -aBtnSearch ( this, ScResId( BTN_SEARCH ) ), -aFtTitle( this, ScResId( FT_TITLE ) ), -aEdtTitle ( this, ScResId( EDT_TITLE ) ), -aFtError( this, ScResId( FT_ERROR ) ), -aEdError( this, ScResId( EDT_ERROR ) ) + ErrorAlertTabPage , modules/scalc/ui/erroralerttabpage.ui , + rArgSet ) { +get(m_pTsbShow,tsbshow); +get(m_pLbAction,actionCB); +get(m_pBtnSearch,browseBtn); +get(m_pEdtTitle,title); +get(m_pFtError,errormsg_label); +get(m_pEdError,errorMsg); Init(); -FreeResource(); } // --- @@ -790,11 +786,11 @@ ScTPValidationError::~ScTPValidationError() void ScTPValidationError::Init() { -aLbAction.SetSelectHdl( LINK( this, ScTPValidationError, SelectActionHdl ) ); -aBtnSearch.SetClickHdl( LINK( this, ScTPValidationError, ClickSearchHdl ) ); +m_pLbAction-SetSelectHdl( LINK( this, ScTPValidationError, SelectActionHdl ) ); +m_pBtnSearch-SetClickHdl( LINK( this, ScTPValidationError, ClickSearchHdl ) ); -aLbAction.SelectEntryPos( 0 ); -aTsbShow.EnableTriState( false ); +m_pLbAction-SelectEntryPos( 0 ); +m_pTsbShow-EnableTriState( false ); SelectActionHdl( NULL ); } @@ -821,24 +817,24 @@ void ScTPValidationError::Reset( const SfxItemSet rArgSet ) const SfxPoolItem* pItem; if ( rArgSet.GetItemState( FID_VALID_SHOWERR, sal_True, pItem ) == SFX_ITEM_SET ) -aTsbShow.SetState( ((const SfxBoolItem*)pItem)-GetValue() ? STATE_CHECK : STATE_NOCHECK ); +m_pTsbShow-SetState( ((const SfxBoolItem*)pItem)-GetValue() ? STATE_CHECK : STATE_NOCHECK ); else -aTsbShow.SetState( STATE_CHECK ); // check by default +m_pTsbShow-SetState( STATE_CHECK ); // check by default if ( rArgSet.GetItemState( FID_VALID_ERRSTYLE, sal_True, pItem ) == SFX_ITEM_SET ) -aLbAction.SelectEntryPos( ((const SfxAllEnumItem*)pItem)-GetValue() ); +m_pLbAction-SelectEntryPos( ((const SfxAllEnumItem*)pItem)-GetValue() ); else -aLbAction.SelectEntryPos( 0 ); +m_pLbAction-SelectEntryPos( 0 ); if ( rArgSet.GetItemState( FID_VALID_ERRTITLE, sal_True, pItem ) == SFX_ITEM_SET ) -aEdtTitle.SetText( ((const SfxStringItem*)pItem)-GetValue() ); +m_pEdtTitle-SetText( ((const SfxStringItem*)pItem)-GetValue() ); else -aEdtTitle.SetText( EMPTY_STRING ); +m_pEdtTitle-SetText( EMPTY_STRING ); if ( rArgSet.GetItemState( FID_VALID_ERRTEXT, sal_True, pItem ) == SFX_ITEM_SET ) -aEdError.SetText( ((const SfxStringItem*)pItem)-GetValue() ); +m_pEdError-SetText( ((const SfxStringItem*)pItem)-GetValue() ); else -aEdError.SetText( EMPTY_STRING ); +m_pEdError-SetText( EMPTY_STRING
[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/AllLangResTarget_cui.mk |1 cui/UIConfig_cui.mk |1 cui/source/dialogs/cuiimapdlg.hrc | 38 - cui/source/dialogs/cuiimapdlg.src | 147 cui/source/dialogs/cuiimapwnd.cxx | 37 + cui/source/inc/cuiimapwnd.hxx | 29 +--- cui/uiconfig/ui/cuiimapdlg.ui | 269 ++ 7 files changed, 293 insertions(+), 229 deletions(-) New commits: commit 1e91ddc06159806620d93385c900cd3d98b14814 Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Thu Aug 1 13:56:03 2013 +0300 Convert ImageMap Properties to Widget UI Change-Id: I619b2dab67b22d75839b9968e7e784b5dd5268ad Reviewed-on: https://gerrit.libreoffice.org/5226 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk index 3d1d8de..45818b9 100644 --- a/cui/AllLangResTarget_cui.mk +++ b/cui/AllLangResTarget_cui.mk @@ -29,7 +29,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\ cui/source/customize/macropg.src \ cui/source/dialogs/colorpicker.src \ cui/source/dialogs/commonlingui.src \ -cui/source/dialogs/cuiimapdlg.src \ cui/source/dialogs/cuires.src \ cui/source/dialogs/fmsearch.src \ cui/source/dialogs/gallery.src \ diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk index a3f8efd..1401bb8 100644 --- a/cui/UIConfig_cui.mk +++ b/cui/UIConfig_cui.mk @@ -26,6 +26,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\ cui/uiconfig/ui/charnamepage \ cui/uiconfig/ui/colorpage \ cui/uiconfig/ui/comment \ + cui/uiconfig/ui/cuiimapdlg \ cui/uiconfig/ui/formatnumberdialog \ cui/uiconfig/ui/gradientpage \ cui/uiconfig/ui/colorconfigwin \ diff --git a/cui/source/dialogs/cuiimapdlg.hrc b/cui/source/dialogs/cuiimapdlg.hrc index 8d2fcf4..e69de29 100644 --- a/cui/source/dialogs/cuiimapdlg.hrc +++ b/cui/source/dialogs/cuiimapdlg.hrc @@ -1,38 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the License); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include cuires.hrc - -// ImapDlg-Dialoge - -#define FT_URLDESCRIPTION 1 -#define FT_URL1 2 -#define FT_TARGET 3 -#define FT_NAME 4 -#define FT_DESCRIPTION 5 -#define EDT_URLDESCRIPTION 1 -#define EDT_URL 2 -#define EDT_NAME3 -#define EDT_DESCRIPTION 4 -#define BTN_HELP1 1 -#define BTN_OK1 2 -#define BTN_CANCEL1 3 -#define FL_URL 1 -#define CBB_TARGETS 1 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/cuiimapdlg.src b/cui/source/dialogs/cuiimapdlg.src index 660077e..e69de29 100644 --- a/cui/source/dialogs/cuiimapdlg.src +++ b/cui/source/dialogs/cuiimapdlg.src @@ -1,147 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the License); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include helpid.hrc -#include cuiimapdlg.hrc - -ModalDialog RID_SVXDLG_IMAPURL -{ -HelpID = cui:ModalDialog:RID_SVXDLG_IMAPURL; -SVLook = TRUE ; -OutputSize = TRUE ; -Closeable = TRUE ; -Moveable = TRUE ; -Size = MAP_APPFONT ( 214 , 188 ) ; -Text [ en-US ] = Properties ; - -FixedText FT_URL1
[Libreoffice-commits] core.git: chart2/AllLangResTarget_chartcontroller.mk chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk
chart2/AllLangResTarget_chartcontroller.mk |1 chart2/UIConfig_chart2.mk|2 chart2/source/controller/dialogs/ResourceIds.hrc |1 chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx | 98 ++--- chart2/source/controller/dialogs/dlg_InsertAxis_Grid.hrc | 40 -- chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src | 91 chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx | 21 - chart2/uiconfig/ui/insertaxisdlg.ui | 282 +++ chart2/uiconfig/ui/insertgriddlg.ui | 282 +++ 9 files changed, 614 insertions(+), 204 deletions(-) New commits: commit 40a32467139758d3f37445004caf50f19b6eeb6e Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Wed Jul 10 12:29:04 2013 +0300 insertgriddlg.ui and insertaxisdlg.ui widgets Change-Id: Ib5b84806189b44ca1b4c74c958d0fafa86030c36 Reviewed-on: https://gerrit.libreoffice.org/4799 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk index 8e6d852..3532030 100644 --- a/chart2/AllLangResTarget_chartcontroller.mk +++ b/chart2/AllLangResTarget_chartcontroller.mk @@ -32,7 +32,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\ chart2/source/controller/dialogs/dlg_CreationWizard.src \ chart2/source/controller/dialogs/dlg_DataEditor.src \ chart2/source/controller/dialogs/dlg_DataSource.src \ -chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src \ chart2/source/controller/dialogs/dlg_InsertDataLabel.src \ chart2/source/controller/dialogs/dlg_InsertErrorBars.src \ chart2/source/controller/dialogs/dlg_InsertLegend.src \ diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk index 48d1561..91d101b 100644 --- a/chart2/UIConfig_chart2.mk +++ b/chart2/UIConfig_chart2.mk @@ -30,6 +30,8 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/schart,\ )) $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\ + chart2/uiconfig/ui/insertaxisdlg \ + chart2/uiconfig/ui/insertgriddlg \ chart2/uiconfig/ui/smoothlinesdlg \ chart2/uiconfig/ui/steppedlinesdlg \ )) diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc b/chart2/source/controller/dialogs/ResourceIds.hrc index ed625bb..09aa8d2 100644 --- a/chart2/source/controller/dialogs/ResourceIds.hrc +++ b/chart2/source/controller/dialogs/ResourceIds.hrc @@ -28,7 +28,6 @@ #define DLG_DIAGRAM_TYPE743 #define DLG_CHART_WIZARD902 #define DLG_DATA_SOURCE 901 -#define DLG_AXIS_OR_GRID839 #define DLG_DATA_DESCR 836 #define DLG_LEGEND 835 #define DLG_TITLE 834 diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx index bc60d24..a31f514 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx @@ -18,7 +18,6 @@ */ #include dlg_InsertAxis_Grid.hxx -#include dlg_InsertAxis_Grid.hrc #include ResId.hxx #include chartview/ChartSfxItemIds.hxx @@ -53,72 +52,59 @@ InsertAxisOrGridDialogData::InsertAxisOrGridDialogData() SchAxisDlg::SchAxisDlg( Window* pWindow , const InsertAxisOrGridDialogData rInput, sal_Bool bAxisDlg ) - : -ModalDialog( pWindow, SchResId( DLG_AXIS_OR_GRID )), - -aFlPrimary( this, SchResId( FL_PRIMARY_AXIS )), -aFlPrimaryGrid( this, SchResId( FL_PRIMARY_GRID )), -aCbPrimaryX( this, SchResId( CB_X_PRIMARY )), -aCbPrimaryY( this, SchResId( CB_Y_PRIMARY )), -aCbPrimaryZ( this, SchResId( CB_Z_PRIMARY )), - -aFlSecondary( this, SchResId( FL_SECONDARY_AXIS )), -aFlSecondaryGrid( this, SchResId( FL_SECONDARY_GRID )), -aCbSecondaryX( this, SchResId( CB_X_SECONDARY )), -aCbSecondaryY( this, SchResId( CB_Y_SECONDARY )), -aCbSecondaryZ( this, SchResId( CB_Z_SECONDARY )), - -aPbOK( this, SchResId( BTN_OK )), -aPbCancel( this, SchResId( BTN_CANCEL )), -aPbHelp( this, SchResId( BTN_HELP )) - +: ModalDialog(pWindow, + bAxisDlg ? + OString(InsertAxisDialog) : + OString(InsertGridDialog), + bAxisDlg ? + OUString(modules/schart/ui/insertaxisdlg.ui) : + OUString(modules/schart/ui/insertgriddlg.ui)) //rOutAttrs( rInAttrs ) { -FreeResource(); +get(m_pCbPrimaryX, primaryX); +get(m_pCbPrimaryY, primaryY); +get(m_pCbPrimaryZ, primaryZ); +get(m_pCbSecondaryX, secondaryX); +get(m_pCbSecondaryY, secondaryY); +get(m_pCbSecondaryZ, secondaryZ); + if(!bAxisDlg) { SetHelpId( HID_INSERT_GRIDS ); -SetText( ObjectNameProvider::getName
[Libreoffice-commits] core.git: extras/source starmath/inc starmath/source starmath/uiconfig starmath/UIConfig_smath.mk
extras/source/glade/libreoffice-catalog.xml.in |3 starmath/UIConfig_smath.mk |1 starmath/inc/dialog.hxx| 33 - starmath/inc/starmath.hrc |1 starmath/inc/utility.hxx |1 starmath/source/dialog.cxx | 117 ++--- starmath/source/smres.src | 171 starmath/source/utility.cxx| 11 starmath/uiconfig/smath/ui/fonttypedialog.ui | 510 + 9 files changed, 589 insertions(+), 259 deletions(-) New commits: commit 1611669c400a87e6a092e6312fd83b4f9f89257b Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Wed Jul 3 13:20:16 2013 +0300 fonttypedialog.ui widget Change-Id: I4aac9046a004d84cd47d563aee8b7338e0d17896 Reviewed-on: https://gerrit.libreoffice.org/4697 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index f3ba921..962c42f 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -15,6 +15,9 @@ -- glade-catalog name=LibreOffice domain=glade-3 depends=gtk+ version=1.0 glade-widget-classes +glade-widget-class title=Font PickListBox name=smlo-SmFontPickListBox +generic-name=SmFontPickListBox parent=GtkComboBoxText +icon-name=widget-gtk-comboboxtext/ glade-widget-class title=Thesaurus View name=cuilo-ThesaurusAlternativesCtrl generic-name=ThesaurusAlternativesCtrl parent=GtkTextView icon-name=widget-gtk-textview/ diff --git a/starmath/UIConfig_smath.mk b/starmath/UIConfig_smath.mk index 402ddec..3683c15 100644 --- a/starmath/UIConfig_smath.mk +++ b/starmath/UIConfig_smath.mk @@ -27,6 +27,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/smath,\ starmath/uiconfig/smath/ui/alignmentdialog \ starmath/uiconfig/smath/ui/catalogdialog \ starmath/uiconfig/smath/ui/fontsizedialog \ + starmath/uiconfig/smath/ui/fonttypedialog \ starmath/uiconfig/smath/ui/printeroptions \ starmath/uiconfig/smath/ui/savedefaultsdialog \ starmath/uiconfig/smath/ui/smathsettings \ diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index a16b2f5..4274266 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -142,27 +142,16 @@ public: class SmFontTypeDialog : public ModalDialog { -FixedText aFixedText1; -SmFontPickListBox aVariableFont; -FixedText aFixedText2; -SmFontPickListBox aFunctionFont; -FixedText aFixedText3; -SmFontPickListBox aNumberFont; -FixedText aFixedText4; -SmFontPickListBox aTextFont; -FixedText aFixedText5; -SmFontPickListBox aSerifFont; -FixedText aFixedText6; -SmFontPickListBox aSansFont; -FixedText aFixedText7; -SmFontPickListBox aFixedFont; -FixedLine aFixedLine1; -FixedLine aFixedLine2; -OKButtonaOKButton1; -HelpButton aHelpButton1; -CancelButtonaCancelButton1; -MenuButton aMenuButton; -PushButton aDefaultButton; +SmFontPickListBox* m_pVariableFont; +SmFontPickListBox* m_pFunctionFont; +SmFontPickListBox* m_pNumberFont; +SmFontPickListBox* m_pTextFont; +SmFontPickListBox* m_pSerifFont; +SmFontPickListBox* m_pSansFont; +SmFontPickListBox* m_pFixedFont; +HelpButton* m_pHelpButton1; +MenuButton* m_pMenuButton; +PushButton* m_pDefaultButton; OutputDevice *pFontListDev; @@ -171,7 +160,7 @@ class SmFontTypeDialog : public ModalDialog DECL_LINK(HelpButtonClickHdl, Button *); public: -SmFontTypeDialog(Window *pParent, OutputDevice *pFntListDevice, bool bFreeRes = true); +SmFontTypeDialog(Window *pParent, OutputDevice *pFntListDevice); void ReadFrom(const SmFormat rFormat); void WriteTo (SmFormat rFormat) const; diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index 74aebf6..192f22e 100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc @@ -77,7 +77,6 @@ #define RID_FONTDIALOG (RID_APP_START + 2) -#define RID_FONTTYPEDIALOG (RID_APP_START + 4) #define RID_SYMDEFINEDIALOG (RID_APP_START + 9) #define RID_PRINTUIOPTIONS (RID_APP_START + 11) diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx index 01a41cd..1770a91 100644 --- a/starmath/inc/utility.hxx +++ b/starmath/inc/utility.hxx @@ -159,6 +159,7 @@ protected: public: SmFontPickListBox(Window* pParent, const ResId rResId); +SmFontPickListBox (Window* pParent, WinBits nBits); SmFontPickListBox operator = (const
[PATCH] fontsizedialog.ui widget
+ /object + packing +property name=left_attach0/property +property name=top_attach2/property +property name=width1/property +property name=height1/property + /packing +/child +child + object class=GtkLabel id=label6 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=xalign0/property +property name=label translatable=yes_Indexes/property +property name=use_underlineTrue/property +property name=mnemonic_widgetspinB_index:0%/property + /object + packing +property name=left_attach0/property +property name=top_attach1/property +property name=width1/property +property name=height1/property + /packing +/child +child + object class=GtkSpinButton id=spinB_text:0% +property name=visibleTrue/property +property name=can_focusTrue/property +property name=hexpandTrue/property +property name=invisible_char●/property +property name=adjustmentadjustmentRelativeSizes/property + /object + packing +property name=left_attach1/property +property name=top_attach0/property +property name=width1/property +property name=height1/property + /packing +/child +child + object class=GtkSpinButton id=spinB_index:0% +property name=visibleTrue/property +property name=can_focusTrue/property +property name=hexpandTrue/property +property name=invisible_char●/property +property name=adjustmentadjustmentRelativeSizes/property + /object + packing +property name=left_attach1/property +property name=top_attach1/property +property name=width1/property +property name=height1/property + /packing +/child + /object +/child + /object +/child +child type=label + object class=GtkLabel id=label1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label translatable=yesRelative sizes/property +attributes + attribute name=weight value=bold/ +/attributes + /object +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child + /object +/child +action-widgets + action-widget response=0ok/action-widget + action-widget response=0cancel/action-widget + action-widget response=0help/action-widget + action-widget response=0default/action-widget +/action-widgets + /object + object class=GtkAdjustment id=adjustmentBaseSize +property name=lower4/property +property name=upper127/property +property name=step_increment1/property +property name=page_increment10/property + /object + object class=GtkAdjustment id=adjustmentRelativeSizes +property name=lower5/property +property name=upper200/property +property name=step_increment1/property +property name=page_increment10/property + /object +/interface -- To view, visit https://gerrit.libreoffice.org/4312 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c91b4c621c5a2da11cebdd8e58a5e5d0d86bf6c Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Manal
[Libreoffice-commits] core.git: sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/UIConfig_scalc.mk|1 sc/inc/scabstdlg.hxx|1 sc/source/ui/attrdlg/scdlgfact.cxx |3 sc/source/ui/attrdlg/scdlgfact.hxx |1 sc/source/ui/inc/groupdlg.hxx | 10 -- sc/source/ui/miscdlgs/groupdlg.cxx | 27 ++ sc/source/ui/view/cellsh1.cxx |4 sc/uiconfig/scalc/ui/groupdialog.ui | 159 8 files changed, 176 insertions(+), 30 deletions(-) New commits: commit 8da13c55405f1a5789401b280d15f77efbf908e8 Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Sun Jun 9 11:13:56 2013 +0300 groupdialog.ui widget Change-Id: Ic19184c1250b59a4dac7c2bb42893d63c6b1a602 Reviewed-on: https://gerrit.libreoffice.org/4208 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 9e7fb46..46692c8 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -70,6 +70,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/footerdialog \ sc/uiconfig/scalc/ui/formatcellsdialog \ sc/uiconfig/scalc/ui/goalseekdlg \ + sc/uiconfig/scalc/ui/groupdialog \ sc/uiconfig/scalc/ui/headerdialog \ sc/uiconfig/scalc/ui/headerfootercontent \ sc/uiconfig/scalc/ui/headerfooterdialog \ diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 9a0edf4..a041451a 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -385,7 +385,6 @@ public: int nId) = 0; virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent, //add for ScGroupDlg -sal_uInt16 nResId, int nId, sal_Bool bUnGroup = false, sal_BoolbRows = sal_True ) = 0; diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 4a8b9be..fe68814 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -856,7 +856,6 @@ AbstractScFillSeriesDlg* ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Wi AbstractScGroupDlg* ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg( Window* pParent, -sal_uInt16 nResId, int nId, sal_Bool bUnGroup , sal_BoolbRows ) @@ -866,7 +865,7 @@ AbstractScGroupDlg* ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg( Wind { case RID_SCDLG_GRP_KILL : case RID_SCDLG_GRP_MAKE : -pDlg = new ScGroupDlg( pParent, nResId,bUnGroup, bRows); +pDlg = new ScGroupDlg( pParent, bUnGroup, bRows); break; default: break; diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index f207558..2be305e 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -452,7 +452,6 @@ public: sal_uInt16 nPossDir, int nId); virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent, //add for ScGroupDlg -sal_uInt16 nResId, int nId, sal_Bool bUnGroup = false, sal_BoolbRows = sal_True ); diff --git a/sc/source/ui/inc/groupdlg.hxx b/sc/source/ui/inc/groupdlg.hxx index 7c54800..538d601 100644 --- a/sc/source/ui/inc/groupdlg.hxx +++ b/sc/source/ui/inc/groupdlg.hxx @@ -31,7 +31,6 @@ class ScGroupDlg : public ModalDialog { public: ScGroupDlg( Window* pParent, -sal_uInt16 nResId, sal_BoolbUnGroup = false, sal_BoolbRows= sal_True ); ~ScGroupDlg(); @@ -39,12 +38,9 @@ public: sal_Bool GetColsChecked() const; private: -FixedLine aFlFrame; -RadioButton aBtnRows; -RadioButton aBtnCols; -OKButtonaBtnOk; -CancelButtonaBtnCancel; -HelpButton aBtnHelp; +FixedText* m_pFtLabel; +RadioButton* m_pBtnRows; +RadioButton* m_pBtnCols; }; diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxx index 6cdf306..bc37423 100644 --- a/sc/source/ui/miscdlgs/groupdlg.cxx +++ b/sc
[PATCH] inscldlg.ui widget
+property name=position4/property + /packing +/child + /object +/child + /object +/child +child type=label + object class=GtkLabel id=label1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label translatable=yesSelection/property +attributes + attribute name=weight value=bold/ +/attributes + /object +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child + /object +/child +action-widgets + action-widget response=0ok/action-widget + action-widget response=0cancel/action-widget + action-widget response=0help/action-widget +/action-widgets + /object +/interface -- To view, visit https://gerrit.libreoffice.org/4049 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia931e330303e9f5baf7ae92a8d69bc460327425d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Manal Alhassoun malhass...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/UIConfig_scalc.mk|1 sc/source/ui/inc/inscldlg.hxx | 12 -- sc/source/ui/inc/miscdlgs.hrc |5 sc/source/ui/miscdlgs/inscldlg.cxx | 46 +++- sc/source/ui/src/miscdlgs.src | 68 sc/uiconfig/scalc/ui/insertcells.ui | 194 6 files changed, 219 insertions(+), 107 deletions(-) New commits: commit bfc0609a4c5c73533b31f2581963160abe57df5e Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Mon May 27 11:58:45 2013 +0300 inscldlg.ui widget Change-Id: Ia931e330303e9f5baf7ae92a8d69bc460327425d Reviewed-on: https://gerrit.libreoffice.org/4049 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 1f77cdd..cf715ff 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -73,6 +73,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/headerdialog \ sc/uiconfig/scalc/ui/headerfootercontent \ sc/uiconfig/scalc/ui/headerfooterdialog \ + sc/uiconfig/scalc/ui/insertcells \ sc/uiconfig/scalc/ui/insertname \ sc/uiconfig/scalc/ui/insertsheet \ sc/uiconfig/scalc/ui/leftfooterdialog \ diff --git a/sc/source/ui/inc/inscldlg.hxx b/sc/source/ui/inc/inscldlg.hxx index f6a5ed9..008206d 100644 --- a/sc/source/ui/inc/inscldlg.hxx +++ b/sc/source/ui/inc/inscldlg.hxx @@ -32,14 +32,10 @@ class ScInsertCellDlg : public ModalDialog { private: -FixedLine aFlFrame; -RadioButton aBtnCellsDown; -RadioButton aBtnCellsRight; -RadioButton aBtnInsRows; -RadioButton aBtnInsCols; -OKButtonaBtnOk; -CancelButtonaBtnCancel; -HelpButton aBtnHelp; +RadioButton* m_pBtnCellsDown; +RadioButton* m_pBtnCellsRight; +RadioButton* m_pBtnInsRow; +RadioButton* m_pBtnInsCol; public: ScInsertCellDlg( Window* pParent,sal_Bool bDisallowCellMove = false ); diff --git a/sc/source/ui/inc/miscdlgs.hrc b/sc/source/ui/inc/miscdlgs.hrc index 9efabdc..c65428a 100644 --- a/sc/source/ui/inc/miscdlgs.hrc +++ b/sc/source/ui/inc/miscdlgs.hrc @@ -37,11 +37,6 @@ #define FL_FRAME112 #define STR_BTN_CLOSE 200 -// Insert Cell Dialog -#define BTN_CELLSDOWN 11 -#define BTN_CELLSRIGHT 12 -#define BTN_INSROWS 16 -#define BTN_INSCOLS 17 // Insert Contents Dialog #define BTN_INSALL 20 diff --git a/sc/source/ui/miscdlgs/inscldlg.cxx b/sc/source/ui/miscdlgs/inscldlg.cxx index 56e72e7..0d522c8 100644 --- a/sc/source/ui/miscdlgs/inscldlg.cxx +++ b/sc/source/ui/miscdlgs/inscldlg.cxx @@ -34,42 +34,36 @@ static sal_uInt8 nInsItemChecked=0; //== ScInsertCellDlg::ScInsertCellDlg( Window* pParent,sal_Bool bDisallowCellMove) : -ModalDialog ( pParent, ScResId( RID_SCDLG_INSCELL ) ), -// -aFlFrame( this, ScResId( FL_FRAME ) ), -aBtnCellsDown ( this, ScResId( BTN_CELLSDOWN ) ), -aBtnCellsRight ( this, ScResId( BTN_CELLSRIGHT ) ), -aBtnInsRows ( this, ScResId( BTN_INSROWS ) ), -aBtnInsCols ( this, ScResId( BTN_INSCOLS ) ), -aBtnOk ( this, ScResId( BTN_OK ) ), -aBtnCancel ( this, ScResId( BTN_CANCEL ) ), -aBtnHelp( this, ScResId( BTN_HELP ) ) +ModalDialog ( pParent, InsertCellsDialog, modules/scalc/ui/insertcells.ui) { +get(m_pBtnCellsDown, down); +get(m_pBtnCellsRight, right); +get(m_pBtnInsRow, rows); +get(m_pBtnInsCol, cols); + if (bDisallowCellMove) { -aBtnCellsDown.Disable(); -aBtnCellsRight.Disable(); -aBtnInsRows.Check(); +m_pBtnCellsDown-Disable(); +m_pBtnCellsRight-Disable(); +m_pBtnInsRow-Check(); switch(nInsItemChecked) { -case 2: aBtnInsRows .Check();break; -case 3: aBtnInsCols .Check();break; -default:aBtnInsRows .Check();break; +case 2: m_pBtnInsRow-Check();break; +case 3: m_pBtnInsCol-Check();break; +default:m_pBtnInsRow-Check();break; } } else { switch(nInsItemChecked) { -case 0: aBtnCellsDown .Check();break; -case 1: aBtnCellsRight.Check();break; -case 2: aBtnInsRows .Check();break; -case 3: aBtnInsCols .Check();break; +case 0: m_pBtnCellsDown-Check();break; +case 1: m_pBtnCellsRight-Check();break; +case 2: m_pBtnInsRow-Check();break; +case 3: m_pBtnInsCol-Check();break; } } -//- -FreeResource(); } // @@ -78,22 +72,22 @@ InsCellCmd ScInsertCellDlg::GetInsCellCmd() const { InsCellCmd nReturn = INS_NONE; -if ( aBtnCellsDown.IsChecked
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/simpress/ui/masterlayoutdlg.ui | 173 + 1 file changed, 173 insertions(+) New commits: commit 3ca73d5fcff2efbc2a5e2ce36714d24267a63fbc Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Mon May 20 14:50:50 2013 +0300 masterlayoutdlg.ui widget Change-Id: Ic49c2519b5949661a13f8a24c2c4a084242b1882 Reviewed-on: https://gerrit.libreoffice.org/3976 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sd/uiconfig/simpress/ui/masterlayoutdlg.ui b/sd/uiconfig/simpress/ui/masterlayoutdlg.ui new file mode 100644 index 000..d7d5f10 --- /dev/null +++ b/sd/uiconfig/simpress/ui/masterlayoutdlg.ui @@ -0,0 +1,173 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkDialog id=MasterElementsDialog +property name=can_focusFalse/property +property name=border_width6/property +property name=title translatable=yesMaster Elements/property +property name=type_hintdialog/property +child internal-child=vbox + object class=GtkBox id=dialog-vbox1 +property name=can_focusFalse/property +property name=orientationvertical/property +property name=spacing2/property +child internal-child=action_area + object class=GtkButtonBox id=dialog-action_area1 +property name=can_focusFalse/property +property name=layout_stylespread/property +child + object class=GtkButton id=ok1 +property name=labelgtk-ok/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=has_defaultTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkButton id=cancel1 +property name=labelgtk-cancel/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=pack_typeend/property +property name=position0/property + /packing +/child +child + object class=GtkFrame id=PlaceholdersFrame +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label_xalign0/property +property name=shadow_typenone/property +child + object class=GtkAlignment id=alignment1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=top_padding6/property +property name=left_padding12/property +child + object class=GtkBox id=box1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +child + object class=GtkCheckButton id=checkbutton1 +property name=label translatable=yes_Header/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultFalse/property +property name=use_action_appearanceFalse/property +property name=use_underlineTrue/property +property name=xalign0/property +property name=draw_indicatorTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkCheckButton id=checkbutton2 +property name=label translatable
[PATCH] masterlayoutdlg.ui widget
+property name=receives_defaultFalse/property +property name=use_action_appearanceFalse/property +property name=use_underlineTrue/property +property name=xalign0/property +property name=draw_indicatorTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkCheckButton id=checkbutton3 +property name=label translatable=yes_Footer/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultFalse/property +property name=use_action_appearanceFalse/property +property name=use_underlineTrue/property +property name=xalign0/property +property name=draw_indicatorTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child +child + object class=GtkCheckButton id=checkbutton4 +property name=label translatable=yes_Page number/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultFalse/property +property name=use_action_appearanceFalse/property +property name=use_underlineTrue/property +property name=xalign0/property +property name=draw_indicatorTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position3/property + /packing +/child + /object +/child + /object +/child +child type=label + object class=GtkLabel id=Placeholders +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label translatable=yeslt;bgt;Placeholderslt;/bgt;/property +property name=use_markupTrue/property +child internal-child=accessible + object class=AtkObject id=Placeholders-atkobject +property name=AtkObject::accessible-name translatable=yesPlaceholders/property + /object +/child + /object +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child + /object +/child +action-widgets + action-widget response=0ok1/action-widget + action-widget response=0cancel1/action-widget +/action-widgets + /object +/interface -- To view, visit https://gerrit.libreoffice.org/3976 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic49c2519b5949661a13f8a24c2c4a084242b1882 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Manal Alhassoun malhass...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/source
sc/source/ui/undo/undotab.cxx |1 + sc/source/ui/view/viewfun2.cxx |1 + 2 files changed, 2 insertions(+) New commits: commit 6e6b9e4511baf189ce4e65c787765fd685ba2288 Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Wed May 15 12:59:23 2013 +0300 fix for fdo#53031 Change-Id: I137f2446d08b7b536ded26676132e63489e26e48 Reviewed-on: https://gerrit.libreoffice.org/3914 Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr (cherry picked from commit 08662568a590bfb20849fce077d8b5aff8b99b57) diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index 9732e21..54ea512 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -356,6 +356,7 @@ void ScUndoDeleteTab::Undo() pDoc-SetVisible( nTab, pRefUndoDoc-IsVisible( nTab ) ); pDoc-SetTabBgColor( nTab, pRefUndoDoc-GetTabBgColor(nTab) ); pDoc-SetSheetEvents( nTab, pRefUndoDoc-GetSheetEvents( nTab ) ); +pDoc-SetLayoutRTL( nTab, pRefUndoDoc-IsLayoutRTL( nTab ) ); if ( pRefUndoDoc-IsTabProtected( nTab ) ) pDoc-SetTabProtection(nTab, pRefUndoDoc-GetTabProtection(nTab)); diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 2dd4871..590e134 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -2144,6 +2144,7 @@ sal_Bool ScViewFunc::DeleteTables(const vectorSCTAB TheTabs, sal_Bool bRecord pUndoDoc-SetVisible( nTab, pDoc-IsVisible( nTab ) ); pUndoDoc-SetTabBgColor( nTab, pDoc-GetTabBgColor(nTab) ); pUndoDoc-SetSheetEvents( nTab, pDoc-GetSheetEvents( nTab ) ); +pUndoDoc-SetLayoutRTL( nTab, pDoc-IsLayoutRTL( nTab ) ); if ( pDoc-IsTabProtected( nTab ) ) pUndoDoc-SetTabProtection(nTab, pDoc-GetTabProtection(nTab)); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/undo/undotab.cxx |1 + sc/source/ui/view/viewfun2.cxx |1 + 2 files changed, 2 insertions(+) New commits: commit 08662568a590bfb20849fce077d8b5aff8b99b57 Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Wed May 15 12:59:23 2013 +0300 fix for fdo#53031 Change-Id: I137f2446d08b7b536ded26676132e63489e26e48 Reviewed-on: https://gerrit.libreoffice.org/3914 Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index 3c1ef77..db101dd 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -355,6 +355,7 @@ void ScUndoDeleteTab::Undo() pDoc-SetVisible( nTab, pRefUndoDoc-IsVisible( nTab ) ); pDoc-SetTabBgColor( nTab, pRefUndoDoc-GetTabBgColor(nTab) ); pDoc-SetSheetEvents( nTab, pRefUndoDoc-GetSheetEvents( nTab ) ); +pDoc-SetLayoutRTL( nTab, pRefUndoDoc-IsLayoutRTL( nTab ) ); if ( pRefUndoDoc-IsTabProtected( nTab ) ) pDoc-SetTabProtection(nTab, pRefUndoDoc-GetTabProtection(nTab)); diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index b61d3ab..0b6f48c 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -2170,6 +2170,7 @@ sal_Bool ScViewFunc::DeleteTables(const vectorSCTAB TheTabs, sal_Bool bRecord pUndoDoc-SetVisible( nTab, pDoc-IsVisible( nTab ) ); pUndoDoc-SetTabBgColor( nTab, pDoc-GetTabBgColor(nTab) ); pUndoDoc-SetSheetEvents( nTab, pDoc-GetSheetEvents( nTab ) ); +pUndoDoc-SetLayoutRTL( nTab, pDoc-IsLayoutRTL( nTab ) ); if ( pDoc-IsTabProtected( nTab ) ) pUndoDoc-SetTabProtection(nTab, pDoc-GetTabProtection(nTab)); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fix for fdo#53031
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3914 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/14/3914/1 fix for fdo#53031 Change-Id: I137f2446d08b7b536ded26676132e63489e26e48 --- M sc/source/ui/undo/undotab.cxx M sc/source/ui/view/viewfun2.cxx 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index 3c1ef77..db101dd 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -355,6 +355,7 @@ pDoc-SetVisible( nTab, pRefUndoDoc-IsVisible( nTab ) ); pDoc-SetTabBgColor( nTab, pRefUndoDoc-GetTabBgColor(nTab) ); pDoc-SetSheetEvents( nTab, pRefUndoDoc-GetSheetEvents( nTab ) ); +pDoc-SetLayoutRTL( nTab, pRefUndoDoc-IsLayoutRTL( nTab ) ); if ( pRefUndoDoc-IsTabProtected( nTab ) ) pDoc-SetTabProtection(nTab, pRefUndoDoc-GetTabProtection(nTab)); diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index b61d3ab..0b6f48c 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -2170,6 +2170,7 @@ pUndoDoc-SetVisible( nTab, pDoc-IsVisible( nTab ) ); pUndoDoc-SetTabBgColor( nTab, pDoc-GetTabBgColor(nTab) ); pUndoDoc-SetSheetEvents( nTab, pDoc-GetSheetEvents( nTab ) ); +pUndoDoc-SetLayoutRTL( nTab, pDoc-IsLayoutRTL( nTab ) ); if ( pDoc-IsTabProtected( nTab ) ) pUndoDoc-SetTabProtection(nTab, pDoc-GetTabProtection(nTab)); -- To view, visit https://gerrit.libreoffice.org/3914 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I137f2446d08b7b536ded26676132e63489e26e48 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Manal Alhassoun malhass...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Duplicate Dialog Widget .ui
+property name=top_attach1/property +property name=width1/property +property name=height1/property + /packing +/child +child + object class=GtkComboBox id=combobox1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=hexpandTrue/property + /object + packing +property name=left_attach1/property +property name=top_attach0/property +property name=width1/property +property name=height1/property + /packing +/child +child + object class=GtkComboBox id=combobox2 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=hexpandTrue/property + /object + packing +property name=left_attach1/property +property name=top_attach1/property +property name=width1/property +property name=height1/property + /packing +/child + /object +/child + /object +/child +child type=label + object class=GtkLabel id=label3 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label translatable=yeslt;bgt;Colorslt;/bgt;/property +property name=use_markupTrue/property + /object +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position3/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child + /object +/child +action-widgets + action-widget response=0ok1/action-widget + action-widget response=0cancel1/action-widget + action-widget response=0help1/action-widget + action-widget response=0button1/action-widget +/action-widgets + /object +/interface diff --git a/translations b/translations index d3a0a08..69838a3 16 --- a/translations +++ b/translations -Subproject commit d3a0a08f6d4e27af6960010fa774b96a009bf6bd +Subproject commit 69838a35694be5b656df1ee0c5e5da0e0cc4373b -- To view, visit https://gerrit.libreoffice.org/3659 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7a4f782235a23f50bceaef041a92e42e47860a78 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Manal Alhassoun malhass...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/sdraw/ui/dlgsnap.ui | 276 1 file changed, 276 insertions(+) New commits: commit 93f2256f493229a4957ae8aa1a4e2bfafbf5a709 Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Sun Apr 28 09:53:27 2013 +0300 New Snap Object Widget .ui Change-Id: I801f4af269efcea91bc3bafbfc9e0b9033488f2d Reviewed-on: https://gerrit.libreoffice.org/3645 Tested-by: Caolán McNamara caol...@redhat.com Reviewed-by: Caolán McNamara caol...@redhat.com diff --git a/sd/uiconfig/sdraw/ui/dlgsnap.ui b/sd/uiconfig/sdraw/ui/dlgsnap.ui new file mode 100644 index 000..73699e4 --- /dev/null +++ b/sd/uiconfig/sdraw/ui/dlgsnap.ui @@ -0,0 +1,276 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkDialog id=NewSnapObject +property name=can_focusFalse/property +property name=border_width6/property +property name=title translatable=yesNew Snap Object/property +property name=type_hintdialog/property +child internal-child=vbox + object class=GtkBox id=dialog-vbox1 +property name=can_focusFalse/property +property name=spacing2/property +child internal-child=action_area + object class=GtkButtonBox id=dialog-action_area1 +property name=can_focusFalse/property +property name=orientationvertical/property +property name=layout_stylestart/property +child + object class=GtkButton id=ok1 +property name=labelgtk-ok/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=has_defaultTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkButton id=cancel1 +property name=labelgtk-cancel/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkButton id=help1 +property name=labelgtk-help/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +property name=use_stockTrue/property +property name=image_positiontop/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=pack_typeend/property +property name=position0/property + /packing +/child +child + object class=GtkBox id=box1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +child + object class=GtkFrame id=frame1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label_xalign0/property +property name=shadow_typenone/property +child + object class=GtkAlignment id=alignment1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=top_padding6/property +property name=left_padding12/property +child + object class=GtkGrid id=grid1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=n_rows2/property +property name=n_columns2/property +child + object class=GtkSpinButton id
[PATCH] New Snap Object Widget .ui
=activeTrue/property +property name=draw_indicatorTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkRadioButton id=radiobutton2 +property name=label translatable=yes_Vertical/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultFalse/property +property name=use_action_appearanceFalse/property +property name=use_underlineTrue/property +property name=xalign0/property +property name=activeTrue/property +property name=draw_indicatorTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkRadioButton id=radiobutton3 +property name=label translatable=yesHori_zontal/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultFalse/property +property name=use_action_appearanceFalse/property +property name=use_underlineTrue/property +property name=xalign0/property +property name=activeTrue/property +property name=draw_indicatorTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child + /object +/child + /object +/child +child type=label + object class=GtkLabel id=label2 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label translatable=yeslt;bgt;Typelt;/bgt;/property +property name=use_markupTrue/property + /object +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child + /object +/child +action-widgets + action-widget response=0ok1/action-widget + action-widget response=0cancel1/action-widget + action-widget response=0help1/action-widget +/action-widgets + /object +/interface -- To view, visit https://gerrit.libreoffice.org/3645 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I801f4af269efcea91bc3bafbfc9e0b9033488f2d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Manal Alhassoun malhass...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/selectrange.ui | 125 1 file changed, 125 insertions(+) New commits: commit b2867b01418fc7a1e80589224345d2b224bcf3fc Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Mon Apr 8 14:30:45 2013 +0300 selectrange.ui Widget Change-Id: I110d38248975e21dd454c73c787c16d7e94b473c Reviewed-on: https://gerrit.libreoffice.org/3275 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sc/uiconfig/scalc/ui/selectrange.ui b/sc/uiconfig/scalc/ui/selectrange.ui new file mode 100644 index 000..6f46771 --- /dev/null +++ b/sc/uiconfig/scalc/ui/selectrange.ui @@ -0,0 +1,125 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkDialog id=SelectRangeDialog +property name=can_focusFalse/property +property name=border_width5/property +property name=title translatable=yesSelect Database Range/property +property name=type_hintdialog/property +child internal-child=vbox + object class=GtkBox id=SelectRange +property name=can_focusFalse/property +property name=spacing2/property +child internal-child=action_area + object class=GtkButtonBox id=dialog-action_area1 +property name=can_focusFalse/property +property name=orientationvertical/property +property name=layout_stylestart/property +child + object class=GtkButton id=ok1 +property name=labelgtk-ok/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=has_defaultTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkButton id=cancel1 +property name=labelgtk-cancel/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkButton id=help1 +property name=labelgtk-help/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=pack_typeend/property +property name=position0/property + /packing +/child +child + object class=GtkBox id=box1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +child + object class=GtkLabel id=selectRange +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label translatable=yesRanges/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkScrolledWindow id=scrolledwindow1 +property name=visibleTrue/property +property name=can_focusTrue/property +property name=shadow_typein/property +child + object class=GtkTreeView id=treeview1 +property name=visibleTrue/property +property name=can_focusTrue/property +child internal-child=selection + object class=GtkTreeSelection id=treeview
[PATCH] selectrange.ui Widget
name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child + /object +/child +action-widgets + action-widget response=0ok1/action-widget + action-widget response=0cancel1/action-widget + action-widget response=0help1/action-widget +/action-widgets + /object +/interface -- To view, visit https://gerrit.libreoffice.org/3275 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I110d38248975e21dd454c73c787c16d7e94b473c Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Manal Alhassoun malhass...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] add a READMEs to the autom4te.cache and clone modules
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/882 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/882/1 add a READMEs to the autom4te.cache and clone modules Change-Id: Ic1ed15d4cfe72da8ef47d1633671a19df4fcf52f --- A autom4te.cache/README A clone/README 2 files changed, 9 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/882 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic1ed15d4cfe72da8ef47d1633671a19df4fcf52f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Manal Alhassoun malhass...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] add a README files
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/852 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/852/1 add a README files Change-Id: I2e779831e47cb1243ae7319b73b9fa553cf97034 --- A binaryurp/README A ct2n/README A drawinglayer/README A fontconfig/README A freetype/README A gdk-pixbuf/README A gettext/README A git-hooks/README A glib/README A i18npool/README 10 files changed, 57 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/852 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2e779831e47cb1243ae7319b73b9fa553cf97034 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Manal Alhassoun malhass...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice