Conflicts:
	src/main.cpp
This commit is contained in:
Petr Vanek
2013-01-15 17:11:13 +01:00
10 changed files with 556 additions and 9 deletions
+12 -5
View File
@@ -21,17 +21,25 @@
#include <QtGui>
#include <QApplication>
#include <QtDebug>
#include <cstdlib>
#include <QIcon>
#include <QtGui/qicon.h>
#include "qtermwidget.h"
int main(int argc, char *argv[])
{
setenv("TERM", "xterm", 1);
QApplication app(argc, argv);
QApplication app(argc, argv);
QIcon::setThemeName("oxygen");
QMainWindow *mainWindow = new QMainWindow();
QTermWidget *console = new QTermWidget();
QMenuBar *menuBar = new QMenuBar(mainWindow);
QMenu *actionsMenu = new QMenu("Actions", menuBar);
menuBar->addMenu(actionsMenu);
actionsMenu->addAction("Find..", console, SLOT(toggleShowSearchBar()), QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_F));
mainWindow->setMenuBar(menuBar);
QFont font = QApplication::font();
#ifdef Q_WS_MAC
@@ -71,4 +79,3 @@ int main(int argc, char *argv[])
return app.exec();
}