[Libreoffice-commits] core.git: 5 commits - cui/source cui/uiconfig cui/UI_cui.mk extras/source sw/uiconfig
Caolán McNamara
caolanm at redhat.com
Fri Feb 22 01:04:10 PST 2013
cui/UI_cui.mk | 1
cui/source/customize/cfg.cxx | 40 ++----
cui/source/customize/cfg.hrc | 3
cui/source/customize/cfg.src | 60 ---------
cui/source/inc/cfg.hxx | 26 ++--
cui/uiconfig/ui/borderpage.ui | 4
cui/uiconfig/ui/effectspage.ui | 57 ++++++---
cui/uiconfig/ui/name.ui | 167 --------------------------
cui/uiconfig/ui/newtoolbardialog.ui | 175 ++++++++++++++++++++++++++++
cui/uiconfig/ui/zoomdialog.ui | 4
extras/source/glade/libreoffice-catalog.xml | 6
sw/uiconfig/swriter/ui/insertbreak.ui | 44 ++-----
sw/uiconfig/swriter/ui/insertscript.ui | 21 ---
13 files changed, 278 insertions(+), 330 deletions(-)
New commits:
commit 6fb6bc4b4e45df954dc0ee0d5a53d35dae686fa0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 21 21:44:07 2013 +0000
adapt code to New Toolbar Dialog .ui conversion
Change-Id: Ie1b7a0cf5fbb9dbfc04a07bb58d5f55f83a096f3
diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk
index b255d76..9e3a396 100644
--- a/cui/UI_cui.mk
+++ b/cui/UI_cui.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\
cui/uiconfig/ui/messbox \
cui/uiconfig/ui/namedialog \
cui/uiconfig/ui/newtabledialog \
+ cui/uiconfig/ui/newtoolbardialog \
cui/uiconfig/ui/numberingformatpage \
cui/uiconfig/ui/numberingoptionspage \
cui/uiconfig/ui/numberingpositionpage \
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 20956ae..dd01214 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -4653,24 +4653,24 @@ IMPL_LINK( SvxToolbarConfigPage, NewToolbarHdl, Button *, pButton )
SaveInData* pData =
(SaveInData*) aSaveInListBox.GetEntryData( i );
- nInsertPos = pNameDialog->aSaveInListBox.InsertEntry(
+ nInsertPos = pNameDialog->m_pSaveInListBox->InsertEntry(
aSaveInListBox.GetEntry( i ) );
- pNameDialog->aSaveInListBox.SetEntryData( nInsertPos, pData );
+ pNameDialog->m_pSaveInListBox->SetEntryData( nInsertPos, pData );
}
- pNameDialog->aSaveInListBox.SelectEntryPos(
+ pNameDialog->m_pSaveInListBox->SelectEntryPos(
aSaveInListBox.GetSelectEntryPos(), sal_True );
bool ret = pNameDialog->Execute();
if ( ret == RET_OK )
{
- pNameDialog->GetName( aNewName );
+ aNewName = pNameDialog->GetName();
- nInsertPos = pNameDialog->aSaveInListBox.GetSelectEntryPos();
+ nInsertPos = pNameDialog->m_pSaveInListBox->GetSelectEntryPos();
ToolbarSaveInData* pData = (ToolbarSaveInData*)
- pNameDialog->aSaveInListBox.GetEntryData( nInsertPos );
+ pNameDialog->m_pSaveInListBox->GetEntryData( nInsertPos );
if ( GetSaveInData() != pData )
{
@@ -4954,24 +4954,16 @@ sal_Bool SvxToolbarEntriesListBox::NotifyCopying(
return sal_False;
}
-SvxNewToolbarDialog::SvxNewToolbarDialog(
- Window* pWindow, const String& rName )
- :
- ModalDialog ( pWindow, CUI_RES( MD_NEW_TOOLBAR ) ),
- aFtDescription ( this, CUI_RES( FT_NAME ) ),
- aEdtName ( this, CUI_RES( EDT_STRING ) ),
- aSaveInText ( this, CUI_RES( TXT_SAVEIN ) ),
- aBtnOK ( this, CUI_RES( BTN_OK ) ),
- aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
- aBtnHelp ( this, CUI_RES( BTN_HELP ) ),
- aSaveInListBox ( this, CUI_RES( LB_SAVEIN ) )
+SvxNewToolbarDialog::SvxNewToolbarDialog(Window* pWindow, const OUString& rName)
+ : ModalDialog(pWindow, "NewToolbarDialog", "cui/ui/newtoolbardialog.ui")
{
- FreeResource();
-
- aEdtName.SetText( rName );
- aEdtName.SetSelection(Selection(SELECTION_MIN, SELECTION_MAX));
- ModifyHdl(&aEdtName);
- aEdtName.SetModifyHdl(LINK(this, SvxNewToolbarDialog, ModifyHdl));
+ get(m_pEdtName, "edit");
+ get(m_pBtnOK, "ok");
+ get(m_pSaveInListBox, "savein");
+ m_pEdtName->SetText( rName );
+ m_pEdtName->SetSelection(Selection(SELECTION_MIN, SELECTION_MAX));
+ ModifyHdl(m_pEdtName);
+ m_pEdtName->SetModifyHdl(LINK(this, SvxNewToolbarDialog, ModifyHdl));
}
IMPL_LINK(SvxNewToolbarDialog, ModifyHdl, Edit*, pEdit)
@@ -4979,7 +4971,7 @@ IMPL_LINK(SvxNewToolbarDialog, ModifyHdl, Edit*, pEdit)
(void)pEdit;
if(aCheckNameHdl.IsSet())
- aBtnOK.Enable(aCheckNameHdl.Call(this) > 0);
+ m_pBtnOK->Enable(aCheckNameHdl.Call(this) > 0);
return 0;
}
diff --git a/cui/source/customize/cfg.hrc b/cui/source/customize/cfg.hrc
index 64e0cef..7db7f26 100644
--- a/cui/source/customize/cfg.hrc
+++ b/cui/source/customize/cfg.hrc
@@ -79,12 +79,9 @@
#define BTN_IMPORT (97 + CFG_OFFSET)
#define IMAGE_BTN_COLOR (98 + CFG_OFFSET)
-#define MD_NEW_TOOLBAR (101 + CFG_OFFSET)
-#define EDT_STRING (102 + CFG_OFFSET)
#define BTN_OK (103 + CFG_OFFSET)
#define BTN_CANCEL (104 + CFG_OFFSET)
#define BTN_HELP (105 + CFG_OFFSET)
-#define FT_NAME (106 + CFG_OFFSET)
#define FL_SEPARATOR (108 + CFG_OFFSET)
#define BTN_DELETE (109 + CFG_OFFSET)
diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src
index 80a6c1d..b4a4f48 100644
--- a/cui/source/customize/cfg.src
+++ b/cui/source/customize/cfg.src
@@ -483,66 +483,6 @@ ModalDialog MD_MENU_ORGANISER
};
};
-// MD_NEW_TOOLBAR -------------------------------------------------
-ModalDialog MD_NEW_TOOLBAR
-{
- HelpID = "cui:ModalDialog:MD_NEW_TOOLBAR";
- OutputSize = TRUE ;
- SvLook = TRUE ;
- Size = MAP_APPFONT ( 165 , 63 ) ;
- Text [ en-US ] = "Name" ;
- Moveable = TRUE ;
- FixedText FT_NAME
- {
- Pos = MAP_APPFONT ( 6 , 6 ) ;
- Size = MAP_APPFONT ( 98 , 8 ) ;
- TEXT_TOOLBAR_NAME
- WordBreak = TRUE ;
- };
- Edit EDT_STRING
- {
- HelpID = "cui:Edit:MD_NEW_TOOLBAR:EDT_STRING";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 17 ) ;
- Size = MAP_APPFONT ( 97 , 12 ) ;
- TabStop = TRUE ;
- };
- FixedText TXT_SAVEIN
- {
- Pos = MAP_APPFONT ( 6 , 35 ) ;
- Size = MAP_APPFONT ( 98 , 8 ) ;
- Group = TRUE ;
- TEXT_SAVE_IN
- };
- ListBox LB_SAVEIN
- {
- HelpID = "cui:ListBox:MD_NEW_TOOLBAR:LB_SAVEIN";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 43 ) ;
- Size = MAP_APPFONT ( 97 , 53 ) ;
- DropDown = TRUE ;
- };
- OKButton BTN_OK
- {
- Pos = MAP_APPFONT ( 109 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- CancelButton BTN_CANCEL
- {
- Pos = MAP_APPFONT ( 109 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- HelpButton BTN_HELP
- {
- Pos = MAP_APPFONT ( 109 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
-};
-
#ifndef IMAGE_STDBTN_COLOR
#define IMAGE_STDBTN_COLOR Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }
#endif
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 0dc86a5..790dcd65 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -684,32 +684,34 @@ public:
class SvxNewToolbarDialog : public ModalDialog
{
private:
- FixedText aFtDescription;
- Edit aEdtName;
- FixedText aSaveInText;
- OKButton aBtnOK;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
+ Edit* m_pEdtName;
+ OKButton* m_pBtnOK;
Link aCheckNameHdl;
DECL_LINK(ModifyHdl, Edit*);
public:
- SvxNewToolbarDialog( Window* pWindow, const String& rName );
+ SvxNewToolbarDialog(Window* pWindow, const OUString& rName);
- ListBox aSaveInListBox;
+ ListBox* m_pSaveInListBox;
- void GetName( rtl::OUString& rName ){rName = aEdtName.GetText();}
+ OUString GetName()
+ {
+ return m_pEdtName->GetText();
+ }
- void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false )
+ void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false )
{
aCheckNameHdl = rLink;
if ( bCheckImmediately )
- aBtnOK.Enable( rLink.Call( this ) > 0 );
+ m_pBtnOK->Enable( rLink.Call( this ) > 0 );
}
- void SetEditHelpId( const rtl::OString& aHelpId) {aEdtName.SetHelpId(aHelpId);}
+ void SetEditHelpId( const rtl::OString& aHelpId)
+ {
+ m_pEdtName->SetHelpId(aHelpId);
+ }
};
class SvxIconSelectorDialog : public ModalDialog
diff --git a/cui/uiconfig/ui/name.ui b/cui/uiconfig/ui/name.ui
deleted file mode 100644
index 3e31f50..0000000
--- a/cui/uiconfig/ui/name.ui
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <!-- interface-requires gtk+ 3.0 -->
- <object class="GtkAction" id="action1"/>
- <object class="GtkDialog" id="NewToolbarDialog">
- <property name="can_focus">False</property>
- <property name="border_width">6</property>
- <property name="title" translatable="yes">Name</property>
- <property name="type_hint">dialog</property>
- <child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox1">
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area1">
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="layout_style">start</property>
- <child>
- <object class="GtkButton" id="ok">
- <property name="label">gtk-ok</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="cancel">
- <property name="label">gtk-cancel</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="help">
- <property name="label">gtk-help</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- <property name="image_position">right</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkBox" id="box2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Toolbar Name</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="entry1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Save In</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="comboboxtext1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="0">ok</action-widget>
- <action-widget response="0">cancel</action-widget>
- <action-widget response="0">help</action-widget>
- </action-widgets>
- </object>
-</interface>
diff --git a/cui/uiconfig/ui/newtoolbardialog.ui b/cui/uiconfig/ui/newtoolbardialog.ui
new file mode 100644
index 0000000..2eee76d
--- /dev/null
+++ b/cui/uiconfig/ui/newtoolbardialog.ui
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="NewToolbarDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Name</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</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_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <property name="image_position">right</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Toolbar Name</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">edit</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="edit">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="width_chars">26</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Save In</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">savein</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="savein">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ <action-widget response="0">help</action-widget>
+ </action-widgets>
+ </object>
+</interface>
commit 7d7eb08e182732ae3217a5f506d1a50384575b48
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 21 20:42:37 2013 +0000
add in some extra columns to eat extra whitespace
Change-Id: I85c556a5f3ed3934c409f0ee5e0b4454bc5b7728
diff --git a/cui/uiconfig/ui/effectspage.ui b/cui/uiconfig/ui/effectspage.ui
index 7de277b..42dbbe1 100644
--- a/cui/uiconfig/ui/effectspage.ui
+++ b/cui/uiconfig/ui/effectspage.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires LibreOffice 1.0 -->
<object class="GtkListStore" id="liststore1">
<columns>
<!-- column-name gchararray1 -->
@@ -273,7 +274,7 @@
<property name="label" translatable="yes">Overlining</property>
</object>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">2</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -287,7 +288,7 @@
<property name="label" translatable="yes">Strikethrough</property>
</object>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">2</property>
<property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -301,7 +302,7 @@
<property name="label" translatable="yes">Underlining</property>
</object>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">2</property>
<property name="top_attach">4</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -315,7 +316,7 @@
<property name="label" translatable="yes">Overline color</property>
</object>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">3</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -329,7 +330,7 @@
<property name="label" translatable="yes">Underline Color</property>
</object>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">3</property>
<property name="top_attach">4</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -367,7 +368,7 @@
<property name="model">liststore6</property>
</object>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">2</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -393,7 +394,7 @@
<property name="model">liststore6</property>
</object>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">2</property>
<property name="top_attach">5</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -406,7 +407,7 @@
<property name="model">liststore5</property>
</object>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">2</property>
<property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -418,7 +419,7 @@
<property name="can_focus">False</property>
</object>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">3</property>
<property name="top_attach">5</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -430,7 +431,7 @@
<property name="can_focus">False</property>
</object>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">3</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -497,7 +498,7 @@
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">2</property>
<property name="top_attach">6</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -510,7 +511,7 @@
<property name="model">liststore3</property>
</object>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">2</property>
<property name="top_attach">9</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -523,7 +524,7 @@
<property name="model">liststore4</property>
</object>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">3</property>
<property name="top_attach">9</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -537,7 +538,7 @@
<property name="label" translatable="yes">Position</property>
</object>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">3</property>
<property name="top_attach">8</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -551,7 +552,7 @@
<property name="label" translatable="yes">Emphasis mark</property>
</object>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">2</property>
<property name="top_attach">8</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -575,6 +576,32 @@
</packing>
</child>
<child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">10</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">10</property>
+ </packing>
+ </child>
+ <child>
<placeholder/>
</child>
<child>
commit c6db0c0848f204f93dc3e28f2cfe25ebfd39f999
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 21 20:26:45 2013 +0000
add some more custom widgets to the glade catalog
Change-Id: Ieb6e282225c7e7a94c93653c009400d1f77f657f
diff --git a/extras/source/glade/libreoffice-catalog.xml b/extras/source/glade/libreoffice-catalog.xml
index f7966d7..e028f73 100644
--- a/extras/source/glade/libreoffice-catalog.xml
+++ b/extras/source/glade/libreoffice-catalog.xml
@@ -42,6 +42,12 @@
<glade-widget-class title="Font Preview" name="svxlo-SvxFontPrevWindow"
generic-name="Font Preview Window" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
+ <glade-widget-class title="Frame Selector" name="svxlo-SvxFrameSelector"
+ generic-name="Frame Border Preview Window" parent="GtkDrawingArea"
+ icon-name="widget-gtk-drawingarea"/>
+ <glade-widget-class title="ValueSet" name="svtlo-ValueSet"
+ generic-name="Set of Value Options" parent="GtkDrawingArea"
+ icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="Table Container" name="svxcorelo-SvxSimpleTableContainer"
generic-name="Simple Table Container" parent="GtkTreeView"
icon-name="widget-gtk-treeview"/>
commit a647c19da530441b0a15f2eb11ac37f6def6f0a8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 21 20:26:10 2013 +0000
align color list box to start
Change-Id: I819bb12dc694fa6ee2da803e41d0098f66c06c3d
diff --git a/cui/uiconfig/ui/borderpage.ui b/cui/uiconfig/ui/borderpage.ui
index 524e9e5..f099151 100644
--- a/cui/uiconfig/ui/borderpage.ui
+++ b/cui/uiconfig/ui/borderpage.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires LibreOffice 1.0 -->
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">0.050000000000000003</property>
<property name="upper">9</property>
@@ -55,8 +56,6 @@
<object class="svxlo-SvxFrameSelector" id="framesel">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hexpand">center</property>
- <property name="vexpand">center</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -539,6 +538,7 @@
<object class="svtlo-ColorListBox" id="shadowcolorlb">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">start</property>
</object>
<packing>
<property name="left_attach">2</property>
commit 31d78bac6ca0f09e0f0fb2858c5a1bd2864fc9aa
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 21 17:27:28 2013 +0000
various efforts to consistently apply HIG rules
Change-Id: I045871d1f6c0dbd1baf1df82b196763d374bec38
diff --git a/cui/uiconfig/ui/name.ui b/cui/uiconfig/ui/name.ui
index 6323f45..3e31f50 100644
--- a/cui/uiconfig/ui/name.ui
+++ b/cui/uiconfig/ui/name.ui
@@ -2,14 +2,15 @@
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkAction" id="action1"/>
- <object class="GtkDialog" id="Name">
+ <object class="GtkDialog" id="NewToolbarDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Name</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</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>
@@ -70,13 +71,15 @@
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
@@ -115,6 +118,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
@@ -151,7 +155,7 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
diff --git a/cui/uiconfig/ui/zoomdialog.ui b/cui/uiconfig/ui/zoomdialog.ui
index 5fe7cd7..32e5a93 100644
--- a/cui/uiconfig/ui/zoomdialog.ui
+++ b/cui/uiconfig/ui/zoomdialog.ui
@@ -9,14 +9,14 @@
</object>
<object class="GtkDialog" id="ZoomDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Zoom & View Layout</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<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>
diff --git a/sw/uiconfig/swriter/ui/insertbreak.ui b/sw/uiconfig/swriter/ui/insertbreak.ui
index 3cfdb2c..d9b5ec6 100644
--- a/sw/uiconfig/swriter/ui/insertbreak.ui
+++ b/sw/uiconfig/swriter/ui/insertbreak.ui
@@ -21,13 +21,13 @@
</object>
<object class="GtkDialog" id="BreakDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Insert Break</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</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>
@@ -95,12 +95,14 @@
<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="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkRadioButton" id="linerb">
<property name="label" translatable="yes">Line break</property>
@@ -156,8 +158,11 @@
<object class="GtkLabel" id="styleft">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_top">6</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Style</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">stylelb</property>
</object>
<packing>
<property name="expand">False</property>
@@ -183,11 +188,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="margin_top">6</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
- <accessibility>
- <relation type="label-for" target="pagenumsb"/>
- </accessibility>
</object>
<packing>
<property name="expand">False</property>
@@ -196,29 +199,16 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box2">
+ <object class="GtkSpinButton" id="pagenumsb">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkSpinButton" id="pagenumsb">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â—</property>
- <property name="invisible_char_set">True</property>
- <property name="adjustment">adjustment1</property>
- <accessibility>
- <relation type="labelled-by" target="pagenumcb"/>
- </accessibility>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
+ <property name="can_focus">True</property>
+ <property name="halign">start</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment1</property>
+ <accessibility>
+ <relation type="labelled-by" target="pagenumcb"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/insertscript.ui b/sw/uiconfig/swriter/ui/insertscript.ui
index 4fcc093..fe53893 100644
--- a/sw/uiconfig/swriter/ui/insertscript.ui
+++ b/sw/uiconfig/swriter/ui/insertscript.ui
@@ -3,13 +3,13 @@
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="InsertScriptDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Insert Script</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
- <property name="spacing">2</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkGrid" id="grid1">
<property name="width_request">400</property>
@@ -48,12 +48,10 @@
<child>
<object class="GtkRadioButton" id="url">
<property name="label" translatable="yes">URL</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">text</property>
@@ -83,12 +81,10 @@
<child>
<object class="GtkButton" id="browse">
<property name="label" translatable="yes">Browse ...</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="halign">end</property>
- <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -100,12 +96,10 @@
<child>
<object class="GtkRadioButton" id="text">
<property name="label" translatable="yes">Text</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -159,13 +153,11 @@
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</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>
<property name="use_stock">True</property>
</object>
<packing>
@@ -177,11 +169,9 @@
<child>
<object class="GtkButton" id="cancel">
<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>
@@ -193,11 +183,9 @@
<child>
<object class="GtkButton" id="help">
<property name="label">gtk-help</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>
@@ -210,14 +198,13 @@
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="column_spacing">6</property>
<property name="column_homogeneous">True</property>
<child>
<object class="GtkButton" id="previous">
- <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="image">image1</property>
<property name="image_position">right</property>
</object>
@@ -230,11 +217,9 @@
</child>
<child>
<object class="GtkButton" id="next">
- <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="image">image2</property>
</object>
<packing>
More information about the Libreoffice-commits
mailing list