Skip to content

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

adapt code to insert sheet .ui 

Change-Id: Idba3ff98cecd47743d83ad444151117d5f457a7d
üst 4f8c28de
Hide whitespace changes
Inline Side-by-side
Showing with 318 additions and 439 deletions
sc/AllLangResTarget_sc.mk
Dosyayı görüntüle @ db679c57
...@@ -106,7 +106,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\ ...@@ -106,7 +106,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/ui/drawfunc/drformsh.src \ sc/source/ui/drawfunc/drformsh.src \
sc/source/ui/drawfunc/objdraw.src \ sc/source/ui/drawfunc/objdraw.src \
sc/source/ui/miscdlgs/retypepassdlg.src \ sc/source/ui/miscdlgs/retypepassdlg.src \
sc/source/ui/miscdlgs/instbdlg.src \
sc/source/ui/miscdlgs/highred.src \ sc/source/ui/miscdlgs/highred.src \
sc/source/ui/miscdlgs/conflictsdlg.src \ sc/source/ui/miscdlgs/conflictsdlg.src \
sc/source/ui/miscdlgs/protectiondlg.src \ sc/source/ui/miscdlgs/protectiondlg.src \
......
sc/UI_scalc.mk
Dosyayı görüntüle @ db679c57
...@@ -11,6 +11,7 @@ $(eval $(call gb_UI_UI,modules/scalc)) ...@@ -11,6 +11,7 @@ $(eval $(call gb_UI_UI,modules/scalc))
$(eval $(call gb_UI_add_uifiles,modules/scalc,\ $(eval $(call gb_UI_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/cellprotectionpage \ sc/uiconfig/scalc/ui/cellprotectionpage \
sc/uiconfig/scalc/ui/insertsheet \
sc/uiconfig/scalc/ui/printeroptions \ sc/uiconfig/scalc/ui/printeroptions \
sc/uiconfig/scalc/ui/sortcriteriapage \ sc/uiconfig/scalc/ui/sortcriteriapage \
sc/uiconfig/scalc/ui/sortkey \ sc/uiconfig/scalc/ui/sortkey \
......
sc/inc/scabstdlg.hxx
Dosyayı görüntüle @ db679c57
...@@ -391,8 +391,8 @@ public: ...@@ -391,8 +391,8 @@ public:
sal_uInt16 nCheckDefaults = 0, sal_uInt16 nCheckDefaults = 0,
const String* pStrTitle = NULL ) = 0; const String* pStrTitle = NULL ) = 0;
virtual AbstractScInsertTableDlg * CreateScInsertTableDlg ( Window* pParent, ScViewData& rViewData, //add for ScInsertTableDlg virtual AbstractScInsertTableDlg * CreateScInsertTableDlg(Window* pParent, ScViewData& rViewData,
SCTAB nTabCount, bool bFromFile, int nId) = 0; SCTAB nTabCount, bool bFromFile) = 0;
virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, // add for ScSelEntryDlg virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, // add for ScSelEntryDlg
sal_uInt16 nResId, sal_uInt16 nResId,
......
sc/source/ui/attrdlg/scdlgfact.cxx
Dosyayı görüntüle @ db679c57
...@@ -1002,27 +1002,13 @@ AbstractScInsertContentsDlg * ScAbstractDialogFactory_Impl::CreateScInsertConten ...@@ -1002,27 +1002,13 @@ AbstractScInsertContentsDlg * ScAbstractDialogFactory_Impl::CreateScInsertConten
return 0; return 0;
} }
AbstractScInsertTableDlg * ScAbstractDialogFactory_Impl::CreateScInsertTableDlg(Window* pParent, ScViewData& rViewData,
SCTAB nTabCount, bool bFromFile)
AbstractScInsertTableDlg * ScAbstractDialogFactory_Impl::CreateScInsertTableDlg ( Window* pParent, ScViewData& rViewData,
SCTAB nTabCount, bool bFromFile, int nId)
{ {
ScInsertTableDlg * pDlg=NULL; ScInsertTableDlg* pDlg = new ScInsertTableDlg( pParent, rViewData,nTabCount, bFromFile );
switch ( nId ) return new AbstractScInsertTableDlg_Impl( pDlg );
{
case RID_SCDLG_INSERT_TABLE :
pDlg = new ScInsertTableDlg( pParent, rViewData,nTabCount, bFromFile );
break;
default:
break;
}
if ( pDlg )
return new AbstractScInsertTableDlg_Impl( pDlg );
return 0;
} }
// add for ScSelEntryDlg begin // add for ScSelEntryDlg begin
AbstractScSelEntryDlg * ScAbstractDialogFactory_Impl::CreateScSelEntryDlg ( Window* pParent, AbstractScSelEntryDlg * ScAbstractDialogFactory_Impl::CreateScSelEntryDlg ( Window* pParent,
sal_uInt16 nResId, sal_uInt16 nResId,
......
sc/source/ui/attrdlg/scdlgfact.hxx
Dosyayı görüntüle @ db679c57
...@@ -458,8 +458,8 @@ public: ...@@ -458,8 +458,8 @@ public:
sal_uInt16 nCheckDefaults = 0, sal_uInt16 nCheckDefaults = 0,
const String* pStrTitle = NULL ); const String* pStrTitle = NULL );
virtual AbstractScInsertTableDlg * CreateScInsertTableDlg ( Window* pParent, ScViewData& rViewData, //add for ScInsertTableDlg virtual AbstractScInsertTableDlg * CreateScInsertTableDlg(Window* pParent, ScViewData& rViewData,
SCTAB nTabCount, bool bFromFile, int nId); SCTAB nTabCount, bool bFromFile);
virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, // add for ScSelEntryDlg virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, // add for ScSelEntryDlg
sal_uInt16 nResId, sal_uInt16 nResId,
......
sc/source/ui/inc/instbdlg.hrc deleted 100644 → 0
Dosyayı görüntüle @ 4f8c28de
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <sc.hrc> // -> RID_SCDLG_INSERT_TABLE
#define BTN_OK 1
#define BTN_CANCEL 2
#define BTN_HELP 3
#define FL_POSITION 10
#define RB_BEFORE 11
#define RB_BEHIND 12
#define FL_TABLE 20
#define RB_NEW 21
#define FT_COUNT 22
#define NF_COUNT 23
#define FT_NAME 24
#define ED_TABNAME 25
#define RB_FROMFILE 26
#define LB_TABLES 27
#define BTN_BROWSE 28
#define CB_LINK 29
#define FT_PATH 30
sc/source/ui/inc/instbdlg.hxx
Dosyayı görüntüle @ db679c57
...@@ -50,33 +50,29 @@ public: ...@@ -50,33 +50,29 @@ public:
virtual short Execute(); // overloaded to set parent dialog virtual short Execute(); // overloaded to set parent dialog
sal_Bool GetTablesFromFile() { return aBtnFromFile.IsChecked(); } sal_Bool GetTablesFromFile() const { return m_pBtnFromFile->IsChecked(); }
sal_Bool GetTablesAsLink() { return aBtnLink.IsChecked(); } sal_Bool GetTablesAsLink() const { return m_pBtnLink->IsChecked(); }
const String* GetFirstTable( sal_uInt16* pN = NULL ); const String* GetFirstTable( sal_uInt16* pN = NULL );
const String* GetNextTable( sal_uInt16* pN = NULL ); const String* GetNextTable( sal_uInt16* pN = NULL );
ScDocShell* GetDocShellTables() { return pDocShTables; } ScDocShell* GetDocShellTables() { return pDocShTables; }
sal_Bool IsTableBefore() { return aBtnBefore.IsChecked(); } sal_Bool IsTableBefore() const { return m_pBtnBefore->IsChecked(); }
SCTAB GetTableCount() { return nTableCount;} SCTAB GetTableCount() const { return nTableCount;}
private: private:
FixedLine aFlPos; RadioButton* m_pBtnBefore;
RadioButton aBtnBefore; RadioButton* m_pBtnBehind;
RadioButton aBtnBehind; RadioButton* m_pBtnNew;
FixedLine aFlTable; RadioButton* m_pBtnFromFile;
RadioButton aBtnNew; FixedText* m_pFtCount;
RadioButton aBtnFromFile; NumericField* m_pNfCount;
FixedText aFtCount; FixedText* m_pFtName;
NumericField aNfCount; Edit* m_pEdName;
FixedText aFtName; ListBox* m_pLbTables;
Edit aEdName; FixedText* m_pFtPath;
MultiListBox aLbTables; PushButton* m_pBtnBrowse;
ScExpandedFixedText aFtPath; CheckBox* m_pBtnLink;
PushButton aBtnBrowse; OKButton* m_pBtnOk;
CheckBox aBtnLink;
OKButton aBtnOk;
CancelButton aBtnCancel;
HelpButton aBtnHelp;
Timer aBrowseTimer; Timer aBrowseTimer;
ScViewData& rViewData; ScViewData& rViewData;
...@@ -86,9 +82,10 @@ private: ...@@ -86,9 +82,10 @@ private:
SfxObjectShellRef aDocShTablesRef; SfxObjectShellRef aDocShTablesRef;
bool bMustClose; bool bMustClose;
sal_uInt16 nSelTabIndex; // for GetFirstTable() / GetNextTable() sal_uInt16 nSelTabIndex; // for GetFirstTable() / GetNextTable()
String aStrCurSelTable; String aStrCurSelTable;
SCTAB nTableCount; SCTAB nTableCount;
OUString m_sSheetDotDotDot;
#ifdef SC_INSTBDLG_CXX #ifdef SC_INSTBDLG_CXX
void Init_Impl( bool bFromFile ); void Init_Impl( bool bFromFile );
......
sc/source/ui/miscdlgs/instbdlg.cxx
Dosyayı görüntüle @ db679c57
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#include "docsh.hxx" #include "docsh.hxx"
#include "viewdata.hxx" #include "viewdata.hxx"
#include "scresid.hxx" #include "scresid.hxx"
#include "instbdlg.hrc"
#include "globstr.hrc" #include "globstr.hrc"
#define SC_INSTBDLG_CXX #define SC_INSTBDLG_CXX
...@@ -45,37 +44,31 @@ ...@@ -45,37 +44,31 @@
//================================================================== //==================================================================
ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nTabCount, bool bFromFile ) ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nTabCount, bool bFromFile )
: ModalDialog(pParent, "InsertSheetDialog", "modules/scalc/ui/insertsheet.ui")
: ModalDialog ( pParent, ScResId( RID_SCDLG_INSERT_TABLE ) ), , rViewData(rData)
// , rDoc(*rData.GetDocument())
aFlPos ( this, ScResId( FL_POSITION ) ), , pDocShTables(NULL)
aBtnBefore ( this, ScResId( RB_BEFORE ) ), , pDocInserter(NULL)
aBtnBehind ( this, ScResId( RB_BEHIND ) ), , bMustClose(false)
aFlTable ( this, ScResId( FL_TABLE ) ), , nSelTabIndex(0)
aBtnNew ( this, ScResId( RB_NEW ) ), , nTableCount(nTabCount)
aBtnFromFile ( this, ScResId( RB_FROMFILE ) ),
aFtCount ( this, ScResId( FT_COUNT ) ),
aNfCount ( this, ScResId( NF_COUNT ) ),
aFtName ( this, ScResId( FT_NAME ) ),
aEdName ( this, ScResId( ED_TABNAME ) ),
aLbTables ( this, ScResId( LB_TABLES ) ),
aFtPath ( this, ScResId( FT_PATH ) ),
aBtnBrowse ( this, ScResId( BTN_BROWSE ) ),
aBtnLink ( this, ScResId( CB_LINK ) ),
aBtnOk ( this, ScResId( BTN_OK ) ),
aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
aBtnHelp ( this, ScResId( BTN_HELP ) ),
rViewData ( rData ),
rDoc ( *rData.GetDocument() ),
pDocShTables ( NULL ),
pDocInserter ( NULL ),
bMustClose ( false ),
nSelTabIndex ( 0 ),
nTableCount (nTabCount)
{ {
get(m_pBtnBefore, "before");
get(m_pBtnBehind, "after");
get(m_pBtnNew, "new");
get(m_pBtnFromFile, "fromfile");
get(m_pFtCount, "countft");
get(m_pNfCount, "countnf");
get(m_pFtName, "nameft");
get(m_pEdName, "nameed");
m_sSheetDotDotDot = m_pEdName->GetText();
get(m_pLbTables, "tables");
m_pLbTables->SetDropDownLineCount(8);
get(m_pFtPath, "path");
get(m_pBtnBrowse, "browse");
get(m_pBtnLink, "link");
get(m_pBtnOk, "ok");
Init_Impl( bFromFile ); Init_Impl( bFromFile );
FreeResource();
aLbTables.SetAccessibleName(aBtnFromFile.GetText());
} }
//------------------------------------------------------------------------ //------------------------------------------------------------------------
...@@ -91,46 +84,45 @@ ScInsertTableDlg::~ScInsertTableDlg() ...@@ -91,46 +84,45 @@ ScInsertTableDlg::~ScInsertTableDlg()
void ScInsertTableDlg::Init_Impl( bool bFromFile ) void ScInsertTableDlg::Init_Impl( bool bFromFile )
{ {
aBtnBrowse .SetClickHdl( LINK( this, ScInsertTableDlg, BrowseHdl_Impl ) ); m_pLbTables->EnableMultiSelection(true);
aBtnNew .SetClickHdl( LINK( this, ScInsertTableDlg, ChoiceHdl_Impl ) ); m_pBtnBrowse->SetClickHdl( LINK( this, ScInsertTableDlg, BrowseHdl_Impl ) );
aBtnFromFile .SetClickHdl( LINK( this, ScInsertTableDlg, ChoiceHdl_Impl ) ); m_pBtnNew->SetClickHdl( LINK( this, ScInsertTableDlg, ChoiceHdl_Impl ) );
aLbTables .SetSelectHdl( LINK( this, ScInsertTableDlg, SelectHdl_Impl ) ); m_pBtnFromFile->SetClickHdl( LINK( this, ScInsertTableDlg, ChoiceHdl_Impl ) );
aNfCount .SetModifyHdl( LINK( this, ScInsertTableDlg, CountHdl_Impl)); m_pLbTables->SetSelectHdl( LINK( this, ScInsertTableDlg, SelectHdl_Impl ) );
aBtnOk .SetClickHdl( LINK( this, ScInsertTableDlg, DoEnterHdl )); m_pNfCount->SetModifyHdl( LINK( this, ScInsertTableDlg, CountHdl_Impl));
aBtnBefore.Check(); m_pBtnOk->SetClickHdl( LINK( this, ScInsertTableDlg, DoEnterHdl ));
m_pBtnBefore->Check();
aNfCount.SetText( String::CreateFromInt32(nTableCount) );
aNfCount.SetMax( MAXTAB - rDoc.GetTableCount() + 1 ); m_pNfCount->SetText( String::CreateFromInt32(nTableCount) );
m_pNfCount->SetMax( MAXTAB - rDoc.GetTableCount() + 1 );
if(nTableCount==1) if(nTableCount==1)
{ {
rtl::OUString aName; rtl::OUString aName;
rDoc.CreateValidTabName( aName ); rDoc.CreateValidTabName( aName );
aEdName.SetText( aName ); m_pEdName->SetText( aName );
} }
else else
{ {
String aName=aFlTable.GetText(); m_pEdName->SetText(m_sSheetDotDotDot);
aName.AppendAscii(RTL_CONSTASCII_STRINGPARAM("...")); m_pFtName->Disable();
aEdName.SetText( aName ); m_pEdName->Disable();
aFtName.Disable();
aEdName.Disable();
} }
bool bShared = ( rViewData.GetDocShell() ? rViewData.GetDocShell()->IsDocShared() : false ); bool bShared = ( rViewData.GetDocShell() ? rViewData.GetDocShell()->IsDocShared() : false );
if ( !bFromFile || bShared ) if ( !bFromFile || bShared )
{ {
aBtnNew.Check(); m_pBtnNew->Check();
SetNewTable_Impl(); SetNewTable_Impl();
if ( bShared ) if ( bShared )
{ {
aBtnFromFile.Disable(); m_pBtnFromFile->Disable();
} }
} }
else else
{ {
aBtnFromFile.Check(); m_pBtnFromFile->Check();
SetFromTo_Impl(); SetFromTo_Impl();
aBrowseTimer.SetTimeoutHdl( LINK( this, ScInsertTableDlg, BrowseTimeoutHdl ) ); aBrowseTimer.SetTimeoutHdl( LINK( this, ScInsertTableDlg, BrowseTimeoutHdl ) );
...@@ -146,7 +138,7 @@ short ScInsertTableDlg::Execute() ...@@ -146,7 +138,7 @@ short ScInsertTableDlg::Execute()
Window* pOldDefParent = Application::GetDefDialogParent(); Window* pOldDefParent = Application::GetDefDialogParent();
Application::SetDefDialogParent( this ); Application::SetDefDialogParent( this );
if ( aBtnFromFile.IsChecked() ) if ( m_pBtnFromFile->IsChecked() )
aBrowseTimer.Start(); aBrowseTimer.Start();
short nRet = ModalDialog::Execute(); short nRet = ModalDialog::Execute();
...@@ -158,19 +150,19 @@ short ScInsertTableDlg::Execute() ...@@ -158,19 +150,19 @@ short ScInsertTableDlg::Execute()
void ScInsertTableDlg::SetNewTable_Impl() void ScInsertTableDlg::SetNewTable_Impl()
{ {
if (aBtnNew.IsChecked() ) if (m_pBtnNew->IsChecked() )
{ {
aNfCount .Enable(); m_pNfCount->Enable();
aFtCount .Enable(); m_pFtCount->Enable();
aLbTables .Disable(); m_pLbTables->Disable();
aFtPath .Disable(); m_pFtPath->Disable();
aBtnBrowse .Disable(); m_pBtnBrowse->Disable();
aBtnLink .Disable(); m_pBtnLink->Disable();
if(nTableCount==1) if(nTableCount==1)
{ {
aEdName.Enable(); m_pEdName->Enable();
aFtName.Enable(); m_pFtName->Enable();
} }
} }
} }
...@@ -179,16 +171,16 @@ void ScInsertTableDlg::SetNewTable_Impl() ...@@ -179,16 +171,16 @@ void ScInsertTableDlg::SetNewTable_Impl()
void ScInsertTableDlg::SetFromTo_Impl() void ScInsertTableDlg::SetFromTo_Impl()
{ {
if (aBtnFromFile.IsChecked() ) if (m_pBtnFromFile->IsChecked() )
{ {
aEdName .Disable(); m_pEdName->Disable();
aFtName .Disable(); m_pFtName->Disable();
aFtCount .Disable(); m_pFtCount->Disable();
aNfCount .Disable(); m_pNfCount->Disable();
aLbTables .Enable(); m_pLbTables->Enable();
aFtPath .Enable(); m_pFtPath->Enable();
aBtnBrowse .Enable(); m_pBtnBrowse->Enable();
aBtnLink .Enable(); m_pBtnLink->Enable();
} }
} }
...@@ -196,8 +188,8 @@ void ScInsertTableDlg::SetFromTo_Impl() ...@@ -196,8 +188,8 @@ void ScInsertTableDlg::SetFromTo_Impl()
void ScInsertTableDlg::FillTables_Impl( ScDocument* pSrcDoc ) void ScInsertTableDlg::FillTables_Impl( ScDocument* pSrcDoc )
{ {
aLbTables.SetUpdateMode( false ); m_pLbTables->SetUpdateMode( false );
aLbTables.Clear(); m_pLbTables->Clear();
if ( pSrcDoc ) if ( pSrcDoc )
{ {
...@@ -207,14 +199,14 @@ void ScInsertTableDlg::FillTables_Impl( ScDocument* pSrcDoc ) ...@@ -207,14 +199,14 @@ void ScInsertTableDlg::FillTables_Impl( ScDocument* pSrcDoc )
for ( SCTAB i=0; i<nCount; i++ ) for ( SCTAB i=0; i<nCount; i++ )
{ {
pSrcDoc->GetName( i, aName ); pSrcDoc->GetName( i, aName );
aLbTables.InsertEntry( aName ); m_pLbTables->InsertEntry( aName );
} }
} }
aLbTables.SetUpdateMode( sal_True ); m_pLbTables->SetUpdateMode( sal_True );
if(aLbTables.GetEntryCount()==1) if(m_pLbTables->GetEntryCount()==1)
aLbTables.SelectEntryPos(0); m_pLbTables->SelectEntryPos(0);
} }
//------------------------------------------------------------------------ //------------------------------------------------------------------------
...@@ -223,17 +215,17 @@ const String* ScInsertTableDlg::GetFirstTable( sal_uInt16* pN ) ...@@ -223,17 +215,17 @@ const String* ScInsertTableDlg::GetFirstTable( sal_uInt16* pN )
{ {
const String* pStr = NULL; const String* pStr = NULL;
if ( aBtnNew.IsChecked() ) if ( m_pBtnNew->IsChecked() )
{ {
aStrCurSelTable = aEdName.GetText(); aStrCurSelTable = m_pEdName->GetText();
pStr = &aStrCurSelTable; pStr = &aStrCurSelTable;
} }
else if ( nSelTabIndex < aLbTables.GetSelectEntryCount() ) else if ( nSelTabIndex < m_pLbTables->GetSelectEntryCount() )
{ {
aStrCurSelTable = aLbTables.GetSelectEntry( 0 ); aStrCurSelTable = m_pLbTables->GetSelectEntry( 0 );
pStr = &aStrCurSelTable; pStr = &aStrCurSelTable;
if ( pN ) if ( pN )
*pN = aLbTables.GetSelectEntryPos( 0 ); *pN = m_pLbTables->GetSelectEntryPos( 0 );
nSelTabIndex = 1; nSelTabIndex = 1;
} }
...@@ -246,12 +238,12 @@ const String* ScInsertTableDlg::GetNextTable( sal_uInt16* pN ) ...@@ -246,12 +238,12 @@ const String* ScInsertTableDlg::GetNextTable( sal_uInt16* pN )
{ {
const String* pStr = NULL; const String* pStr = NULL;
if ( !aBtnNew.IsChecked() && nSelTabIndex < aLbTables.GetSelectEntryCount() ) if ( !m_pBtnNew->IsChecked() && nSelTabIndex < m_pLbTables->GetSelectEntryCount() )
{ {
aStrCurSelTable = aLbTables.GetSelectEntry( nSelTabIndex ); aStrCurSelTable = m_pLbTables->GetSelectEntry( nSelTabIndex );
pStr = &aStrCurSelTable; pStr = &aStrCurSelTable;
if ( pN ) if ( pN )
*pN = aLbTables.GetSelectEntryPos( nSelTabIndex ); *pN = m_pLbTables->GetSelectEntryPos( nSelTabIndex );
nSelTabIndex++; nSelTabIndex++;
} }
...@@ -265,22 +257,20 @@ const String* ScInsertTableDlg::GetNextTable( sal_uInt16* pN ) ...@@ -265,22 +257,20 @@ const String* ScInsertTableDlg::GetNextTable( sal_uInt16* pN )
IMPL_LINK_NOARG(ScInsertTableDlg, CountHdl_Impl) IMPL_LINK_NOARG(ScInsertTableDlg, CountHdl_Impl)
{ {
nTableCount = static_cast<SCTAB>(aNfCount.GetValue()); nTableCount = static_cast<SCTAB>(m_pNfCount->GetValue());
if ( nTableCount==1) if ( nTableCount==1)
{ {
rtl::OUString aName; rtl::OUString aName;
rDoc.CreateValidTabName( aName ); rDoc.CreateValidTabName( aName );
aEdName.SetText( aName ); m_pEdName->SetText( aName );
aFtName.Enable(); m_pFtName->Enable();
aEdName.Enable(); m_pEdName->Enable();
} }
else else
{ {
String aName=aFlTable.GetText(); m_pEdName->SetText(m_sSheetDotDotDot);
aName.AppendAscii(RTL_CONSTASCII_STRINGPARAM("...")); m_pFtName->Disable();
aEdName.SetText( aName ); m_pEdName->Disable();
aFtName.Disable();
aEdName.Disable();
} }
DoEnable_Impl(); DoEnable_Impl();
...@@ -290,7 +280,7 @@ IMPL_LINK_NOARG(ScInsertTableDlg, CountHdl_Impl) ...@@ -290,7 +280,7 @@ IMPL_LINK_NOARG(ScInsertTableDlg, CountHdl_Impl)
//------------------------------------------------------------------------ //------------------------------------------------------------------------
IMPL_LINK_NOARG(ScInsertTableDlg, ChoiceHdl_Impl) IMPL_LINK_NOARG(ScInsertTableDlg, ChoiceHdl_Impl)
{ {
if ( aBtnNew.IsChecked() ) if ( m_pBtnNew->IsChecked() )
SetNewTable_Impl(); SetNewTable_Impl();
else else
SetFromTo_Impl(); SetFromTo_Impl();
...@@ -323,15 +313,15 @@ IMPL_LINK_NOARG(ScInsertTableDlg, SelectHdl_Impl) ...@@ -323,15 +313,15 @@ IMPL_LINK_NOARG(ScInsertTableDlg, SelectHdl_Impl)
void ScInsertTableDlg::DoEnable_Impl() void ScInsertTableDlg::DoEnable_Impl()
{ {
if ( aBtnNew.IsChecked() || ( pDocShTables && aLbTables.GetSelectEntryCount() ) ) if ( m_pBtnNew->IsChecked() || ( pDocShTables && m_pLbTables->GetSelectEntryCount() ) )
aBtnOk.Enable(); m_pBtnOk->Enable();
else else
aBtnOk.Disable(); m_pBtnOk->Disable();
} }
IMPL_LINK_NOARG(ScInsertTableDlg, DoEnterHdl) IMPL_LINK_NOARG(ScInsertTableDlg, DoEnterHdl)
{ {
if(nTableCount > 1 || rDoc.ValidTabName(aEdName.GetText())) if(nTableCount > 1 || rDoc.ValidTabName(m_pEdName->GetText()))
{ {
EndDialog(RET_OK); EndDialog(RET_OK);
} }
...@@ -346,7 +336,7 @@ IMPL_LINK_NOARG(ScInsertTableDlg, DoEnterHdl) ...@@ -346,7 +336,7 @@ IMPL_LINK_NOARG(ScInsertTableDlg, DoEnterHdl)
IMPL_LINK_NOARG(ScInsertTableDlg, BrowseTimeoutHdl) IMPL_LINK_NOARG(ScInsertTableDlg, BrowseTimeoutHdl)
{ {
bMustClose = true; bMustClose = true;
BrowseHdl_Impl( &aBtnBrowse ); BrowseHdl_Impl(m_pBtnBrowse);
return 0; return 0;
} }
...@@ -380,7 +370,7 @@ IMPL_LINK( ScInsertTableDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg ...@@ -380,7 +370,7 @@ IMPL_LINK( ScInsertTableDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg
if ( !pDocShTables->GetError() ) // nur Errors if ( !pDocShTables->GetError() ) // nur Errors
{ {
FillTables_Impl( pDocShTables->GetDocument() ); FillTables_Impl( pDocShTables->GetDocument() );
aFtPath.SetText( pDocShTables->GetTitle( SFX_TITLE_FULLNAME ) ); m_pFtPath->SetText( pDocShTables->GetTitle( SFX_TITLE_FULLNAME ) );
} }
else else
{ {
...@@ -389,7 +379,7 @@ IMPL_LINK( ScInsertTableDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg ...@@ -389,7 +379,7 @@ IMPL_LINK( ScInsertTableDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg
pDocShTables = NULL; pDocShTables = NULL;
FillTables_Impl( NULL ); FillTables_Impl( NULL );
aFtPath.SetText( EMPTY_STRING ); m_pFtPath->SetText( EMPTY_STRING );
} }
} }
......
sc/source/ui/miscdlgs/instbdlg.src deleted 100644 → 0
Dosyayı görüntüle @ 4f8c28de
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "instbdlg.hrc"
ModalDialog RID_SCDLG_INSERT_TABLE
{
HelpID = "sc:ModalDialog:RID_SCDLG_INSERT_TABLE";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 274 , 190 ) ;
Text [ en-US ] = "Insert Sheet" ;
Moveable = TRUE ;
Closeable = TRUE ;
OKButton BTN_OK
{
Pos = MAP_APPFONT ( 218 , 6 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
DefButton = TRUE ;
};
CancelButton BTN_CANCEL
{
Pos = MAP_APPFONT ( 218 , 23 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
};
HelpButton BTN_HELP
{
Pos = MAP_APPFONT ( 218 , 43 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
};
FixedLine FL_POSITION
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 206 , 8 ) ;
Text [ en-US ] = "Position" ;
};
RadioButton RB_BEFORE
{
HelpID = "sc:RadioButton:RID_SCDLG_INSERT_TABLE:RB_BEFORE";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 197 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "B~efore current sheet" ;
};
RadioButton RB_BEHIND
{
HelpID = "sc:RadioButton:RID_SCDLG_INSERT_TABLE:RB_BEHIND";
Pos = MAP_APPFONT ( 12 , 28 ) ;
Size = MAP_APPFONT ( 197 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "~After current sheet" ;
};
FixedLine FL_TABLE
{
Pos = MAP_APPFONT ( 6 , 44 ) ;
Size = MAP_APPFONT ( 206 , 8 ) ;
Text [ en-US ] = "Sheet" ;
};
RadioButton RB_NEW
{
HelpID = "sc:RadioButton:RID_SCDLG_INSERT_TABLE:RB_NEW";
Pos = MAP_APPFONT ( 12 , 55 ) ;
Size = MAP_APPFONT ( 197 , 10 ) ;
Text [ en-US ] = "~New sheet" ;
};
FixedText FT_COUNT
{
Pos = MAP_APPFONT ( 20 , 68 ) ;
Size = MAP_APPFONT ( 52 , 8 ) ;
Text [ en-US ] = "N~o. of sheets" ;
};
NumericField NF_COUNT
{
HelpID = "sc:NumericField:RID_SCDLG_INSERT_TABLE:NF_COUNT";
Border = TRUE ;
Pos = MAP_APPFONT ( 72 , 66 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
TabStop = TRUE ;
Spin = TRUE ;
SpinSize = 1 ;
Repeat = TRUE ;
Minimum = 1 ;
Maximum = 256 ;
};
FixedText FT_NAME
{
Pos = MAP_APPFONT ( 20 , 84 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Text [ en-US ] = "Na~me";
};
Edit ED_TABNAME
{
HelpID = "sc:Edit:RID_SCDLG_INSERT_TABLE:ED_TABNAME";
Border = TRUE ;
Pos = MAP_APPFONT ( 72 , 82 ) ;
Size = MAP_APPFONT ( 137 , 12 ) ;
};
RadioButton RB_FROMFILE
{
HelpID = "sc:RadioButton:RID_SCDLG_INSERT_TABLE:RB_FROMFILE";
Pos = MAP_APPFONT ( 12 , 100 ) ;
Size = MAP_APPFONT ( 197 , 10 ) ;
Text [ en-US ] = "~From file" ;
};
MultiListBox LB_TABLES
{
HelpID = "sc:MultiListBox:RID_SCDLG_INSERT_TABLE:LB_TABLES";
SimpleMode = TRUE ;
Border = TRUE ;
Pos = MAP_APPFONT ( 20 , 113 ) ;
Size = MAP_APPFONT ( 123 , 59 ) ;
AutoHScroll = TRUE ;
};
PushButton BTN_BROWSE
{
HelpID = "sc:PushButton:RID_SCDLG_INSERT_TABLE:BTN_BROWSE";
Pos = MAP_APPFONT ( 149 , 113 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "~Browse..." ;
};
CheckBox CB_LINK
{
HelpID = "sc:CheckBox:RID_SCDLG_INSERT_TABLE:CB_LINK";
Pos = MAP_APPFONT ( 149 , 131 ) ;
Size = MAP_APPFONT ( 60 , 10 ) ;
Text [ en-US ] = "Lin~k" ;
};
FixedText FT_PATH
{
Pos = MAP_APPFONT ( 20 , 176 ) ;
Size = MAP_APPFONT ( 192 , 8 ) ;
};
};
sc/source/ui/view/tabvwshf.cxx
Dosyayı görüntüle @ db679c57
...@@ -221,9 +221,8 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) ...@@ -221,9 +221,8 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
AbstractScInsertTableDlg* pDlg = pFact->CreateScInsertTableDlg( GetDialogParent(), *pViewData, AbstractScInsertTableDlg* pDlg = pFact->CreateScInsertTableDlg(GetDialogParent(), *pViewData,
nTabSelCount, nSlot == FID_INS_TABLE_EXT, nTabSelCount, nSlot == FID_INS_TABLE_EXT);
RID_SCDLG_INSERT_TABLE);
OSL_ENSURE(pDlg, "Dialog create fail!"); OSL_ENSURE(pDlg, "Dialog create fail!");
if ( RET_OK == pDlg->Execute() ) if ( RET_OK == pDlg->Execute() )
{ {
......
sc/uiconfig/scalc/ui/insertsheet.ui
Dosyayı görüntüle @ db679c57
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<!-- interface-requires gtk+ 3.0 --> <!-- interface-requires gtk+ 3.0 -->
<object class="GtkAction" id="action1"/> <object class="GtkAdjustment" id="adjustment1">
<object class="GtkDialog" id="Insert Sheet"> <property name="lower">1</property>
<property name="upper">256</property>
<property name="value">1</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkDialog" id="InsertSheetDialog">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="border_width">5</property> <property name="border_width">6</property>
<property name="title" translatable="yes">Insert Sheet</property>
<property name="type_hint">dialog</property> <property name="type_hint">dialog</property>
<child internal-child="vbox"> <child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1"> <object class="GtkBox" id="dialog-vbox1">
...@@ -20,6 +27,8 @@ ...@@ -20,6 +27,8 @@
<property name="label">gtk-ok</property> <property name="label">gtk-ok</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">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="receives_default">True</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
</object> </object>
...@@ -70,16 +79,19 @@ ...@@ -70,16 +79,19 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child> <child>
<object class="GtkFrame" id="frame1"> <object class="GtkFrame" id="frame1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="label_xalign">0</property> <property name="label_xalign">0</property>
<property name="shadow_type">none</property> <property name="shadow_type">none</property>
<child> <child>
<object class="GtkAlignment" id="alignment1"> <object class="GtkAlignment" id="alignment1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property> <property name="left_padding">12</property>
<child> <child>
<object class="GtkBox" id="box2"> <object class="GtkBox" id="box2">
...@@ -88,14 +100,16 @@ ...@@ -88,14 +100,16 @@
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkRadioButton" id="radiobutton1"> <object class="GtkRadioButton" id="before">
<property name="label" translatable="yes">B_efore current sheet</property> <property name="label" translatable="yes">B_efore current sheet</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">after</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -104,7 +118,7 @@ ...@@ -104,7 +118,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkRadioButton" id="radiobutton2"> <object class="GtkRadioButton" id="after">
<property name="label" translatable="yes">_After current sheet</property> <property name="label" translatable="yes">_After current sheet</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
...@@ -112,6 +126,7 @@ ...@@ -112,6 +126,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">before</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -128,6 +143,9 @@ ...@@ -128,6 +143,9 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">Position</property> <property name="label" translatable="yes">Position</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object> </object>
</child> </child>
</object> </object>
...@@ -141,33 +159,44 @@ ...@@ -141,33 +159,44 @@
<object class="GtkFrame" id="frame2"> <object class="GtkFrame" id="frame2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="label_xalign">0</property> <property name="label_xalign">0</property>
<property name="shadow_type">none</property> <property name="shadow_type">none</property>
<child> <child>
<object class="GtkAlignment" id="alignment2"> <object class="GtkAlignment" id="alignment2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property> <property name="left_padding">12</property>
<child> <child>
<object class="GtkBox" id="box3"> <object class="GtkBox" id="box3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkBox" id="box4"> <object class="GtkBox" id="box4">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child> <child>
<object class="GtkRadioButton" id="radiobutton3"> <object class="GtkRadioButton" id="new">
<property name="label" translatable="yes">_New sheet</property> <property name="label" translatable="yes">_New sheet</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">fromfile</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -176,71 +205,84 @@ ...@@ -176,71 +205,84 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkGrid" id="grid1"> <object class="GtkAlignment" id="alignment3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="row_spacing">6</property> <property name="hexpand">True</property>
<property name="column_spacing">6</property> <property name="left_padding">12</property>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">N_o. of sheets</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child> <child>
<object class="GtkLabel" id="label4"> <object class="GtkGrid" id="grid1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property> <property name="hexpand">True</property>
<property name="label" translatable="yes">Na_me</property> <property name="row_spacing">6</property>
<property name="use_underline">True</property> <property name="column_spacing">12</property>
</object> <child>
<packing> <object class="GtkLabel" id="countft">
<property name="left_attach">0</property> <property name="visible">True</property>
<property name="top_attach">1</property> <property name="can_focus">False</property>
<property name="width">1</property> <property name="xalign">0</property>
<property name="height">1</property> <property name="label" translatable="yes">N_o. of sheets:</property>
</packing> <property name="use_underline">True</property>
</child> </object>
<child> <packing>
<object class="GtkSpinButton" id="spinbutton1"> <property name="left_attach">0</property>
<property name="visible">True</property> <property name="top_attach">0</property>
<property name="can_focus">True</property> <property name="width">1</property>
<property name="invisible_char">•</property> <property name="height">1</property>
</object> </packing>
<packing> </child>
<property name="left_attach">1</property> <child>
<property name="top_attach">0</property> <object class="GtkLabel" id="nameft">
<property name="width">1</property> <property name="visible">True</property>
<property name="height">1</property> <property name="can_focus">False</property>
</packing> <property name="xalign">0</property>
</child> <property name="label" translatable="yes">Na_me:</property>
<child> <property name="use_underline">True</property>
<object class="GtkEntry" id="entry1"> </object>
<property name="visible">True</property> <packing>
<property name="can_focus">True</property> <property name="left_attach">0</property>
<property name="invisible_char">•</property> <property name="top_attach">1</property>
<property name="text" translatable="yes">Sheet2</property> <property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="countnf">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">start</property>
<property name="invisible_char">•</property>
<property name="adjustment">adjustment1</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="nameed">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
<property name="width_chars">52</property>
<property name="text" translatable="yes">Sheet...</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object> </object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
...@@ -256,10 +298,12 @@ ...@@ -256,10 +298,12 @@
<object class="GtkBox" id="box5"> <object class="GtkBox" id="box5">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkRadioButton" id="radiobutton4"> <object class="GtkRadioButton" id="fromfile">
<property name="label" translatable="yes">_From file</property> <property name="label" translatable="yes">_From file</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
...@@ -267,6 +311,7 @@ ...@@ -267,6 +311,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">new</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -275,67 +320,112 @@ ...@@ -275,67 +320,112 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkBox" id="box6"> <object class="GtkAlignment" id="alignment4">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="spacing">6</property> <property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="left_padding">12</property>
<child> <child>
<object class="GtkScrolledWindow" id="scrolledwindow1"> <object class="GtkGrid" id="grid2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">False</property>
<property name="shadow_type">in</property> <property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child> <child>
<placeholder/> <object class="GtkLabel" id="path">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</child> </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="box7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child> <child>
<object class="GtkButton" id="button1"> <object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="label" translatable="yes">_Browse...</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="hexpand">True</property>
<property name="use_underline">True</property> <property name="vexpand">True</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="tables">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="tables-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Tables in file</property>
</object>
</child>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection1">
<property name="mode">multiple</property>
</object>
</child>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="left_attach">0</property>
<property name="fill">True</property> <property name="top_attach">0</property>
<property name="position">0</property> <property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="checkbutton1"> <object class="GtkGrid" id="grid3">
<property name="label" translatable="yes">Lin_k</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">False</property>
<property name="receives_default">False</property> <property name="row_spacing">12</property>
<property name="use_underline">True</property> <child>
<property name="xalign">0</property> <object class="GtkButton" id="browse">
<property name="draw_indicator">True</property> <property name="label" translatable="yes">_Browse...</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="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="link">
<property name="label" translatable="yes">Lin_k</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="valign">start</property>
<property name="vexpand">True</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="left_attach">1</property>
<property name="fill">True</property> <property name="top_attach">0</property>
<property name="position">1</property> <property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child> </child>
</object> </object>
<packing> <packing>
...@@ -346,7 +436,7 @@ ...@@ -346,7 +436,7 @@
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
...@@ -360,6 +450,9 @@ ...@@ -360,6 +450,9 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">Sheet</property> <property name="label" translatable="yes">Sheet</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object> </object>
</child> </child>
</object> </object>
...@@ -371,7 +464,7 @@ ...@@ -371,7 +464,7 @@
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
......
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