[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [labplot/histogram_chart] src: changed the name BarChartGraph to BarChartPlot
From:       Anu Mittal <anu22mittal () gmail ! com>
Date:       2016-06-08 12:28:31
Message-ID: E1bAcb1-0001Cn-0I () scm ! kde ! org
[Download RAW message or body]

Git commit fe8ff18d77e42a8546931411aff7254f6f9f2ff5 by Anu Mittal.
Committed on 06/06/2016 at 16:43.
Pushed by anumittal into branch 'histogram_chart'.

changed the name BarChartGraph to BarChartPlot

M  +1    -1    src/backend/worksheet/plots/cartesian/CartesianPlot.cpp
M  +5    -5    src/commonfrontend/worksheet/WorksheetView.cpp
M  +1    -1    src/commonfrontend/worksheet/WorksheetView.h

http://commits.kde.org/labplot/fe8ff18d77e42a8546931411aff7254f6f9f2ff5

diff --git a/src/backend/worksheet/plots/cartesian/CartesianPlot.cpp \
b/src/backend/worksheet/plots/cartesian/CartesianPlot.cpp index 5fc788a..243ef03 \
                100644
--- a/src/backend/worksheet/plots/cartesian/CartesianPlot.cpp
+++ b/src/backend/worksheet/plots/cartesian/CartesianPlot.cpp
@@ -373,7 +373,7 @@ void CartesianPlot::initActions(){
 	zoomOutXAction = new QAction(QIcon::fromTheme("labplot-zoom-out-x"), i18n("zoom out \
X"), this);  zoomInYAction = new QAction(QIcon::fromTheme("labplot-zoom-in-y"), \
i18n("zoom in Y"), this);  zoomOutYAction = new \
                QAction(QIcon::fromTheme("labplot-zoom-out-y"), i18n("zoom out Y"), \
                this);
-    shiftLeftXAction = new QAction(QIcon::fromTheme("labplot-shift-left-x"), \
i18n("shift left X"), this); +	shiftLeftXAction = new \
QAction(QIcon::fromTheme("labplot-shift-left-x"), i18n("shift left X"), this);  \
shiftRightXAction = new QAction(QIcon::fromTheme("labplot-shift-right-x"), \
i18n("shift right X"), this);  shiftUpYAction = new \
QAction(QIcon::fromTheme("labplot-shift-up-y"), i18n("shift up Y"), this);  \
shiftDownYAction = new QAction(QIcon::fromTheme("labplot-shift-down-y"), i18n("shift \
                down Y"), this);
diff --git a/src/commonfrontend/worksheet/WorksheetView.cpp \
b/src/commonfrontend/worksheet/WorksheetView.cpp index c7509de..1287465 100644
--- a/src/commonfrontend/worksheet/WorksheetView.cpp
+++ b/src/commonfrontend/worksheet/WorksheetView.cpp
@@ -195,7 +195,7 @@ void WorksheetView::initActions() {
 	addCartesianPlot3Action = new \
QAction(QIcon::fromTheme("labplot-xy-plot-two-axes-centered"), i18n("two axes, \
centered"), addNewActionGroup);  addCartesianPlot4Action = new \
QAction(QIcon::fromTheme("labplot-xy-plot-two-axes-centered-origin"), i18n("two axes, \
crossing at origin"), addNewActionGroup);  addTextLabelAction = new \
                QAction(QIcon::fromTheme("draw-text"), i18n("text label"), \
                addNewActionGroup);
-	addBarChartGraph= new QAction(QIcon::fromTheme("office-chart-line"), i18n("bar \
chart"), addNewActionGroup); +	addBarChartPlot= new \
QAction(QIcon::fromTheme("office-chart-line"), i18n("bar chart"), addNewActionGroup); \
addOrdinaryHistogram = new \
QAction(QIcon::fromTheme("labplot-xy-plot-two-axes"),i18n("Ordinary \
Histogram"),addHistogramType);  addCummulativeHistogram=new \
QAction(QIcon::fromTheme("labplot-xy-plot-two-axes"),i18n("Cummulative \
Histogram"),addHistogramType);  addAvgShiftedHistogram=new \
QAction(QIcon::fromTheme("labplot-xy-plot-two-axes"),i18n("Avg Shifted \
Histogram"),addHistogramType); @@ -241,7 +241,7 @@ void WorksheetView::initActions() \
{  
 	connect(addNewActionGroup, SIGNAL(triggered(QAction*)), this, \
SLOT(addNew(QAction*)));  connect(addHistogramType, SIGNAL(triggered(QAction*)), \
                this, SLOT(addHistogram(QAction*)));
-	connect(addBarChartGraph,SIGNAL(triggered(QAction*)), this, \
SLOT(addNew(QAction*))); +	connect(addBarChartPlot,SIGNAL(triggered(QAction*)), this, \
SLOT(addNew(QAction*)));  connect(mouseModeActionGroup, SIGNAL(triggered(QAction*)), \
this, SLOT(mouseModeChanged(QAction*)));  connect(zoomActionGroup, \
SIGNAL(triggered(QAction*)), this, SLOT(changeZoom(QAction*)));  \
connect(magnificationActionGroup, SIGNAL(triggered(QAction*)), this, \
SLOT(magnificationChanged(QAction*))); @@ -343,7 +343,7 @@ void \
WorksheetView::initMenus() {  \
m_addNewMenu->addMenu(m_addHistogramTypeMenu)->setIcon(QIcon::fromTheme("office-chart-line"));
  m_addNewMenu->addSeparator();
 	m_addNewMenu->addAction(addTextLabelAction);
-	m_addNewMenu->addAction(addBarChartGraph);
+	m_addNewMenu->addAction(addBarChartPlot);
 
 	m_viewMouseModeMenu = new QMenu(i18n("Mouse Mode"), this);
 	m_viewMouseModeMenu->setIcon(QIcon::fromTheme("input-mouse"));
@@ -1049,13 +1049,13 @@ void WorksheetView::addNew(QAction* action) {
 		l->setText(i18n("text label"));
 		aspect = l;
 	}
-	else if ( action == addBarChartGraph ) {
+	else if ( action == addBarChartPlot ) {
 		CartesianPlot* plot = new CartesianPlot(i18n("BarChart"));
 		plot->initDefault(CartesianPlot::TwoAxes);
 		plot->setMouseMode(m_cartesianPlotMouseMode);
 		aspect = plot;
 		if (tbNewCartesianPlot)
-			tbNewCartesianPlot->setDefaultAction(addBarChartGraph);
+			tbNewCartesianPlot->setDefaultAction(addBarChartPlot);
 	}
 
 	if (!aspect)
diff --git a/src/commonfrontend/worksheet/WorksheetView.h \
b/src/commonfrontend/worksheet/WorksheetView.h index 6b900f7..643e174 100644
--- a/src/commonfrontend/worksheet/WorksheetView.h
+++ b/src/commonfrontend/worksheet/WorksheetView.h
@@ -147,7 +147,7 @@ private:
 	QAction* addOrdinaryHistogram;
 	QAction* addCummulativeHistogram;
 	QAction* addAvgShiftedHistogram;
-	QAction* addBarChartGraph;
+	QAction* addBarChartPlot;
 
 	QAction* verticalLayoutAction;
 	QAction* horizontalLayoutAction;


[prev in list] [next in list] [prev in thread] [next in thread]