mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert info not found to .ui

Browse Source 
Change-Id: I553e6f696ad10e847d845c263fbfbab5d2279345
This commit is contained in:
Caolán McNamara
2013-09-09 14:31:44 +01:00
parent 351b631dd5
commit a96941702a
6 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sw/UIConfig_swriter.mk
View File

@@ -117,6 +117,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/indexentry \ sw/uiconfig/swriter/ui/indexentry \
sw/uiconfig/swriter/ui/inputfielddialog \ sw/uiconfig/swriter/ui/inputfielddialog \
sw/uiconfig/swriter/ui/indentpage \ sw/uiconfig/swriter/ui/indentpage \
sw/uiconfig/swriter/ui/infonotfounddialog \
sw/uiconfig/swriter/ui/inforeadonlydialog \ sw/uiconfig/swriter/ui/inforeadonlydialog \
sw/uiconfig/swriter/ui/insertautotextdialog \ sw/uiconfig/swriter/ui/insertautotextdialog \
sw/uiconfig/swriter/ui/insertbookmark \ sw/uiconfig/swriter/ui/insertbookmark \

3
sw/source/ui/uiview/srcview.cxx
View File

@@ -631,7 +631,8 @@ sal_uInt16 SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem,
{ {
if(bNotFoundMessage) if(bNotFoundMessage)
{ {
InfoBox( 0, SW_RES(MSG_NOT_FOUND)).Execute(); MessageDialog(0, "InfoNotFoundDialog",
"modules/swriter/ui/infonotfounddialog.ui").Execute();
} }
else if(!bRecursive) else if(!bRecursive)
{ {

1
sw/source/ui/uiview/view.hrc
View File

@@ -35,7 +35,6 @@
#define STR_EDIT_FOOTNOTE (RC_VIEW_BEGIN + 14) #define STR_EDIT_FOOTNOTE (RC_VIEW_BEGIN + 14)
#define MSG_NOT_FOUND (RC_VIEW_BEGIN + 16)
#define MSG_SEARCH_START (RC_VIEW_BEGIN + 17) #define MSG_SEARCH_START (RC_VIEW_BEGIN + 17)
#define MSG_SEARCH_END (RC_VIEW_BEGIN + 18) #define MSG_SEARCH_END (RC_VIEW_BEGIN + 18)
#define STR_NB_REPLACED (RC_VIEW_BEGIN + 20) #define STR_NB_REPLACED (RC_VIEW_BEGIN + 20)

4
sw/source/ui/uiview/view.src
View File

@@ -71,10 +71,6 @@ String STR_TEXTOPTIONS
{ {
Text [ en-US ] = "Text document"; Text [ en-US ] = "Text document";
}; };
InfoBox MSG_NOT_FOUND
{
Message [ en-US ] = "Search key not found." ;
};
InfoBox MSG_SCAN_NOSOURCE InfoBox MSG_SCAN_NOSOURCE
{ {
Message [ en-US ] = "Source not specified." ; Message [ en-US ] = "Source not specified." ;

11
sw/source/ui/uiview/viewsrch.cxx
View File

@@ -76,7 +76,7 @@ struct SwSearchOptions
SwSearchOptions( SwWrtShell* pSh, sal_Bool bBackward ); SwSearchOptions( SwWrtShell* pSh, sal_Bool bBackward );
}; };
inline Window* GetParentWindow( SvxSearchDialog* m_pSrchDlg ) static Window* GetParentWindow( SvxSearchDialog* m_pSrchDlg )
{ {
Window* pWin; Window* pWin;
if( m_pSrchDlg && m_pSrchDlg->IsVisible() ) if( m_pSrchDlg && m_pSrchDlg->IsVisible() )
@@ -86,18 +86,15 @@ inline Window* GetParentWindow( SvxSearchDialog* m_pSrchDlg )
return pWin; return pWin;
} }
inline void ShowNotFoundInfoBox( SvxSearchDialog* m_pSrchDlg ) static void ShowNotFoundInfoBox( SvxSearchDialog* m_pSrchDlg )
{ {
Window* pParentWindow = GetParentWindow( m_pSrchDlg ); Window* pParentWindow = GetParentWindow( m_pSrchDlg );
InfoBox aBox( pParentWindow, SW_RES(MSG_NOT_FOUND)); MessageDialog aBox(pParentWindow, "InfoNotFoundDialog",
"modules/swriter/ui/infonotfounddialog.ui");
if (pParentWindow) if (pParentWindow)
{ {
aBox.SetText(pParentWindow->GetText()); aBox.SetText(pParentWindow->GetText());
} }
else
{
aBox.SetText(SVX_RESSTR(RID_SVXSTR_FINDBAR_FIND));
}
aBox.Execute(); aBox.Execute();
} }

33
sw/uiconfig/swriter/ui/infonotfounddialog.ui Normal file
View File

@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkMessageDialog" id="InfoNotFoundDialog">
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="title" translatable="yes">Find</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="buttons">ok</property>
<property name="text" translatable="yes">Search key not found.</property>
<child internal-child="vbox">
<object class="GtkBox" id="messagedialog-vbox">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">24</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="messagedialog-action_area">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
</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>
</object>
</child>
</object>
</interface>