[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source sc/uiconfig sw/uiconfig
Caolán McNamara
caolanm at redhat.com
Wed Jul 17 12:45:04 PDT 2013
sc/inc/sc.hrc | 1
sc/source/ui/dbgui/sfiltdlg.cxx | 2
sc/source/ui/inc/filter.hrc | 6
sc/source/ui/miscdlgs/anyrefdg.cxx | 2
sc/source/ui/src/filter.src | 178 ---------------------------
sc/uiconfig/scalc/ui/advancedfilterdialog.ui | 10 +
sw/uiconfig/swriter/ui/wrappage.ui | 2
7 files changed, 14 insertions(+), 187 deletions(-)
New commits:
commit ff85d31495d764acb4796efbc52f666e8e432f75
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jul 17 20:44:18 2013 +0100
wrong widget name in wrap page .ui conversion
Change-Id: If29d55eaa2fa58ea907611a93b90a1e41178a6da
diff --git a/sw/uiconfig/swriter/ui/wrappage.ui b/sw/uiconfig/swriter/ui/wrappage.ui
index 5d4f989..f3b3a51 100644
--- a/sw/uiconfig/swriter/ui/wrappage.ui
+++ b/sw/uiconfig/swriter/ui/wrappage.ui
@@ -301,7 +301,7 @@
</packing>
</child>
<child>
- <object class="GtkImage" id="image1">
+ <object class="GtkImage" id="imgthrough">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="pixbuf">sw/imglst/wr05.png</property>
commit a2204ecb852a42bd7b4d05e7d22dcfb8e2e445cf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jul 17 20:42:23 2013 +0100
set the widgets to get the extra title text from when in shrink mode
Change-Id: Ia809ab852180f0422a16b2fad5d93f35a2e6f604
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index d163480..b0842a2 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -974,7 +974,6 @@
#define RID_SCPAGE_SORT_FIELDS (SC_DIALOGS_START + 6)
#define RID_SCDLG_FILTER (SC_DIALOGS_START + 8)
-#define RID_SCDLG_SPEC_FILTER (SC_DIALOGS_START + 9)
#define RID_SCDLG_INSCELL (SC_DIALOGS_START + 12)
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index 4c3eef5..80b3640 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -69,6 +69,7 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi
{
get(pLbFilterArea,"lbfilterarea");
get(pEdFilterArea,"edfilterarea");
+ pEdFilterArea->SetReferences(this, get<VclFrame>("filterframe")->get_label_widget());
get(pRbFilterArea,"rbfilterarea");
pRbFilterArea->SetReferences(this, pEdFilterArea);
get(pBtnCase,"case");
@@ -78,6 +79,7 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi
get(pBtnCopyResult,"copyresult");
get(pLbCopyArea,"lbcopyarea");
get(pEdCopyArea,"edcopyarea");
+ pEdCopyArea->SetReferences(this, pBtnCopyResult);
get(pRbCopyArea,"rbcopyarea");
pRbCopyArea->SetReferences(this, pEdCopyArea);
get(pBtnDestPers,"destpers");
diff --git a/sc/source/ui/inc/filter.hrc b/sc/source/ui/inc/filter.hrc
index bf783c2..8335f63 100644
--- a/sc/source/ui/inc/filter.hrc
+++ b/sc/source/ui/inc/filter.hrc
@@ -66,12 +66,6 @@
#define LB_OP4 42
// Special filter
-/*
-#define FT_CRITERIA_AREA 50
-#define LB_CRITERIA_AREA 51
-#define ED_CRITERIA_AREA 52
-#define RB_CRITERIA_AREA 53
-*/
#define STR_COPY_AREA_TO 5054
#define RID_FILTER_OPERATOR 5055
#define RID_FILTER_FIELDNAME 5056
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index ab3b534..f060cc7 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -486,7 +486,7 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula::
{
String sNewDialogText = sOldDialogText;
sNewDialogText.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ": " ));
- sNewDialogText += sLabel;
+ sNewDialogText += comphelper::string::stripEnd(sLabel, ':');
m_pWindow->SetText( MnemonicGenerator::EraseAllMnemonicChars( sNewDialogText ) );
}
}
diff --git a/sc/source/ui/src/filter.src b/sc/source/ui/src/filter.src
index 1490b09..53975db 100644
--- a/sc/source/ui/src/filter.src
+++ b/sc/source/ui/src/filter.src
@@ -437,181 +437,9 @@ ModelessDialog RID_SCDLG_FILTER
Size = MAP_APPFONT ( 279 , 6 ) ;
};
};
- //============================================================================
-/*ModelessDialog RID_SCDLG_SPEC_FILTER
-{
- OutputSize = TRUE ;
- HelpId = CMD_SID_SPECIAL_FILTER ;
- Hide = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 278 , 83 ) ;
- Text [ en-US ] = "Advanced Filter" ;
- Moveable = TRUE ;
- Closeable = FALSE ;
- FixedText FT_CRITERIA_AREA
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 210 , 8 ) ;
- Text [ en-US ] = "Read ~filter criteria from" ;
- };
- ListBox LB_CRITERIA_AREA
- {
- HelpID = "sc:ListBox:RID_SCDLG_SPEC_FILTER:LB_CRITERIA_AREA";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 14 ) ;
- Size = MAP_APPFONT ( 90 , 90 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- };
- Edit ED_CRITERIA_AREA
- {
- HelpID = "sc:Edit:RID_SCDLG_SPEC_FILTER:ED_CRITERIA_AREA";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 100 , 14 ) ;
- Size = MAP_APPFONT ( 99 , 12 ) ;
- TabStop = TRUE ;
- };
- ImageButton RB_CRITERIA_AREA
- {
- HelpID = "sc:ImageButton:RID_SCDLG_SPEC_FILTER:RB_CRITERIA_AREA";
- Pos = MAP_APPFONT ( 201 , 13 ) ;
- Size = MAP_APPFONT ( 13 , 15 ) ;
- TabStop = FALSE ;
- QuickHelpText [ en-US ] = "Shrink" ;
- };
- CheckBox BTN_CASE
- {
- HelpID = "sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_CASE";
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 12 , 43 ) ;
- Size = MAP_APPFONT ( 128 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Case sensitive" ;
- };
- CheckBox BTN_REGEXP
- {
- HelpID = "sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_REGEXP";
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 142 , 43 ) ;
- Size = MAP_APPFONT ( 74 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Regular ~expressions" ;
- };
- CheckBox BTN_HEADER
- {
- HelpID = "sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_HEADER";
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 12 , 57 ) ;
- Size = MAP_APPFONT ( 128 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Range c~ontains column labels" ;
- };
- CheckBox BTN_UNIQUE
- {
- HelpID = "sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_UNIQUE";
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 142 , 57 ) ;
- Size = MAP_APPFONT ( 74 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~No duplication" ;
- };
- CheckBox BTN_COPY_RESULT
- {
- HelpID = "sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_COPY_RESULT";
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 12 , 71 ) ;
- Size = MAP_APPFONT ( 128 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Co~py results to" ;
- };
- CheckBox BTN_DEST_PERS
- {
- HelpID = "sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_DEST_PERS";
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 142 , 71 ) ;
- Size = MAP_APPFONT ( 74 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Keep filter criteria" ;
- };
- ListBox LB_COPY_AREA
- {
- HelpID = "sc:ListBox:RID_SCDLG_SPEC_FILTER:LB_COPY_AREA";
- Border = TRUE ;
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 20 , 83 ) ;
- Size = MAP_APPFONT ( 76 , 90 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- };
- Edit ED_COPY_AREA
- {
- HelpID = "sc:Edit:RID_SCDLG_SPEC_FILTER:ED_COPY_AREA";
- Border = TRUE ;
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 100 , 83 ) ;
- Size = MAP_APPFONT ( 99 , 12 ) ;
- TabStop = TRUE ;
- };
- ImageButton RB_COPY_AREA
- {
- HelpID = "sc:ImageButton:RID_SCDLG_SPEC_FILTER:RB_COPY_AREA";
- Pos = MAP_APPFONT ( 201 , 82 ) ;
- Size = MAP_APPFONT ( 13 , 15 ) ;
- TabStop = FALSE ;
- QuickHelpText [ en-US ] = "Shrink" ;
- };
- FixedLine FL_OPTIONS
- {
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 6 , 32 ) ;
- Size = MAP_APPFONT ( 210 , 8 ) ;
- Text [ en-US ] = "Options" ;
- };
- FixedText FT_DBAREA
- {
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 58 , 101 ) ;
- Size = MAP_APPFONT ( 155 , 8 ) ;
- Left = TRUE ;
- Text [ en-US ] = "dummy" ;
- };
- FixedText FT_DBAREA_LABEL
- {
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 6 , 101 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Text [ en-US ] = "Data range:" ;
- };
- OKButton BTN_OK
- {
- Pos = MAP_APPFONT ( 222 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- CancelButton BTN_CANCEL
- {
- Pos = MAP_APPFONT ( 222 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- HelpButton BTN_HELP
- {
- Pos = MAP_APPFONT ( 222 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- MoreButton BTN_MORE
- {
- HelpID = "sc:MoreButton:RID_SCDLG_SPEC_FILTER:BTN_MORE";
- Pos = MAP_APPFONT ( 223 , 63 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- MapUnit = MAP_APPFONT ;
- Delta = 32 ;
- };
-};*/
- //============================================================================
+
+//============================================================================
+
ModalDialog RID_SCDLG_PIVOTFILTER
{
OutputSize = TRUE ;
diff --git a/sc/uiconfig/scalc/ui/advancedfilterdialog.ui b/sc/uiconfig/scalc/ui/advancedfilterdialog.ui
index 6202dc3..c1cfeec 100644
--- a/sc/uiconfig/scalc/ui/advancedfilterdialog.ui
+++ b/sc/uiconfig/scalc/ui/advancedfilterdialog.ui
@@ -16,7 +16,7 @@
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="filterframe">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
@@ -72,8 +72,9 @@
<object class="foruilo-RefEdit" id="edfilterarea">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="width_chars">30</property>
+ <property name="hexpand">True</property>
<property name="invisible_char">â—</property>
+ <property name="width_chars">30</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -176,6 +177,7 @@
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_top">6</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="row_spacing">6</property>
@@ -336,6 +338,8 @@
<object class="foruilo-RefEdit" id="edcopyarea">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="margin_bottom">1</property>
+ <property name="hexpand">True</property>
<property name="invisible_char">â—</property>
<property name="width_chars">30</property>
<accessibility>
@@ -421,8 +425,8 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_underline">True</property>
<property name="label" translatable="yes">Op_tions</property>
+ <property name="use_underline">True</property>
</object>
</child>
</object>
More information about the Libreoffice-commits
mailing list