* Full author contact details are available in file CREDITS.
*/
* Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "buffer.h"
#include <config.h>
#include "buffer.h"
return lv.buffer()->params().getLyXTextClass();
}
return lv.buffer()->params().getLyXTextClass();
}
/// \todo Remove Qt::Dock getPosition(ToolbarBackend::Flags const & flags) if not needed anymore
Qt::Dock getPosition(ToolbarBackend::Flags const & flags)
{
/// \todo Remove Qt::Dock getPosition(ToolbarBackend::Flags const & flags) if not needed anymore
Qt::Dock getPosition(ToolbarBackend::Flags const & flags)
{
return Qt::DockRight;
return Qt::DockTop;
}
return Qt::DockRight;
return Qt::DockTop;
}
Qt::ToolBarArea getToolBarPosition(ToolbarBackend::Flags const & flags)
{
Qt::ToolBarArea getToolBarPosition(ToolbarBackend::Flags const & flags)
{
int i = 0;
for (; i < combo_->count(); ++i) {
int i = 0;
for (; i < combo_->count(); ++i) {
- if (name == combo_->text(i))
+ if (name == combo_->itemText(i))
- combo_->setCurrentItem(i);
+ combo_->setCurrentIndex(i);
for (; it != end; ++it) {
// ignore obsolete entries
if ((*it)->obsoleted_by().empty())
for (; it != end; ++it) {
// ignore obsolete entries
if ((*it)->obsoleted_by().empty())
- combo_->insertItem(qt_((*it)->name()));
+ combo_->addItem(qt_((*it)->name()));
}
// needed to recalculate size hint
}
// needed to recalculate size hint
void QLayoutBox::open()
{
void QLayoutBox::open()
{
* Full author contact details are available in file CREDITS.
*/
* Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "BufferView.h"
#include <config.h>
#include "BufferView.h"
#include <QToolBar>
#include <QCloseEvent>
#include <QAction>
#include <QToolBar>
#include <QCloseEvent>
#include <QAction>
-#include <QMenu>
-#include <QMenuBar>
+//#include <QMenu>
+//#include <QMenuBar>
#include "support/lstrings.h"
#include "support/lstrings.h"
- qApp->setMainWidget(this);
// setToolButtonStyle(Qt::ToolButtonIconOnly);
// setIconSize(QSize(12,12));
// setToolButtonStyle(Qt::ToolButtonIconOnly);
// setIconSize(QSize(12,12));
// since the icon is provided in the application bundle.
string const iconname = libFileSearch("images", "lyx", "xpm");
if (!iconname.empty())
// since the icon is provided in the application bundle.
string const iconname = libFileSearch("images", "lyx", "xpm");
if (!iconname.empty())
- setIcon(QPixmap(toqstr(iconname)));
+ setWindowIcon(QPixmap(toqstr(iconname)));
#endif
// make sure the buttons are disabled if needed
#endif
// make sure the buttons are disabled if needed
void QtView::message(string const & str)
{
void QtView::message(string const & str)
{
- statusBar()->message(toqstr(str));
+ statusBar()->showMessage(toqstr(str));
statusbar_timer_.stop();
statusbar_timer_.start(statusbar_timer_value);
}
statusbar_timer_.stop();
statusbar_timer_.start(statusbar_timer_value);
}
void QtView::update_view_state_qt()
{
void QtView::update_view_state_qt()
{
- statusBar()->message(toqstr(getLyXFunc().viewStatusMessage()));
+ statusBar()->showMessage(toqstr(getLyXFunc().viewStatusMessage()));
statusbar_timer_.stop();
}
statusbar_timer_.stop();
}
if (statusbar_timer_.isActive())
return;
if (statusbar_timer_.isActive())
return;
- statusBar()->message(toqstr(getLyXFunc().viewStatusMessage()));
+ statusBar()->showMessage(toqstr(getLyXFunc().viewStatusMessage()));
- setCaption(qt_("LyX"));
+ QMainWindow::setWindowTitle(qt_("LyX"));
void QtView::busy(bool yes) const
{
if (yes)
void QtView::busy(bool yes) const
{
if (yes)
- QApplication::setOverrideCursor(Qt::waitCursor);
+ QApplication::setOverrideCursor(Qt::WaitCursor);
else
QApplication::restoreOverrideCursor();
}
else
QApplication::restoreOverrideCursor();
}
+QMainWindow* QtView::mainWidget()
+{
+ return mainWidget_;
+}
+
+QMainWindow* QtView::mainWidget_ = 0;
+
+
} // namespace frontend
} // namespace lyx
} // namespace frontend
} // namespace lyx
/**
* QtView - Qt implementation of LyXView
/**
* QtView - Qt implementation of LyXView
// returns true if this view has the focus.
virtual bool hasFocus() const;
// returns true if this view has the focus.
virtual bool hasFocus() const;
+ static QMainWindow* mainWidget();
+
public slots:
/// idle timeout
void update_view_state_qt();
public slots:
/// idle timeout
void update_view_state_qt();
/// command buffer
QCommandBuffer * commandbuffer_;
/// command buffer
QCommandBuffer * commandbuffer_;
+
+ ///
+ static QMainWindow* mainWidget_;
};
} // namespace frontend
};
} // namespace frontend