Skip to content

C
core
Kaydet (Commit) 37bd2d2d authored tarafından Efe Gürkan YALAMAN's avatar Efe Gürkan YALAMAN Kaydeden (comit) Jan Holesovsky
Dosyalara gözat
Seçenekler

Selecting and opening templates implemented. 

All editing related code commented out. Code needs to be cleaned up.

Change-Id: Ibe901684d8747552b8ebeeea848c8f5e050ae726
üst c1f15930
Show whitespace changes
Inline Side-by-side
Showing with 109 additions and 53 deletions
sfx2/source/dialog/backingwindow.cxx
Dosyayı görüntüle @ 37bd2d2d
...@@ -282,18 +282,21 @@ void BackingWindow::initControls() ...@@ -282,18 +282,21 @@ void BackingWindow::initControls()
mpViewBar->SetButtonType(BUTTON_SYMBOLTEXT); mpViewBar->SetButtonType(BUTTON_SYMBOLTEXT);
mpViewBar->SetItemBits(mpViewBar->GetItemId("repository"), TIB_DROPDOWNONLY); mpViewBar->SetItemBits(mpViewBar->GetItemId("repository"), TIB_DROPDOWNONLY);
mpViewBar->SetClickHdl(LINK(this,BackingWindow,TBXViewHdl)); //mpViewBar->SetClickHdl(LINK(this,BackingWindow,TBXViewHdl));
//mpViewBar->SetDropdownClickHdl(LINK(this,BackingWindow,TBXDropdownHdl)); //mpViewBar->SetDropdownClickHdl(LINK(this,BackingWindow,TBXDropdownHdl));
mpViewBar->Hide(); mpViewBar->Hide();
mpViewBar->HideItem("import");
mpTemplateBar->SetButtonType(BUTTON_SYMBOLTEXT); mpTemplateBar->SetButtonType(BUTTON_SYMBOLTEXT);
mpTemplateBar->SetItemBits(mpTemplateBar->GetItemId(TEMPLATEBAR_MOVE), TIB_DROPDOWNONLY); mpTemplateBar->SetItemBits(mpTemplateBar->GetItemId(TEMPLATEBAR_MOVE), TIB_DROPDOWNONLY);
mpTemplateBar->SetClickHdl( LINK( this, BackingWindow,TBXTemplateHdl ) ); //mpTemplateBar->SetClickHdl( LINK( this, BackingWindow,TBXTemplateHdl ) );
//mpTemplateBar->SetDoubleClickHdl( LINK(this, BackingWindow, OpenTemplateHdl) );
//mpTemplateBar->SetDropdownClickHdl(LINK(this, BackingWindow,TBXDropdownHdl)); //mpTemplateBar->SetDropdownClickHdl(LINK(this, BackingWindow,TBXDropdownHdl));
//set handlers //set handlers
mpLocalView->setItemStateHdl(LINK(this, BackingWindow, TVItemStateHdl)); mpLocalView->setItemStateHdl(LINK(this, BackingWindow, TVItemStateHdl));
mpLocalView->setOpenRegionHdl(LINK(this, BackingWindow, OpenRegionHdl)); mpLocalView->setOpenRegionHdl(LINK(this, BackingWindow, OpenRegionHdl));
mpLocalView->setOpenTemplateHdl(LINK(this,BackingWindow,OpenTemplateHdl));
/*FIXME: Add other things for Local View /*FIXME: Add other things for Local View
*Filter and the bars*/ *Filter and the bars*/
...@@ -488,6 +491,8 @@ void BackingWindow::Resize() ...@@ -488,6 +491,8 @@ void BackingWindow::Resize()
Invalidate(); Invalidate();
} }
//Editing related method
/*
void BackingWindow::OnTemplateImport () void BackingWindow::OnTemplateImport ()
{ {
size_t nDialogType = size_t nDialogType =
...@@ -607,9 +612,10 @@ void BackingWindow::OnTemplateImport () ...@@ -607,9 +612,10 @@ void BackingWindow::OnTemplateImport ()
} }
} }
} }
} }*/
void BackingWindow::OnFolderDelete() //Editing related method
/*void BackingWindow::OnFolderDelete()
{ {
QueryBox aQueryDlg(this, WB_YES_NO | WB_DEF_YES, SfxResId(STR_QMSG_SEL_FOLDER_DELETE).toString()); QueryBox aQueryDlg(this, WB_YES_NO | WB_DEF_YES, SfxResId(STR_QMSG_SEL_FOLDER_DELETE).toString());
...@@ -641,10 +647,10 @@ void BackingWindow::OnFolderDelete() ...@@ -641,10 +647,10 @@ void BackingWindow::OnFolderDelete()
OUString aMsg( SfxResId(STR_MSG_ERROR_DELETE_FOLDER).toString() ); OUString aMsg( SfxResId(STR_MSG_ERROR_DELETE_FOLDER).toString() );
ErrorBox(this, WB_OK,aMsg.replaceFirst("$1",aFolderList)).Execute(); ErrorBox(this, WB_OK,aMsg.replaceFirst("$1",aFolderList)).Execute();
} }
} }*/
//Editing related method
void BackingWindow::OnFolderNew() /*void BackingWindow::OnFolderNew()
{ {
InputDialog dlg(SfxResId(STR_INPUT_NEW).toString(),this); InputDialog dlg(SfxResId(STR_INPUT_NEW).toString(),this);
...@@ -656,34 +662,34 @@ void BackingWindow::OnFolderNew() ...@@ -656,34 +662,34 @@ void BackingWindow::OnFolderNew()
mpCurrentView->createRegion(aName); mpCurrentView->createRegion(aName);
} }
} }*/
void BackingWindow::OnRegionState (const ThumbnailViewItem *pItem) // void BackingWindow::OnRegionState (const ThumbnailViewItem *pItem)
{ // {
if (pItem->isSelected()) // if (pItem->isSelected())
{ // {
if (maSelFolders.empty() && !mbIsSaveMode) // if (maSelFolders.empty() && !mbIsSaveMode)
{ // {
mpViewBar->ShowItem("import"); // mpViewBar->ShowItem("import");
mpViewBar->ShowItem("delete"); // mpViewBar->ShowItem("delete");
mpViewBar->HideItem("new_folder"); // mpViewBar->HideItem("new_folder");
} // }
maSelFolders.insert(pItem); // maSelFolders.insert(pItem);
} // }
else // else
{ // {
maSelFolders.erase(pItem); // maSelFolders.erase(pItem);
if (maSelFolders.empty() && !mbIsSaveMode) // if (maSelFolders.empty() && !mbIsSaveMode)
{ // {
mpViewBar->HideItem("import"); // mpViewBar->HideItem("import");
mpViewBar->HideItem("delete"); // mpViewBar->HideItem("delete");
mpViewBar->ShowItem("new_folder"); // mpViewBar->ShowItem("new_folder");
} // }
} // }
} // }
IMPL_LINK(BackingWindow, ExtLinkClickHdl, Button*, pButton) IMPL_LINK(BackingWindow, ExtLinkClickHdl, Button*, pButton)
...@@ -765,36 +771,83 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton ) ...@@ -765,36 +771,83 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
*/ */
mpAllRecentThumbnails->Hide(); mpAllRecentThumbnails->Hide();
mpLocalView->Show(); mpLocalView->Show();
mpViewBar->Show(); mpViewBar->Hide();
mpViewBar->HideItem("import");
mpViewBar->HideItem("delete");
mpViewBar->HideItem("new_folder");
} }
return 0; return 0;
} }
IMPL_LINK_NOARG(BackingWindow, DoubleClickHdl)
{
ThumbnailViewItem *pItem = const_cast<ThumbnailViewItem*>(*maSelTemplates.begin());
OpenTemplateHdl(pItem);
return 0;
}
//FIXME: Obvious enough //FIXME: Obvious enough
IMPL_LINK_NOARG( BackingWindow, OpenRegionHdl) IMPL_LINK_NOARG( BackingWindow, OpenRegionHdl)
{ {
maSelFolders.clear(); maSelFolders.clear();
maSelTemplates.clear(); maSelTemplates.clear();
mpViewBar->ShowItem("new_folder", mpCurrentView->isNestedRegionAllowed()); //mpViewBar->ShowItem("new_folder", mpCurrentView->isNestedRegionAllowed());
if (!mbIsSaveMode) //if (!mbIsSaveMode)
mpViewBar->ShowItem("import", mpCurrentView->isImportAllowed()); // mpViewBar->ShowItem("import", mpCurrentView->isImportAllowed());
//mpTemplateBar->Hide(); mpTemplateBar->Hide();
mpViewBar->Show(); mpViewBar->Hide();
mpViewBar->HideItem("import");
mpViewBar->HideItem("delete");
mpViewBar->HideItem("new_folder");
//mpActionBar->Show(); //mpActionBar->Show();
return 0; return 0;
} }
//FIXME: Implement OnSomething() methods //FIXME: Cleanup the code
IMPL_LINK_NOARG(BackingWindow,TBXViewHdl) IMPL_LINK(BackingWindow, OpenTemplateHdl, ThumbnailViewItem*, pItem)
{ {
const size_t nCurItemId = mpViewBar->GetCurItemId(); if (!mbIsSaveMode)
{
uno::Sequence< PropertyValue > aArgs(4);
aArgs[0].Name = "AsTemplate";
aArgs[0].Value <<= sal_True;
aArgs[1].Name = "MacroExecutionMode";
aArgs[1].Value <<= MacroExecMode::USE_CONFIG;
aArgs[2].Name = "UpdateDocMode";
aArgs[2].Value <<= UpdateDocMode::ACCORDING_TO_CONFIG;
aArgs[3].Name = "InteractionHandler";
aArgs[3].Value <<= task::InteractionHandler::createWithParent( ::comphelper::getProcessComponentContext(), 0 );
TemplateViewItem *pTemplateItem = static_cast<TemplateViewItem*>(pItem);
Reference< XDispatchProvider > xFrame( mxFrame, UNO_QUERY );
if (nCurItemId == mpViewBar->GetItemId("import")) try
OnTemplateImport(); {
dispatchURL( pTemplateItem->getPath(), "_default", xFrame, aArgs );
//mxDesktop->loadComponentFromURL(pTemplateItem->getPath(),"_default", 0, aArgs );
}
catch( const uno::Exception& )
{
}
}
return 0;
}
//FIXME: Implement OnSomething() methods
//IMPL_LINK_NOARG(BackingWindow,TBXViewHdl)
//{
// const size_t nCurItemId = mpViewBar->GetCurItemId();
/*//if (nCurItemId == mpViewBar->GetItemId("import"))
// OnTemplateImport();
else if (nCurItemId == mpViewBar->GetItemId("delete")) else if (nCurItemId == mpViewBar->GetItemId("delete"))
{ {
if (mpCurrentView == mpLocalView) if (mpCurrentView == mpLocalView)
...@@ -806,11 +859,11 @@ IMPL_LINK_NOARG(BackingWindow,TBXViewHdl) ...@@ -806,11 +859,11 @@ IMPL_LINK_NOARG(BackingWindow,TBXViewHdl)
OnFolderNew(); OnFolderNew();
//else if (nCurItemId == mpViewBar->GetItemId("save")) //else if (nCurItemId == mpViewBar->GetItemId("save"))
////OnTemplateSaveAs(); ////OnTemplateSaveAs();
*/
//return 0;
//}
return 0; //FIXME: Implement OnSomething() methods // might be deleted
}
//FIXME: Implement OnSomething() methods
IMPL_LINK_NOARG(BackingWindow,TBXTemplateHdl) IMPL_LINK_NOARG(BackingWindow,TBXTemplateHdl)
{ {
//const size_t nCurItemId = mpTemplateBar->GetCurItemId(); //const size_t nCurItemId = mpTemplateBar->GetCurItemId();
...@@ -834,10 +887,10 @@ IMPL_LINK_NOARG(BackingWindow,TBXTemplateHdl) ...@@ -834,10 +887,10 @@ IMPL_LINK_NOARG(BackingWindow,TBXTemplateHdl)
IMPL_LINK(BackingWindow, TVItemStateHdl, const ThumbnailViewItem*, pItem) IMPL_LINK(BackingWindow, TVItemStateHdl, const ThumbnailViewItem*, pItem)
{ {
const TemplateContainerItem *pCntItem = dynamic_cast<const TemplateContainerItem*>(pItem); //const TemplateContainerItem *pCntItem = dynamic_cast<const TemplateContainerItem*>(pItem);
if (pCntItem) //if (pCntItem)
OnRegionState(pItem); //OnRegionState(pItem);
//else //else
//FIXME:Move this to here //FIXME:Move this to here
//OnTemplateState(pItem); //OnTemplateState(pItem);
......
sfx2/source/dialog/backingwindow.hxx
Dosyayı görüntüle @ 37bd2d2d
...@@ -99,10 +99,11 @@ class BackingWindow ...@@ -99,10 +99,11 @@ class BackingWindow
void setupButton( PushButton* pButton ); void setupButton( PushButton* pButton );
//Template Manager //Template Manager
void OnTemplateImport (); void OnTemplateOpen ();
void OnFolderNew (); //void OnTemplateImport ();
void OnFolderDelete (); //void OnFolderNew ();
void OnRegionState (const ThumbnailViewItem *pItem); //void OnFolderDelete ();
//void OnRegionState (const ThumbnailViewItem *pItem);
void dispatchURL( const OUString& i_rURL, void dispatchURL( const OUString& i_rURL,
const OUString& i_rTarget = OUString( "_default" ), const OUString& i_rTarget = OUString( "_default" ),
...@@ -119,6 +120,8 @@ class BackingWindow ...@@ -119,6 +120,8 @@ class BackingWindow
DECL_LINK(TBXViewHdl, void*); DECL_LINK(TBXViewHdl, void*);
DECL_LINK(TBXTemplateHdl, void*); DECL_LINK(TBXTemplateHdl, void*);
DECL_LINK(TVItemStateHdl, const ThumbnailViewItem*); DECL_LINK(TVItemStateHdl, const ThumbnailViewItem*);
DECL_LINK(OpenTemplateHdl, ThumbnailViewItem*);
DECL_LINK(DoubleClickHdl, void*);
void initControls(); void initControls();
......
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