dev/null |binary scp2/source/ooo/common_brand.scp | 10 ----- sd/uiconfig/simpress/ui/photoalbum.ui | 45 +++++++++++------------ setup_native/scripts/install_create.pl | 1 sysui/CustomTarget_share.mk | 8 +--- sysui/desktop/debian/openoffice.org-debian-menus | 8 ---- sysui/desktop/freedesktop/freedesktop-menus.spec | 1 sysui/desktop/mandriva/mandriva-menus.spec | 11 ----- sysui/desktop/menus/printeradmin.desktop | 27 ------------- sysui/desktop/share/launcher_name.ulf | 3 - sysui/desktop/solaris/prototype | 1 sysui/desktop/suse/suse-menus.spec | 1 12 files changed, 25 insertions(+), 91 deletions(-)
New commits: commit b524fb866e905c44f309c222ba1f44dad6375611 Author: Caolán McNamara <[email protected]> Date: Tue Apr 2 20:26:06 2013 +0100 build fails with any uppercase char in the source dir Change-Id: I707a92791adbb60e5491291e89e38f1d57fa97cd diff --git a/setup_native/scripts/install_create.pl b/setup_native/scripts/install_create.pl index 57fcc53..c7659c4 100644 --- a/setup_native/scripts/install_create.pl +++ b/setup_native/scripts/install_create.pl @@ -35,7 +35,6 @@ ENDHELP $infile = $ARGV[0]; $library = $ARGV[1]; $outfile = $ARGV[2]; -$infile =~ tr/[A-Z]/[a-z]/; # read script header open( SCRIPT, "<$infile" ) || die "cannot open $infile"; commit 412dd9c19cab6bd61e780c20aac3160d226f1de0 Author: Caolán McNamara <[email protected]> Date: Tue Apr 2 16:46:03 2013 +0100 various efforts to consistently apply HIG rules Change-Id: I0a4fc216d2f7b5c8eadce1f0429093b2e9192c9a diff --git a/sd/uiconfig/simpress/ui/photoalbum.ui b/sd/uiconfig/simpress/ui/photoalbum.ui index e88b2cb..e4753b3 100644 --- a/sd/uiconfig/simpress/ui/photoalbum.ui +++ b/sd/uiconfig/simpress/ui/photoalbum.ui @@ -3,7 +3,7 @@ <!-- interface-requires gtk+ 3.0 --> <object class="GtkDialog" id="PhotoAlbumCreatorDialog"> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Photo Album Creator</property> <property name="resizable">False</property> <property name="window_position">center</property> @@ -13,7 +13,7 @@ <object class="GtkBox" id="dialog-vbox1"> <property name="can_focus">False</property> <property name="orientation">vertical</property> - <property name="spacing">2</property> + <property name="spacing">12</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> <property name="can_focus">False</property> @@ -21,11 +21,11 @@ <child> <object class="GtkButton" id="create_btn"> <property name="label" translatable="yes">Create</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> </object> <packing> <property name="expand">False</property> @@ -36,11 +36,9 @@ <child> <object class="GtkButton" id="cancel_btn"> <property name="label">gtk-cancel</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -62,6 +60,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> + <property name="spacing">12</property> <child> <object class="GtkFrame" id="frame1"> <property name="visible">True</property> @@ -72,17 +71,19 @@ <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="top_padding">6</property> <property name="left_padding">12</property> <child> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">5</property> + <property name="column_spacing">6</property> <property name="row_homogeneous">True</property> <child> <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="row_spacing">6</property> <child> <object class="GtkImage" id="preview_img"> <property name="width_request">150</property> @@ -103,6 +104,8 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Preview:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">preview_img</property> </object> <packing> <property name="left_attach">0</property> @@ -123,13 +126,14 @@ <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">3</property> - <property name="column_spacing">3</property> + <property name="row_spacing">6</property> <child> <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Images:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">scrolledwindow1</property> </object> <packing> <property name="left_attach">0</property> @@ -142,15 +146,14 @@ <object class="GtkButtonBox" id="buttonbox1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="spacing">6</property> <property name="layout_style">start</property> <child> <object class="GtkButton" id="up_btn"> <property name="label" translatable="yes">Up</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> </object> <packing> <property name="expand">False</property> @@ -161,11 +164,9 @@ <child> <object class="GtkButton" id="down_btn"> <property name="label" translatable="yes">Down</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> </object> <packing> <property name="expand">False</property> @@ -176,11 +177,9 @@ <child> <object class="GtkButton" id="rem_btn"> <property name="label" translatable="yes">Remove</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> </object> <packing> <property name="expand">False</property> @@ -237,16 +236,13 @@ <object class="GtkGrid" id="grid4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">3</property> - <property name="column_spacing">3</property> + <property name="row_spacing">6</property> <child> <object class="GtkButton" id="file_btn"> <property name="label" translatable="yes">File/Folder</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> </object> <packing> <property name="left_attach">0</property> @@ -258,11 +254,9 @@ <child> <object class="GtkButton" id="textbox_btn"> <property name="label" translatable="yes">New Text Box</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> </object> <packing> <property name="left_attach">0</property> @@ -276,6 +270,8 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Insert from:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">file_btn</property> </object> <packing> <property name="left_attach">0</property> @@ -289,6 +285,8 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Insert text:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">textbox_btn</property> </object> <packing> <property name="left_attach">0</property> @@ -336,17 +334,20 @@ <object class="GtkAlignment" id="alignment2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="top_padding">6</property> <property name="left_padding">12</property> <child> <object class="GtkGrid" id="grid5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">5</property> + <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="label7"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Picture layout:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">opt_combo</property> </object> <packing> <property name="left_attach">0</property> commit 2a5077c1070cd4c0041c6bded778e8400dd56f30 Author: Caolán McNamara <[email protected]> Date: Tue Apr 2 16:12:06 2013 +0100 start deprecating spadmin by removing it from the menus we keep the printer admin tool, just not install the .desktop file for it anymore. Change-Id: I41fcdcca555e16d76fa2de4a929b6ad508b6c066 diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 4dfe36f..0a6a523 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -78,7 +78,6 @@ Module gid_Module_Root_Brand gid_Brand_File_Share_Xdg_Extension, gid_Brand_File_Share_Xdg_Impress, gid_Brand_File_Share_Xdg_Math, - gid_Brand_File_Share_Xdg_Printeradmin, gid_Brand_File_Share_Xdg_QStart, gid_Brand_File_Share_Xdg_StartCenter, gid_Brand_File_Share_Xdg_Writer, @@ -697,15 +696,6 @@ End #endif #if defined UNX && ! defined MACOSX -File gid_Brand_File_Share_Xdg_Printeradmin - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Share_Xdg; - Styles = (PACKED,SCPZIP_REPLACE); - Name = "printeradmin.desktop"; -End -#endif - -#if defined UNX && ! defined MACOSX #ifdef ENABLE_GTK File gid_Brand_File_Share_Xdg_QStart TXT_FILE_BODY; diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk index 0c2f023..074c7a7 100644 --- a/sysui/CustomTarget_share.mk +++ b/sysui/CustomTarget_share.mk @@ -10,7 +10,7 @@ share_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/share) share_SRCDIR := $(SRCDIR)/sysui/desktop -LAUNCHERLIST_APPS := writer calc draw impress math base printeradmin startcenter +LAUNCHERLIST_APPS := writer calc draw impress math base startcenter LAUNCHERLIST := $(LAUNCHERLIST_APPS) qstart xsltfilter LAUNCHERS := $(foreach launcher,$(LAUNCHERLIST),$(share_SRCDIR)/menus/$(launcher).desktop) @@ -98,9 +98,7 @@ MIMEDESKTOPS := $(foreach mime,$(MIMELIST),$(share_SRCDIR)/mimetypes/$(mime).des ULFS := documents.ulf \ launcher_comment.ulf \ launcher_genericname.ulf \ - launcher_unityquicklist.ulf \ - launcher_name.ulf - + launcher_unityquicklist.ulf PRODUCTLIST := libreoffice libreofficedev oxygenoffice PKGVERSION := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO) @@ -202,8 +200,6 @@ $(share_WORKDIR)/%/build.flag: $(share_SRCDIR)/share/brand.pl $(LAUNCHERS) \ $(PERL) $(share_SRCDIR)/share/brand.pl -p $(PRODUCTNAME.$*)$(PRODUCTVERSION) -u '$$(UNIXPRODUCTNAME)$$(BRANDPACKAGEVERSION)' \ --iconprefix '$$(UNIXBASISROOTNAME)' $^ $(share_WORKDIR)/$* $(PERL) $(share_SRCDIR)/share/translate.pl -p $(PRODUCTNAME.$*)$(PRODUCTVERSION) -d $(share_WORKDIR)/$* \ - --ext "desktop" --key "Name" $(share_WORKDIR)/launcher_name.ulf - $(PERL) $(share_SRCDIR)/share/translate.pl -p $(PRODUCTNAME.$*)$(PRODUCTVERSION) -d $(share_WORKDIR)/$* \ --ext "desktop" --key "Comment" $(share_WORKDIR)/launcher_comment.ulf $(PERL) $(share_SRCDIR)/share/translate.pl -p $(PRODUCTNAME.$*)$(PRODUCTVERSION) -d $(share_WORKDIR)/$* \ --ext "desktop" --key "GenericName" $(share_WORKDIR)/launcher_genericname.ulf diff --git a/sysui/desktop/debian/openoffice.org-debian-menus b/sysui/desktop/debian/openoffice.org-debian-menus index c477d73..8d15ccb 100755 --- a/sysui/desktop/debian/openoffice.org-debian-menus +++ b/sysui/desktop/debian/openoffice.org-debian-menus @@ -32,11 +32,3 @@ kderemove="y"\ icon="/usr/share/icons/hicolor/32x32/apps/%ICONPREFIX-base.png"\ icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-base.png" - -?package(libreoffice-core02):needs="X11" section="Apps/System"\ - title="%PRODUCTNAME Printer Administration"\ - command="%PREFIX-printeradmin"\ - hints="Setup,Printer,Config"\ - kderemove="y"\ - icon="/usr/share/icons/hicolor/32x32/apps/%ICONPREFIX-printeradmin.png"\ - icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-printeradmin.png" diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec index 0c1d776..5a1042b 100755 --- a/sysui/desktop/freedesktop/freedesktop-menus.spec +++ b/sysui/desktop/freedesktop/freedesktop-menus.spec @@ -399,7 +399,6 @@ done /usr/share/applications/%unixfilename-draw.desktop /usr/share/applications/%unixfilename-impress.desktop /usr/share/applications/%unixfilename-math.desktop -/usr/share/applications/%unixfilename-printeradmin.desktop /usr/share/applications/%unixfilename-writer.desktop /usr/share/applications/%unixfilename-startcenter.desktop /usr/share/applications/%unixfilename-xsltfilter.desktop diff --git a/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png b/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png deleted file mode 100644 index 7f2a946..0000000 Binary files a/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png and /dev/null differ diff --git a/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png b/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png deleted file mode 100644 index 05cfd5f..0000000 Binary files a/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png and /dev/null differ diff --git a/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png b/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png deleted file mode 100644 index ab5c0ef..0000000 Binary files a/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png and /dev/null differ diff --git a/sysui/desktop/icons/locolor/16x16/apps/printeradmin.png b/sysui/desktop/icons/locolor/16x16/apps/printeradmin.png deleted file mode 100644 index c84c387..0000000 Binary files a/sysui/desktop/icons/locolor/16x16/apps/printeradmin.png and /dev/null differ diff --git a/sysui/desktop/icons/locolor/32x32/apps/printeradmin.png b/sysui/desktop/icons/locolor/32x32/apps/printeradmin.png deleted file mode 100644 index 9d13304..0000000 Binary files a/sysui/desktop/icons/locolor/32x32/apps/printeradmin.png and /dev/null differ diff --git a/sysui/desktop/mandriva/mandriva-menus.spec b/sysui/desktop/mandriva/mandriva-menus.spec index aff28fd..b1b2b3b 100755 --- a/sysui/desktop/mandriva/mandriva-menus.spec +++ b/sysui/desktop/mandriva/mandriva-menus.spec @@ -305,16 +305,6 @@ GenerateMenu "%unixfilename --math" \ "math" \ "application/vnd.oasis.opendocument.formula,application/vnd.sun.xml.math,application/vnd.stardivision.math" -# -# FIXME: Is there a better group than System/Configuration/Printing? I think no ... -# -GenerateMenu "%unixfilename-printeradmin" \ - "System/Configuration/Printing" \ - "printeradmin" \ - "%productname %{menuversion} Printeradmin" \ - "%productname %{menuversion} Printer Administration" \ - "core02" - %clean rm -rf $RPM_BUILD_ROOT @@ -351,7 +341,6 @@ fi /usr/share/applications/%unixfilename-impress.desktop /usr/share/applications/%unixfilename-math.desktop /usr/share/applications/%unixfilename-base.desktop -/usr/share/applications/%unixfilename-printeradmin.desktop /usr/share/applications/%unixfilename-startcenter.desktop /usr/share/mime-info/*.keys /usr/share/mime-info/*.mime diff --git a/sysui/desktop/menus/printeradmin.desktop b/sysui/desktop/menus/printeradmin.desktop deleted file mode 100755 index 2b7db5e..0000000 --- a/sysui/desktop/menus/printeradmin.desktop +++ /dev/null @@ -1,27 +0,0 @@ -# -# 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 . -# -[Desktop Entry] -Version=1.0 -Terminal=false -Icon=printeradmin -Type=Application -Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office; -Exec=${UNIXBASISROOTNAME}-printeradmin -Name=%PRODUCTNAME Printer Administration -StartupNotify=true -X-GIO-NoFuse=true diff --git a/sysui/desktop/share/launcher_name.ulf b/sysui/desktop/share/launcher_name.ulf deleted file mode 100644 index db97e26..0000000 --- a/sysui/desktop/share/launcher_name.ulf +++ /dev/null @@ -1,3 +0,0 @@ -[printeradmin] -en-US = "%PRODUCTNAME Printer Administration" - diff --git a/sysui/desktop/solaris/prototype b/sysui/desktop/solaris/prototype index ef541c3..6b1360a 100755 --- a/sysui/desktop/solaris/prototype +++ b/sysui/desktop/solaris/prototype @@ -29,7 +29,6 @@ s none usr/share/applications/%PREFIX-draw.desktop=../../../opt/%PREFIX/share/xd s none usr/share/applications/%PREFIX-impress.desktop=../../../opt/%PREFIX/share/xdg/impress.desktop s none usr/share/applications/%PREFIX-math.desktop=../../../opt/%PREFIX/share/xdg/math.desktop s none usr/share/applications/%PREFIX-base.desktop=../../../opt/%PREFIX/share/xdg/base.desktop -s none usr/share/applications/%PREFIX-printeradmin.desktop=../../../opt/%PREFIX/share/xdg/printeradmin.desktop f none usr/share/mime-info/%PREFIX.keys=%SOURCE/openoffice.keys f none usr/share/mime-info/%PREFIX.mime=%SOURCE/openoffice.mime f none usr/share/pixmaps/%ICONPREFIX-writer.png=../icons/hicolor/48x48/apps/writer.png diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec index 58dae1d..9789a56 100755 --- a/sysui/desktop/suse/suse-menus.spec +++ b/sysui/desktop/suse/suse-menus.spec @@ -371,7 +371,6 @@ done /usr/share/applications/%unixfilename-impress.desktop /usr/share/applications/%unixfilename-math.desktop /usr/share/applications/%unixfilename-base.desktop -/usr/share/applications/%unixfilename-printeradmin.desktop /usr/share/applications/%unixfilename-startcenter.desktop /usr/share/applications/%unixfilename-xsltfilter.desktop /opt/gnome/share/mime-info/*.keys
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
