Skip to content

C
core
Kaydet (Commit) 02d4eb74 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

convert query delete dialog to .ui 

Change-Id: I0ab09c2c54bba4a287ef0f7cc812596958373e15
üst 6aefcb6a
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 144 deletions
include/svtools/fileview.hxx
Dosyayı görüntüle @ 02d4eb74
...@@ -25,8 +25,9 @@ ...@@ -25,8 +25,9 @@
#include <vcl/ctrl.hxx> #include <vcl/ctrl.hxx>
#include <vcl/image.hxx> #include <vcl/image.hxx>
#include <vcl/fixed.hxx> #include <vcl/fixed.hxx>
#include <vcl/button.hxx>
#include <vcl/dialog.hxx> #include <vcl/dialog.hxx>
#include <vcl/button.hxx>
#include <vcl/layout.hxx>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
// class SvtFileView ----------------------------------------------------- // class SvtFileView -----------------------------------------------------
...@@ -216,24 +217,19 @@ namespace svtools { ...@@ -216,24 +217,19 @@ namespace svtools {
enum QueryDeleteResult_Impl enum QueryDeleteResult_Impl
{ {
QUERYDELETE_YES = 0, QUERYDELETE_CANCEL = RET_CANCEL,
QUERYDELETE_NO, QUERYDELETE_YES = RET_YES,
QUERYDELETE_ALL, QUERYDELETE_NO = RET_NO,
QUERYDELETE_CANCEL QUERYDELETE_ALL = -1
}; };
class SVT_DLLPUBLIC QueryDeleteDlg_Impl : public ModalDialog class SVT_DLLPUBLIC QueryDeleteDlg_Impl : public MessageDialog
{ {
FixedText _aEntryLabel; PushButton* m_pYesButton;
FixedText _aEntry; PushButton* m_pAllButton;
FixedText _aQueryMsg; PushButton* m_pNoButton;
PushButton _aYesButton;
PushButton _aAllButton;
PushButton _aNoButton;
CancelButton _aCancelButton;
QueryDeleteResult_Impl _eResult; QueryDeleteResult_Impl m_eResult;
private: private:
...@@ -244,8 +240,7 @@ public: ...@@ -244,8 +240,7 @@ public:
QueryDeleteDlg_Impl( Window* pParent, QueryDeleteDlg_Impl( Window* pParent,
const OUString& rName ); const OUString& rName );
void EnableAllButton() { _aAllButton.Enable( sal_True ); } void EnableAllButton() { m_pAllButton->Enable(true); }
QueryDeleteResult_Impl GetResult() const { return _eResult; }
}; };
} }
......
include/svtools/svtools.hrc
Dosyayı görüntüle @ 02d4eb74
...@@ -27,8 +27,6 @@ ...@@ -27,8 +27,6 @@
//............................................................................. //.............................................................................
// various unsorted stuff // various unsorted stuff
#define DLG_SVT_QUERYDELETE (RID_SVTOOLS_START+6)
#define STR_SVT_AUTOMATIC_COLOR (RID_SVTOOLS_START+16) #define STR_SVT_AUTOMATIC_COLOR (RID_SVTOOLS_START+16)
#define STR_SVT_FILEVIEW_COLUMN_TITLE (RID_SVTOOLS_START + 20) #define STR_SVT_FILEVIEW_COLUMN_TITLE (RID_SVTOOLS_START + 20)
......
svtools/UIConfig_svt.mk
Dosyayı görüntüle @ 02d4eb74
...@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svt,\ ...@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svt,\
svtools/uiconfig/ui/graphicexport \ svtools/uiconfig/ui/graphicexport \
svtools/uiconfig/ui/placeedit \ svtools/uiconfig/ui/placeedit \
svtools/uiconfig/ui/printersetupdialog \ svtools/uiconfig/ui/printersetupdialog \
svtools/uiconfig/ui/querydeletedialog \
svtools/uiconfig/ui/restartdialog \ svtools/uiconfig/ui/restartdialog \
svtools/uiconfig/ui/GraphicExportOptionsDialog \ svtools/uiconfig/ui/GraphicExportOptionsDialog \
)) ))
......
svtools/source/contnr/fileview.cxx
Dosyayı görüntüle @ 02d4eb74
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
#include <unotools/localfilehelper.hxx> #include <unotools/localfilehelper.hxx>
#include <ucbhelper/content.hxx> #include <ucbhelper/content.hxx>
#include <ucbhelper/commandenvironment.hxx> #include <ucbhelper/commandenvironment.hxx>
#include <vcl/msgbox.hxx> #include <vcl/layout.hxx>
#include <rtl/math.hxx> #include <rtl/math.hxx>
#include <tools/config.hxx> #include <tools/config.hxx>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
...@@ -536,7 +536,7 @@ protected: ...@@ -536,7 +536,7 @@ protected:
protected: protected:
// IEnumerationResultHandler overridables // IEnumerationResultHandler overridables
virtual void enumerationDone( ::svt::EnumerationResult _eResult ); virtual void enumerationDone( ::svt::EnumerationResult eResult );
void implEnumerationSuccess(); void implEnumerationSuccess();
// ITimeoutHandler // ITimeoutHandler
...@@ -900,7 +900,7 @@ void ViewTabListBox_Impl::ClearAll() ...@@ -900,7 +900,7 @@ void ViewTabListBox_Impl::ClearAll()
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
void ViewTabListBox_Impl::DeleteEntries() void ViewTabListBox_Impl::DeleteEntries()
{ {
svtools::QueryDeleteResult_Impl eResult = svtools::QUERYDELETE_YES; short eResult = svtools::QUERYDELETE_YES;
SvTreeListEntry* pEntry = FirstSelected(); SvTreeListEntry* pEntry = FirstSelected();
OUString aURL; OUString aURL;
...@@ -946,10 +946,7 @@ void ViewTabListBox_Impl::DeleteEntries() ...@@ -946,10 +946,7 @@ void ViewTabListBox_Impl::DeleteEntries()
if ( GetSelectionCount() > 1 ) if ( GetSelectionCount() > 1 )
aDlg.EnableAllButton(); aDlg.EnableAllButton();
if ( aDlg.Execute() == RET_OK ) eResult = aDlg.Execute();
eResult = aDlg.GetResult();
else
eResult = svtools::QUERYDELETE_CANCEL;
sDialogPosition = aDlg.GetWindowState( ); sDialogPosition = aDlg.GetWindowState( );
} }
...@@ -2060,7 +2057,7 @@ void SvtFileView_Impl::onTimeout( CallbackTimer* ) ...@@ -2060,7 +2057,7 @@ void SvtFileView_Impl::onTimeout( CallbackTimer* )
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
void SvtFileView_Impl::enumerationDone( ::svt::EnumerationResult _eResult ) void SvtFileView_Impl::enumerationDone( ::svt::EnumerationResult eResult )
{ {
SolarMutexGuard aSolarGuard; SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( maMutex ); ::osl::MutexGuard aGuard( maMutex );
...@@ -2074,12 +2071,12 @@ void SvtFileView_Impl::enumerationDone( ::svt::EnumerationResult _eResult ) ...@@ -2074,12 +2071,12 @@ void SvtFileView_Impl::enumerationDone( ::svt::EnumerationResult _eResult )
// this is to prevent race conditions // this is to prevent race conditions
return; return;
m_eAsyncActionResult = _eResult; m_eAsyncActionResult = eResult;
m_bRunningAsyncAction = false; m_bRunningAsyncAction = false;
m_aAsyncActionFinished.set(); m_aAsyncActionFinished.set();
if ( svt::SUCCESS == _eResult ) if ( svt::SUCCESS == eResult )
implEnumerationSuccess(); implEnumerationSuccess();
if ( m_aCurrentAsyncActionHandler.IsSet() ) if ( m_aCurrentAsyncActionHandler.IsSet() )
...@@ -2541,53 +2538,34 @@ namespace svtools { ...@@ -2541,53 +2538,34 @@ namespace svtools {
// QueryDeleteDlg_Impl // QueryDeleteDlg_Impl
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
QueryDeleteDlg_Impl::QueryDeleteDlg_Impl QueryDeleteDlg_Impl::QueryDeleteDlg_Impl(Window* pParent, const OUString& rName)
( : MessageDialog(pParent, "QueryDeleteDialog", "svt/ui/querydeletedialog.ui")
Window* pParent, , m_eResult( QUERYDELETE_YES )
const OUString& rName // entry name
) :
ModalDialog( pParent, SvtResId( DLG_SVT_QUERYDELETE ) ),
_aEntryLabel ( this, SvtResId( TXT_ENTRY ) ),
_aEntry ( this, SvtResId( TXT_ENTRYNAME ) ),
_aQueryMsg ( this, SvtResId( TXT_QUERYMSG ) ),
_aYesButton ( this, SvtResId( BTN_YES ) ),
_aAllButton ( this, SvtResId( BTN_ALL ) ),
_aNoButton ( this, SvtResId( BTN_NO ) ),
_aCancelButton( this, SvtResId( BTN_CANCEL ) ),
_eResult( QUERYDELETE_YES )
{ {
FreeResource(); get(m_pNoButton, "no");
get(m_pAllButton, "all");
get(m_pYesButton, "yes");
// Handler // Handler
Link aLink( STATIC_LINK( this, QueryDeleteDlg_Impl, ClickLink ) ); Link aLink( STATIC_LINK( this, QueryDeleteDlg_Impl, ClickLink ) );
_aYesButton.SetClickHdl( aLink ); m_pYesButton->SetClickHdl( aLink );
_aAllButton.SetClickHdl( aLink ); m_pAllButton->SetClickHdl( aLink );
_aNoButton.SetClickHdl( aLink ); m_pNoButton->SetClickHdl( aLink );
// display specified texts // display specified texts
set_secondary_text(get_secondary_text().replaceFirst("%s", rName));
WinBits nTmpStyle = _aEntry.GetStyle();
nTmpStyle |= WB_PATHELLIPSIS;
_aEntry.SetStyle( nTmpStyle );
_aEntry.SetText( rName );
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
IMPL_STATIC_LINK( QueryDeleteDlg_Impl, ClickLink, PushButton*, pBtn ) IMPL_STATIC_LINK( QueryDeleteDlg_Impl, ClickLink, PushButton*, pBtn )
{ {
if ( pBtn == &pThis->_aYesButton ) if (pBtn == pThis->m_pYesButton)
pThis->_eResult = QUERYDELETE_YES; pThis->m_eResult = QUERYDELETE_YES;
else if ( pBtn == &pThis->_aNoButton ) else if ( pBtn == pThis->m_pNoButton )
pThis->_eResult = QUERYDELETE_NO; pThis->m_eResult = QUERYDELETE_NO;
else if ( pBtn == &pThis->_aAllButton ) else if (pBtn == pThis->m_pAllButton)
pThis->_eResult = QUERYDELETE_ALL; pThis->m_eResult = QUERYDELETE_ALL;
else if ( pBtn == &pThis->_aCancelButton )
pThis->_eResult = QUERYDELETE_CANCEL;
pThis->EndDialog( RET_OK ); pThis->EndDialog( RET_OK );
......
svtools/source/contnr/fileview.hrc
Dosyayı görüntüle @ 02d4eb74
...@@ -20,14 +20,4 @@ ...@@ -20,14 +20,4 @@
#define MID_FILEVIEW_DELETE 1 #define MID_FILEVIEW_DELETE 1
#define MID_FILEVIEW_RENAME 2 #define MID_FILEVIEW_RENAME 2
// DLG_SFX_QUERYDELETE ********************************************************
#define TXT_ENTRY 1
#define TXT_ENTRYNAME 2
#define TXT_QUERYMSG 3
#define BTN_YES 4
#define BTN_NO 5
#define BTN_ALL 6
#define BTN_CANCEL 7
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
svtools/source/contnr/fileview.src
Dosyayı görüntüle @ 02d4eb74
...@@ -98,74 +98,4 @@ Menu RID_FILEVIEW_CONTEXTMENU ...@@ -98,74 +98,4 @@ Menu RID_FILEVIEW_CONTEXTMENU
}; };
}; };
ModalDialog DLG_SVT_QUERYDELETE
{
HelpID = "svtools:ModalDialog:DLG_SVT_QUERYDELETE";
SVLook = TRUE ;
OutputSize = TRUE ;
Moveable = TRUE ;
Size = MAP_APPFONT ( 221 , 67 ) ;
Text [ en-US ] = "Confirm Delete" ;
FixedText TXT_ENTRY
{
NoLabel = TRUE;
Pos = MAP_APPFONT ( 6 , 6 ) ;
Size = MAP_APPFONT ( 40 , 10 ) ;
Text [ en-US ] = "Entry:" ;
};
FixedText TXT_ENTRYNAME
{
Pos = MAP_APPFONT ( 52 , 6 ) ;
Size = MAP_APPFONT ( 163 , 10 ) ;
NoLabel = TRUE ;
};
FixedText TXT_QUERYMSG
{
NoLabel = TRUE;
WordBreak = TRUE;
Pos = MAP_APPFONT ( 6 , 19 ) ;
Size = MAP_APPFONT ( 209 , 22 ) ;
Text [ en-US ] = "Are you sure you want to delete the selected data?" ;
};
PushButton BTN_YES
{
HelpID = "svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_YES";
Pos = MAP_APPFONT ( 6 , 47 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
Text [ en-US ] = "~Delete" ;
};
PushButton BTN_ALL
{
HelpID = "svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_ALL";
Pos = MAP_APPFONT ( 59 , 47 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
Disable = TRUE ;
Text [ en-US ] = "Delete ~All" ;
};
PushButton BTN_NO
{
HelpID = "svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_NO";
Pos = MAP_APPFONT ( 112 , 47 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Do ~Not Delete" ;
};
CancelButton BTN_CANCEL
{
Pos = MAP_APPFONT ( 165 , 47 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
svtools/uiconfig/ui/querydeletedialog.ui 0 → 100644
Dosyayı görüntüle @ 02d4eb74
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkMessageDialog" id="QueryDeleteDialog">
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="title" translatable="yes">Confirm Delete</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="message_type">question</property>
<property name="text" translatable="yes">Are you sure you want to delete the selected data?</property>
<property name="secondary_text" translatable="yes">Entry: %s</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">center</property>
<child>
<object class="GtkButton" id="yes">
<property name="label" translatable="yes">_Delete</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_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="GtkButton" id="all">
<property name="label" translatable="yes">Delete _All</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">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="no">
<property name="label" translatable="yes">Do _Not Delete</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</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">3</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>
</object>
</child>
<action-widgets>
<action-widget response="2">yes</action-widget>
<action-widget response="-1">all</action-widget>
<action-widget response="3">no</action-widget>
<action-widget response="0">cancel</action-widget>
</action-widgets>
</object>
</interface>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment