chart2/source/controller/dialogs/DataBrowser.cxx | 77 +
chart2/source/controller/dialogs/DataBrowser.hxx | 12
chart2/source/controller/dialogs/dlg_DataEditor.cxx| 30
chart2/source/controller/inc/dlg_DataEditor.hxx|6
chart2/uiconfig/ui/chartdatadialog.ui | 36
icon-themes/elementary/chart2/res/dataeditor_icon08.png|binary
icon-themes/elementary/chart2/res/dataeditor_icon09.png|binary
icon-themes/galaxy/chart2/res/dataeditor_icon08.png|binary
icon-themes/galaxy/chart2/res/dataeditor_icon09.png|binary
icon-themes/hicontrast/chart2/res/dataeditor_icon08.png|binary
icon-themes/hicontrast/chart2/res/dataeditor_icon09.png|binary
icon-themes/oxygen/chart2/res/dataeditor_icon08.png|binary
icon-themes/oxygen/chart2/res/dataeditor_icon09.png|binary
icon-themes/tango/chart2/res/dataeditor_icon08.png |binary
icon-themes/tango/chart2/res/dataeditor_icon09.png |binary
icon-themes/tango_testing/chart2/res/dataeditor_icon08.png |binary
icon-themes/tango_testing/chart2/res/dataeditor_icon08.svg | 769 +
icon-themes/tango_testing/chart2/res/dataeditor_icon09.png |binary
icon-themes/tango_testing/chart2/res/dataeditor_icon09.svg | 698 +++
19 files changed, 1604 insertions(+), 24 deletions(-)
New commits:
commit a631e0fe94830fff5b81b4e852d37a666a9f3b9e
Author: bansan85 <legarrec.vinc...@gmail.com>
Date: Wed Dec 21 02:27:04 2016 +0100
Add move column right and move row up in DataTable
Change-Id: Ib224a99636dfbb4451aa26263573af2f3d31b84a
Reviewed-on: https://gerrit.libreoffice.org/32265
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: jan iversen <j...@documentfoundation.org>
Tested-by: jan iversen <j...@documentfoundation.org>
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx
b/chart2/source/controller/dialogs/DataBrowser.cxx
index acf2195..8c7af15 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -497,7 +497,15 @@ bool DataBrowser::MayDeleteColumn() const
&& ( ColCount() > 2 );
}
-bool DataBrowser::MaySwapRows() const
+bool DataBrowser::MayMoveUpRows() const
+{
+return ! IsReadOnly()
+&& ( !lcl_SeriesHeaderHasFocus( m_aSeriesHeaders ))
+&& ( GetCurRow() > 0 )
+&& ( GetCurRow() <= GetRowCount() - 1 );
+}
+
+bool DataBrowser::MayMoveDownRows() const
{
return ! IsReadOnly()
&& ( !lcl_SeriesHeaderHasFocus( m_aSeriesHeaders ))
@@ -505,7 +513,24 @@ bool DataBrowser::MaySwapRows() const
&& ( GetCurRow() < GetRowCount() - 1 );
}
-bool DataBrowser::MaySwapColumns() const
+bool DataBrowser::MayMoveLeftColumns() const
+{
+// if a series header (except the last one) has the focus
+{
+sal_Int32 nColIndex(0);
+if( lcl_SeriesHeaderHasFocus( m_aSeriesHeaders, ))
+return (static_cast< sal_uInt32 >( nColIndex ) <=
(m_aSeriesHeaders.size() - 1)) && (static_cast< sal_uInt32 >( nColIndex ) != 0);
+}
+
+sal_Int32 nColIdx = lcl_getColumnInDataOrHeader( GetCurColumnId(),
m_aSeriesHeaders );
+return ! IsReadOnly()
+&& ( nColIdx > 1 )
+&& ( nColIdx <= ColCount() - 2 )
+&& m_apDataBrowserModel.get()
+&& !m_apDataBrowserModel->isCategoriesColumn( nColIdx );
+}
+
+bool DataBrowser::MayMoveRightColumns() const
{
// if a series header (except the last one) has the focus
{
@@ -901,7 +926,29 @@ void DataBrowser::RemoveRow()
}
}
-void DataBrowser::SwapColumn()
+void DataBrowser::MoveLeftColumn()
+{
+sal_Int32 nColIdx = lcl_getColumnInDataOrHeader( GetCurColumnId(),
m_aSeriesHeaders );
+
+if( nColIdx > 0 &&
+m_apDataBrowserModel.get())
+{
+// save changes made to edit-field
+if( IsModified() )
+SaveModified();
+
+m_apDataBrowserModel->swapDataSeries( nColIdx - 1 );
+
+// keep cursor in swapped column
+if(( 0 < GetCurColumnId() ) && ( GetCurColumnId() <= ColCount() - 1 ))
+{
+Dispatch( BROWSER_CURSORLEFT );
+}
+RenewTable();
+}
+}
+
+void DataBrowser::MoveRightColumn()
{
sal_Int32 nColIdx = lcl_getColumnInDataOrHeader( GetCurColumnId(),
m_aSeriesHeaders );
@@ -923,7 +970,29 @@ void DataBrowser::SwapColumn()
}
}
-void DataBrowser::SwapRow()
+void DataBrowser::MoveUpRow()
+{
+ sal_Int32 nRowIdx = lcl_getRowInData( GetCurRow());
+
+ if( nRowIdx > 0 &&
+m_apDataBrowserModel.get())
+{
+// save changes made to edit-field
+if( IsModified() )
+SaveModified();
+
+m_apDataBrowserModel->swapDataPointForAllSeries( nRowIdx - 1 );
+
+