sfx2/source/dialog/backingwindow.cxx | 322 ++--------------------------------- sfx2/source/dialog/backingwindow.hxx | 12 - sfx2/uiconfig/ui/startcenter.ui | 217 ----------------------- 3 files changed, 24 insertions(+), 527 deletions(-)
New commits: commit 2b3fe5ce075fa3633b42b913c11d42bc8d48c107 Author: Efe Gürkan YALAMAN <efeyala...@gmail.com> Date: Wed Jul 2 15:18:28 2014 +0300 Code Cleanup Some unneccesary code cleaned up. Change-Id: Iebc43ddc8276d5865c640b7fa955152a3361eb36 diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 8cc1f3a..daa5322 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -70,14 +70,14 @@ const char TEMPLATE_URL[] = "slot:5500"; const char OPEN_URL[] = ".uno:Open"; const char SERVICENAME_CFGREADACCESS[] = "com.sun.star.configuration.ConfigurationAccess"; -const char TEMPLATEBAR_SAVE[] = "template_save"; -const char TEMPLATEBAR_OPEN[] = "open"; -const char TEMPLATEBAR_EDIT[] = "edit"; -const char TEMPLATEBAR_PROPERTIES[] = "properties"; -const char TEMPLATEBAR_DEFAULT[] = "default"; -const char TEMPLATEBAR_MOVE[] = "move"; -const char TEMPLATEBAR_EXPORT[] = "export"; -const char TEMPLATEBAR_DELETE[] = "template_delete"; +//const char TEMPLATEBAR_SAVE[] = "template_save"; +//const char TEMPLATEBAR_OPEN[] = "open"; +//const char TEMPLATEBAR_EDIT[] = "edit"; +//const char TEMPLATEBAR_PROPERTIES[] = "properties"; +//const char TEMPLATEBAR_DEFAULT[] = "default"; +//const char TEMPLATEBAR_MOVE[] = "move"; +//const char TEMPLATEBAR_EXPORT[] = "export"; +//const char TEMPLATEBAR_DELETE[] = "template_delete"; const int nButtonsFontSize = 15; const Color aButtonsBackground(114, 168, 84); // TDF green @@ -123,8 +123,8 @@ BackingWindow::BackingWindow( Window* i_pParent ) : get(mpHelpButton, "help"); get(mpExtensionsButton, "extensions"); - get(mpViewBar, "action_view"); - get(mpTemplateBar, "action_templates"); + //get(mpViewBar, "action_view"); + //get(mpTemplateBar, "action_templates"); //Containers are invisible to cursor traversal //So on pressing "right" when in Help the @@ -279,21 +279,21 @@ void BackingWindow::initControls() mpCurrentView = mpLocalView; - mpViewBar->SetButtonType(BUTTON_SYMBOLTEXT); - mpViewBar->SetItemBits(mpViewBar->GetItemId("repository"), TIB_DROPDOWNONLY); + //mpViewBar->SetButtonType(BUTTON_SYMBOLTEXT); + //mpViewBar->SetItemBits(mpViewBar->GetItemId("repository"), TIB_DROPDOWNONLY); //mpViewBar->SetClickHdl(LINK(this,BackingWindow,TBXViewHdl)); //mpViewBar->SetDropdownClickHdl(LINK(this,BackingWindow,TBXDropdownHdl)); - mpViewBar->Hide(); - mpViewBar->HideItem("import"); + //mpViewBar->Hide(); + //mpViewBar->HideItem("import"); - mpTemplateBar->SetButtonType(BUTTON_SYMBOLTEXT); - mpTemplateBar->SetItemBits(mpTemplateBar->GetItemId(TEMPLATEBAR_MOVE), TIB_DROPDOWNONLY); + //mpTemplateBar->SetButtonType(BUTTON_SYMBOLTEXT); + //mpTemplateBar->SetItemBits(mpTemplateBar->GetItemId(TEMPLATEBAR_MOVE), TIB_DROPDOWNONLY); //mpTemplateBar->SetClickHdl( LINK( this, BackingWindow,TBXTemplateHdl ) ); //mpTemplateBar->SetDoubleClickHdl( LINK(this, BackingWindow, OpenTemplateHdl) ); //mpTemplateBar->SetDropdownClickHdl(LINK(this, BackingWindow,TBXDropdownHdl)); //set handlers - mpLocalView->setItemStateHdl(LINK(this, BackingWindow, TVItemStateHdl)); + //mpLocalView->setItemStateHdl(LINK(this, BackingWindow, TVItemStateHdl)); mpLocalView->setOpenRegionHdl(LINK(this, BackingWindow, OpenRegionHdl)); mpLocalView->setOpenTemplateHdl(LINK(this,BackingWindow,OpenTemplateHdl)); @@ -490,207 +490,6 @@ void BackingWindow::Resize() Invalidate(); } -//Editing related method -/* -void BackingWindow::OnTemplateImport () -{ - size_t nDialogType = - com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE; - - sfx2::FileDialogHelper aFileDlg(nDialogType, SFXWB_MULTISELECTION); - - // add "All" filter - aFileDlg.AddFilter( SfxResId(STR_SFX_FILTERNAME_ALL).toString(), - OUString(FILEDIALOG_FILTER_ALL) ); - - // add template filter - OUString sFilterExt; - OUString sFilterName( SfxResId( STR_TEMPLATE_FILTER ).toString() ); - - // add filters of modules which are installed - SvtModuleOptions aModuleOpt; - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) - sFilterExt += "*.ott;*.stw;*.oth"; - - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) ) - { - if ( !sFilterExt.isEmpty() ) - sFilterExt += ";"; - - sFilterExt += "*.ots;*.stc"; - } - - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) ) - { - if ( !sFilterExt.isEmpty() ) - sFilterExt += ";"; - - sFilterExt += "*.otp;*.sti"; - } - - if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) ) - { - if ( !sFilterExt.isEmpty() ) - sFilterExt += ";"; - - sFilterExt += "*.otg;*.std"; - - - if ( !sFilterExt.isEmpty() ) - sFilterExt += ";"; - - sFilterExt += "*.vor"; - - sFilterName += " ("; - sFilterName += sFilterExt; - sFilterName += ")"; - - aFileDlg.AddFilter( sFilterName, sFilterExt ); - aFileDlg.SetCurrentFilter( sFilterName ); - - ErrCode nCode = aFileDlg.Execute(); - - if ( nCode == ERRCODE_NONE ) - { - com::sun::star::uno::Sequence<OUString> aFiles = aFileDlg.GetSelectedFiles(); - - if (aFiles.hasElements()) - { - if (!maSelFolders.empty()) - { - //Import to the selected regions - std::set<const ThumbnailViewItem*,selection_cmp_fn>::const_iterator pIter; - for (pIter = maSelFolders.begin(); pIter != maSelFolders.end(); ++pIter) - { - OUString aTemplateList; - TemplateContainerItem *pFolder = (TemplateContainerItem*)(*pIter); - - for (size_t i = 0, n = aFiles.getLength(); i < n; ++i) - { - if(!mpLocalView->copyFrom(pFolder,aFiles[i])) - { - if (aTemplateList.isEmpty()) - aTemplateList = aFiles[i]; - else - aTemplateList = aTemplateList + "\n" + aFiles[i]; - } - } - - if (!aTemplateList.isEmpty()) - { - OUString aMsg(SfxResId(STR_MSG_ERROR_IMPORT).toString()); - aMsg = aMsg.replaceFirst("$1",pFolder->maTitle); - ErrorBox(this,WB_OK,aMsg.replaceFirst("$2",aTemplateList)); - } - } - } - else - { - //Import to current region - OUString aTemplateList; - for (size_t i = 0, n = aFiles.getLength(); i < n; ++i) - { - if(!mpLocalView->copyFrom(aFiles[i])) - { - if (aTemplateList.isEmpty()) - aTemplateList = aFiles[i]; - else - aTemplateList = aTemplateList + "\n" + aFiles[i]; - } - } - - if (!aTemplateList.isEmpty()) - { - OUString aMsg(SfxResId(STR_MSG_ERROR_IMPORT).toString()); - aMsg = aMsg.replaceFirst("$1",mpLocalView->getCurRegionName()); - ErrorBox(this,WB_OK,aMsg.replaceFirst("$2",aTemplateList)); - } - } - - mpLocalView->Invalidate(INVALIDATE_NOERASE); - } - } - } -}*/ - -//Editing related method -/*void BackingWindow::OnFolderDelete() -{ - QueryBox aQueryDlg(this, WB_YES_NO | WB_DEF_YES, SfxResId(STR_QMSG_SEL_FOLDER_DELETE).toString()); - - if ( aQueryDlg.Execute() == RET_NO ) - return; - - OUString aFolderList; - - std::set<const ThumbnailViewItem*,selection_cmp_fn>::const_iterator pIter; - std::set<const ThumbnailViewItem*,selection_cmp_fn> aSelFolders = maSelFolders; //Copy to avoid invalidating an iterator - - for (pIter = aSelFolders.begin(); pIter != aSelFolders.end(); ++pIter) - { - if (!mpLocalView->removeRegion((*pIter)->mnId)) - { - if (aFolderList.isEmpty()) - aFolderList = (*pIter)->maTitle; - else - aFolderList = aFolderList + "\n" + (*pIter)->maTitle; - - ++pIter; - if (pIter == aSelFolders.end()) - break; - } - } - - if (!aFolderList.isEmpty()) - { - OUString aMsg( SfxResId(STR_MSG_ERROR_DELETE_FOLDER).toString() ); - ErrorBox(this, WB_OK,aMsg.replaceFirst("$1",aFolderList)).Execute(); - } -}*/ - -//Editing related method -/*void BackingWindow::OnFolderNew() -{ - InputDialog dlg(SfxResId(STR_INPUT_NEW).toString(),this); - - int ret = dlg.Execute(); - - if (ret) - { - OUString aName = dlg.getEntryText(); - - mpCurrentView->createRegion(aName); - } -}*/ - - -// void BackingWindow::OnRegionState (const ThumbnailViewItem *pItem) -// { -// if (pItem->isSelected()) -// { -// if (maSelFolders.empty() && !mbIsSaveMode) -// { -// mpViewBar->ShowItem("import"); -// mpViewBar->ShowItem("delete"); -// mpViewBar->HideItem("new_folder"); -// } - -// maSelFolders.insert(pItem); -// } -// else -// { -// maSelFolders.erase(pItem); - -// if (maSelFolders.empty() && !mbIsSaveMode) -// { -// mpViewBar->HideItem("import"); -// mpViewBar->HideItem("delete"); -// mpViewBar->ShowItem("new_folder"); -// } -// } -// } - - IMPL_LINK(BackingWindow, ExtLinkClickHdl, Button*, pButton) { OUString aNode; @@ -770,40 +569,19 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton ) */ mpAllRecentThumbnails->Hide(); mpLocalView->Show(); - mpViewBar->Hide(); - mpViewBar->HideItem("import"); - mpViewBar->HideItem("delete"); - mpViewBar->HideItem("new_folder"); + //mpViewBar->Hide(); } return 0; } -IMPL_LINK_NOARG(BackingWindow, DoubleClickHdl) -{ - ThumbnailViewItem *pItem = const_cast<ThumbnailViewItem*>(*maSelTemplates.begin()); - OpenTemplateHdl(pItem); - return 0; -} - -//FIXME: Obvious enough IMPL_LINK_NOARG( BackingWindow, OpenRegionHdl) { maSelFolders.clear(); maSelTemplates.clear(); - - //mpViewBar->ShowItem("new_folder", mpCurrentView->isNestedRegionAllowed()); - - //if (!mbIsSaveMode) - // mpViewBar->ShowItem("import", mpCurrentView->isImportAllowed()); - - mpTemplateBar->Hide(); - mpViewBar->Hide(); - mpViewBar->HideItem("import"); - mpViewBar->HideItem("delete"); - mpViewBar->HideItem("new_folder"); - //mpActionBar->Show(); + //mpTemplateBar->Hide(); + //mpViewBar->Hide(); return 0; } @@ -840,66 +618,6 @@ IMPL_LINK(BackingWindow, OpenTemplateHdl, ThumbnailViewItem*, pItem) 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")) - { - if (mpCurrentView == mpLocalView) - OnFolderDelete(); - //else - ////OnRepositoryDelete(); - } - else if (nCurItemId == mpViewBar->GetItemId("new_folder")) - OnFolderNew(); - //else if (nCurItemId == mpViewBar->GetItemId("save")) - ////OnTemplateSaveAs(); - */ - //return 0; -//} - -//FIXME: Implement OnSomething() methods // might be deleted -IMPL_LINK_NOARG(BackingWindow,TBXTemplateHdl) -{ - //const size_t nCurItemId = mpTemplateBar->GetCurItemId(); - - //if (nCurItemId == mpTemplateBar->GetItemId(TEMPLATEBAR_OPEN)) - //OnTemplateOpen(); - //else if (nCurItemId == mpTemplateBar->GetItemId(TEMPLATEBAR_EDIT)) - //OnTemplateEdit(); - //else if (nCurItemId == mpTemplateBar->GetItemId(TEMPLATEBAR_PROPERTIES)) - //OnTemplateProperties(); - //else if (nCurItemId == mpTemplateBar->GetItemId(TEMPLATEBAR_DELETE)) - //OnTemplateDelete(); - //else if (nCurItemId == mpTemplateBar->GetItemId(TEMPLATEBAR_DEFAULT)) - //OnTemplateAsDefault(); - //else if (nCurItemId == mpTemplateBar->GetItemId(TEMPLATEBAR_EXPORT)) - //OnTemplateExport(); - - return 0; -} - - -IMPL_LINK(BackingWindow, TVItemStateHdl, const ThumbnailViewItem*, pItem) -{ - //const TemplateContainerItem *pCntItem = dynamic_cast<const TemplateContainerItem*>(pItem); - - //if (pCntItem) - //OnRegionState(pItem); - //else - //FIXME:Move this to here - //OnTemplateState(pItem); - - return 0; -} - - - - struct ImplDelayedDispatch { Reference< XDispatch > xDispatch; diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index 452ada2..c6cdade 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -85,8 +85,8 @@ class BackingWindow TemplateLocalView* mpLocalView; TemplateAbstractView* mpCurrentView; - ToolBox* mpViewBar; - ToolBox* mpTemplateBar; + //ToolBox* mpViewBar; + //ToolBox* mpTemplateBar; std::vector<Window*> maDndWindows; @@ -100,10 +100,6 @@ class BackingWindow void setupButton( PushButton* pButton ); //Template Manager void OnTemplateOpen (); - //void OnTemplateImport (); - //void OnFolderNew (); - //void OnFolderDelete (); - //void OnRegionState (const ThumbnailViewItem *pItem); void dispatchURL( const OUString& i_rURL, const OUString& i_rTarget = OUString( "_default" ), @@ -117,11 +113,7 @@ class BackingWindow DECL_LINK(ClickHdl, Button*); DECL_LINK(ExtLinkClickHdl, Button*); DECL_LINK(OpenRegionHdl, void*); - DECL_LINK(TBXViewHdl, void*); - DECL_LINK(TBXTemplateHdl, void*); - DECL_LINK(TVItemStateHdl, const ThumbnailViewItem*); DECL_LINK(OpenTemplateHdl, ThumbnailViewItem*); - DECL_LINK(DoubleClickHdl, void*); void initControls(); diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui index 33a1778..d37a21d 100644 --- a/sfx2/uiconfig/ui/startcenter.ui +++ b/sfx2/uiconfig/ui/startcenter.ui @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.0 on Sat Jun 14 02:47:36 2014 --> +<!-- Generated with glade 3.16.0 on Wed Jul 2 15:37:52 2014 --> <interface> - <!-- interface-requires gtk+ 3.0 --> <!-- interface-requires LibreOffice 1.0 --> + <!-- interface-requires gtk+ 3.0 --> <object class="GtkImage" id="calc_all_image"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -389,219 +389,6 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child> - <object class="GtkToolbar" id="action_view"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child> - <object class="GtkToolButton" id="repository"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">repository</property> - <property name="label" translatable="yes">Repository</property> - <property name="use_underline">True</property> - <property name="icon_name">sfx2/imglst/actionview026.png</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="import"> - <property name="can_focus">False</property> - <property name="action_name">import</property> - <property name="label" translatable="yes">Import</property> - <property name="use_underline">True</property> - <property name="icon_name">sfx2/imglst/actionview010.png</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="delete"> - <property name="can_focus">False</property> - <property name="action_name">delete</property> - <property name="label" translatable="yes">Delete</property> - <property name="use_underline">True</property> - <property name="icon_name">sfx2/imglst/actionview025.png</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="save"> - <property name="can_focus">False</property> - <property name="action_name">save</property> - <property name="label" translatable="yes">Save</property> - <property name="use_underline">True</property> - <property name="icon_name">sfx2/imglst/actionview028.png</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="new_folder"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">new_folder</property> - <property name="label" translatable="yes">New Folder</property> - <property name="use_underline">True</property> - <property name="icon_name">sfx2/imglst/actionview029.png</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkToolbar" id="action_templates"> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <child> - <object class="GtkToolButton" id="template_save"> - <property name="can_focus">False</property> - <property name="action_name">template_save</property> - <property name="label" translatable="yes">Save</property> - <property name="use_underline">True</property> - <property name="icon_name">sfx2/imglst/actionview028.png</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="open"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">open</property> - <property name="label" translatable="yes">Open</property> - <property name="use_underline">True</property> - <property name="icon_name">sfx2/imglst/actionview030.png</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="edit"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">edit</property> - <property name="label" translatable="yes">Edit</property> - <property name="use_underline">True</property> - <property name="icon_name">sfx2/imglst/actiontemplates019.png</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="properties"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">properties</property> - <property name="label" translatable="yes">Properties</property> - <property name="use_underline">True</property> - <property name="icon_name">sfx2/imglst/actiontemplates016.png</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="default"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">default</property> - <property name="label" translatable="yes">Set as Default</property> - <property name="use_underline">True</property> - <property name="icon_name">sfx2/imglst/actiontemplates015.png</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="move"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">move</property> - <property name="label" translatable="yes">Move to Folder</property> - <property name="use_underline">True</property> - <property name="icon_name">sfx2/imglst/actiontemplates017.png</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="export"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">export</property> - <property name="label" translatable="yes">Export</property> - <property name="use_underline">True</property> - <property name="icon_name">sfx2/imglst/actiontemplates020.png</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkToolButton" id="template_delete"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">template_delete</property> - <property name="label" translatable="yes">Delete</property> - <property name="use_underline">True</property> - <property name="icon_name">sfx2/imglst/actiontemplates018.png</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> <object class="sfxlo-RecentDocsView" id="all_recent"> <property name="visible">True</property> <property name="can_focus">True</property>
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits