Commit 554fdae3 authored by Christoph Feck's avatar Christoph Feck
Browse files

More compilation fixes

parent c1c30436
......@@ -88,8 +88,9 @@ KmPlot::KmPlot( KCmdLineArgs* args)
return;
}
if (!initialGeometrySet())
resize( QSize(800, 520).expandedTo(minimumSizeHint()));
//FIXME port to KF5
// if (!initialGeometrySet())
// resize( QSize(800, 520).expandedTo(minimumSizeHint()));
// apply the saved mainwindow settings, if any, and ask the mainwindow
// to automatically save settings if changed: window size, toolbar
......@@ -237,24 +238,27 @@ bool KmPlot::queryClose()
void KmPlot::setStatusBarText(const QString &text, int id)
{
statusBar()->changeItem(text,id);
static_cast<KStatusBar *>(statusBar())->changeItem(text,id);
}
void KmPlot::setupStatusBar()
{
statusBar()->insertFixedItem( "1234567890123456", 1 );
statusBar()->insertFixedItem( "1234567890123456", 2 );
statusBar()->insertItem( "", 3, 3 );
statusBar()->insertItem( "", 4 );
statusBar()->changeItem( "", 1 );
statusBar()->changeItem( "", 2 );
statusBar()->setItemAlignment( 3, Qt::AlignLeft );
m_progressBar = new KmPlotProgress( statusBar() );
m_progressBar->setMaximumHeight( statusBar()->height()-10 );
KStatusBar *statusBar = new KStatusBar(this);
setStatusBar(statusBar);
statusBar->insertFixedItem( "1234567890123456", 1 );
statusBar->insertFixedItem( "1234567890123456", 2 );
statusBar->insertItem( "", 3, 3 );
statusBar->insertItem( "", 4 );
statusBar->changeItem( "", 1 );
statusBar->changeItem( "", 2 );
statusBar->setItemAlignment( 3, Qt::AlignLeft );
m_progressBar = new KmPlotProgress( statusBar );
m_progressBar->setMaximumHeight( statusBar->height()-10 );
connect( m_progressBar, SIGNAL (cancelDraw() ), this, SLOT( cancelDraw() ) );
statusBar()->addWidget(m_progressBar);
statusBar->addWidget(m_progressBar);
}
......
......@@ -193,7 +193,8 @@ MainDlg::MainDlg(QWidget *parentWidget, QObject *parent, const QStringList& ) :
KConfigDialogManager::changedMap()->insert( "EquationEdit", SIGNAL(textEdited(const QString &)) );
// Let's create a Configure Diloag
m_settingsDialog = new KConfigDialog( parentWidget, "settings", Settings::self() );
m_settingsDialog->setHelp("general-config");
//FIXME port to KF5
// m_settingsDialog->setHelp("general-config");
// create and add the page(s)
m_generalSettings = new SettingsPageGeneral( View::self() );
......@@ -274,13 +275,13 @@ void MainDlg::setupActions()
//BEGIN view menu
/// \todo check that new shortcuts work
KAction * zoomIn = actionCollection()->addAction( "zoom_in" );
QAction * zoomIn = actionCollection()->addAction( "zoom_in" );
zoomIn->setText( i18n("Zoom &In") );
zoomIn->setShortcut( QKeySequence(Qt::ControlModifier | Qt::Key_1) );
zoomIn->setIcon( QIcon::fromTheme("zoom-in") );
connect( zoomIn, SIGNAL(triggered(bool)), View::self(), SLOT(zoomIn()) );
KAction * zoomOut = actionCollection()->addAction( "zoom_out" );
QAction * zoomOut = actionCollection()->addAction( "zoom_out" );
zoomOut->setText(i18n("Zoom &Out"));
zoomOut->setShortcut( QKeySequence(Qt::ControlModifier | Qt::Key_2) );
zoomOut->setIcon( QIcon::fromTheme("zoom-out") );
......
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