cui/uiconfig/ui/textflowpage.ui | 40 ++++++++++++++++++++---
tomcat/makefile.mk | 68 ----------------------------------------
2 files changed, 35 insertions(+), 73 deletions(-)
New commits:
commit db70e104c84369d3a7de2e297fb9882f1b0c0778
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Feb 18 15:00:37 2013 +0000
migrate the textflow NumericField settings to GtkAdjustments
Change-Id: I751071365b8aaa0d22364ed0ca74b3954839c126
diff --git a/cui/uiconfig/ui/textflowpage.ui b/cui/uiconfig/ui/textflowpage.ui
index a61bac0..59748de 100644
--- a/cui/uiconfig/ui/textflowpage.ui
+++ b/cui/uiconfig/ui/textflowpage.ui
@@ -1,6 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="lower">2</property>
+ <property name="upper">9</property>
+ <property name="value">2</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="upper">99</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment3">
+ <property name="upper">9999</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkGrid" id="TextFlowPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -32,7 +49,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="checkAuto">
- <property name="label"
translatable="yes">Automatically</property>
+ <property name="label"
translatable="yes">A_utomatically</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -46,7 +63,7 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
+ <property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
@@ -57,6 +74,7 @@
<property name="halign">start</property>
<property name="margin_left">25</property>
<property name="invisible_char">â¢</property>
+ <property name="adjustment">adjustment2</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -72,6 +90,7 @@
<property name="halign">start</property>
<property name="margin_left">25</property>
<property name="invisible_char">â¢</property>
+ <property name="adjustment">adjustment1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -88,6 +107,7 @@
<property name="margin_left">25</property>
<property name="invisible_char">â¢</property>
<property name="input_purpose">number</property>
+ <property name="adjustment">adjustment1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -141,9 +161,6 @@
<property name="height">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
</object>
@@ -226,8 +243,10 @@
<object class="GtkLabel" id="labelType">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">_Type</property>
<property name="use_underline">True</property>
+ <property name="mnemonic_widget">comboBreakType</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -241,6 +260,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â¢</property>
+ <property name="adjustment">adjustment3</property>
</object>
<packing>
<property name="left_attach">4</property>
@@ -253,9 +273,11 @@
<object class="GtkLabel" id="labelPageNum">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xalign">1</property>
<property name="label" translatable="yes">Page
_number</property>
<property name="use_underline">True</property>
<property name="justify">right</property>
+ <property name="mnemonic_widget">spinPageNumber</property>
</object>
<packing>
<property name="left_attach">3</property>
@@ -268,8 +290,11 @@
<object class="GtkLabel" id="labelPosition">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xalign">1</property>
<property name="label"
translatable="yes">Position</property>
+ <property name="use_underline">True</property>
<property name="justify">right</property>
+ <property
name="mnemonic_widget">comboBreakPosition</property>
</object>
<packing>
<property name="left_attach">3</property>
@@ -361,6 +386,7 @@
<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="gridOptions">
@@ -445,6 +471,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â¢</property>
+ <property name="adjustment">adjustment1</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -458,6 +485,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â¢</property>
+ <property name="adjustment">adjustment1</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
</object>
@@ -472,6 +500,7 @@
<object class="GtkLabel" id="labelOrphan">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">Lines</property>
</object>
<packing>
@@ -485,6 +514,7 @@
<object class="GtkLabel" id="labelWidow">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">Lines</property>
</object>
<packing>
commit 71023fb23af693a373429d4d5a7d1ffcadb9e884
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Feb 18 14:41:21 2013 +0000
stray dmake makefile.mk
Change-Id: Iff01ce69ced959587e411097a114b380e825203f
diff --git a/tomcat/makefile.mk b/tomcat/makefile.mk
deleted file mode 100644
index 27ac902..0000000
--- a/tomcat/makefile.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=tomacat
-TARGET=servlet
-
-.IF "$(SOLAR_JAVA)" != ""
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : antsettings.mk
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=jakarta-tomcat-5.0.30-src
-TARFILE_MD5=2a177023f9ea8ec8bd00837605c5df1b
-
-TARFILE_ROOTDIR=jakarta-tomcat-5.0.30-src
-
-ADDITIONAL_FILES = jakarta-servletapi-5/build.xml
-
-PATCH_FILES=tomcat.patch
-
-BUILD_DIR=jakarta-servletapi-5
-
-.IF "$(JAVACISGCJ)"=="yes"
-BUILD_ACTION="$(ANT)"
-.ELSE
-BUILD_ACTION="$(ANT)" -Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER)
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-
-.INCLUDE : tg_ext.mk
-
-.ELSE
-@all:
- @echo java disabled
-.ENDIF
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
