Commit 8ebfdc7c authored by Fredrik Edemar's avatar Fredrik Edemar

* MainDlg::stopDrawing() is removed as View::stopDrawing() do the same thing.

* As we never use MainDlg::slotCleanWindow(), I'v decommented that function.
* Change the *iface.h-files so that the functions made for communication between KmPlot and MainDlg are placed first.

svn path=/trunk/kdeedu/kmplot/; revision=360753
parent 3595ecae
......@@ -225,7 +225,7 @@ bool MainDlg::checkModified()
}
return true;
}
/*
void MainDlg::slotCleanWindow()
{
if (m_readonly)
......@@ -234,7 +234,7 @@ void MainDlg::slotCleanWindow()
view->updateSliders();
view->drawPlot();
}
*/
void MainDlg::slotSave()
{
if ( !m_modified || m_readonly) //don't save if no changes are made or readonly is enabled
......@@ -724,12 +724,6 @@ void MainDlg::setReadOnlyStatusBarText(const QString &text)
setStatusBarText(text);
}
void MainDlg::stopDrawing()
{
view->stopDrawing();
}
void MainDlg::optionsConfigureKeys()
{
KApplication::kApplication()->dcopClient()->send(KApplication::kApplication()->dcopClient()->appId(), "KmPlotShell","optionsConfigureKeys()", QByteArray());
......
......@@ -84,7 +84,6 @@ public:
/// This class needs access to private members, too.
friend class BezWnd;
void stopDrawing();
/// Asks the user and returns true if modified data shall be dicarded.
bool checkModified();
/// Is set to true if a file from an old file format was loaded
......@@ -113,8 +112,8 @@ public slots:
void toggleShowSlider2();
void toggleShowSlider3();
///Implement the File -> New action by cleaning the plot area
void slotCleanWindow();
// ///I'm not sure it a delete-all-functions command is necessary
// void slotCleanWindow();
///Save a plot i.e. save the function name and all the settings for the plot
void slotSave();
///Save a plot and choose a name for it
......
......@@ -36,9 +36,9 @@ class MainDlgIface : virtual public DCOPObject
{
K_DCOP
k_dcop:
virtual void stopDrawing() = 0;
virtual bool isModified() = 0;
virtual bool checkModified() = 0;
virtual bool isModified() = 0;
virtual void editColors() = 0;
virtual void editAxes() = 0;
virtual void editScaling() = 0;
......@@ -51,7 +51,7 @@ k_dcop:
virtual void toggleShowSlider1() = 0;
virtual void toggleShowSlider2() = 0;
virtual void toggleShowSlider3() = 0;
virtual void slotCleanWindow() = 0;
// virtual void slotCleanWindow() = 0;
virtual void slotSave() = 0;
virtual void slotSaveas() = 0;
virtual void slotEditPlots() = 0;
......
......@@ -328,7 +328,7 @@ void KmPlot::setupStatusBar()
void KmPlot::progressbar_clicked()
{
kapp->dcopClient()->send(kapp->dcopClient()->appId(), "MainDlg","stopDrawing()", QByteArray());
kapp->dcopClient()->send(kapp->dcopClient()->appId(), "View","stopDrawing()", QByteArray());
}
#include "kmplot.moc"
......@@ -38,7 +38,6 @@ class KmPlotIface : virtual public DCOPObject
{
K_DCOP
k_dcop:
virtual void fileOpen(const KURL &url) = 0;
virtual void fileOpen() = 0;
virtual void setStatusBarText(const QString &text, int id) = 0;
virtual void optionsConfigureKeys() = 0;
......@@ -47,6 +46,8 @@ k_dcop:
virtual bool stopProgressBar() = 0;
virtual void startProgressBar(int) = 0;
virtual void increaseProgressBar() = 0;
virtual void fileOpen(const KURL &url) = 0;
};
......
......@@ -38,8 +38,9 @@ class ParserIface : virtual public DCOPObject
{
K_DCOP
k_dcop:
virtual int addFunction(const QString &f_str) = 0;
virtual bool addFunction(const QString &extstr, bool f_mode, bool f1_mode, bool f2_mode, bool integral_mode, bool integral_use_precision, int linewidth, int f1_linewidth, int f2_linewidth, int integral_linewidth, const QString &str_dmin, const QString &str_dmax, const QString &str_startx, const QString &str_starty, double integral_precision, QRgb color, QRgb f1_color, QRgb f2_color, QRgb integral_color, QStringList str_parameter, bool use_slider) = 0;
virtual int addFunction(const QString &f_str) = 0;
virtual bool delfkt(uint id) = 0;
virtual bool setFunctionExpression(const QString &f_str, uint id) = 0;
virtual uint countFunctions() = 0;
......@@ -75,6 +76,7 @@ k_dcop:
virtual QStringList functionParameterList(uint id) = 0;
virtual bool functionAddParameter(const QString &new_parameter, uint id) = 0;
virtual bool functionRemoveParameter(const QString &remove_parameter, uint id) = 0;
/// TODO: min and max values, startx, starty
};
#endif
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