diff --git a/lib/tools.cpp b/lib/tools.cpp index a269200..4958425 100644 --- a/lib/tools.cpp +++ b/lib/tools.cpp @@ -11,13 +11,13 @@ But in some cases (apple bundle) there can be more locations). */ QString get_kb_layout_dir() { - qDebug() << __FILE__ << __FUNCTION__; +// qDebug() << __FILE__ << __FUNCTION__; QString rval = ""; QString k(KB_LAYOUT_DIR); QDir d(k); - qDebug() << "default KB_LAYOUT_DIR: " << k; +// qDebug() << "default KB_LAYOUT_DIR: " << k; if (d.exists()) rval = k.append("/"); @@ -48,13 +48,13 @@ But in some cases (apple bundle) there can be more locations). */ QString get_color_schemes_dir() { - qDebug() << __FILE__ << __FUNCTION__; +// qDebug() << __FILE__ << __FUNCTION__; QString rval = ""; QString k(COLORSCHEMES_DIR); QDir d(k); - qDebug() << "default COLORSCHEMES_DIR: " << k; +// qDebug() << "default COLORSCHEMES_DIR: " << k; if (d.exists()) rval = k.append("/"); diff --git a/src/main.cpp b/src/main.cpp index ea949bc..25bccb0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include "qtermwidget.h" @@ -31,17 +32,37 @@ int main(int argc, char *argv[]) QTermWidget *console = new QTermWidget(); QFont font = QApplication::font(); +#ifdef Q_WS_MAC + font.setFamily("Monaco"); +#else font.setFamily("Monospace"); +#endif font.setPointSize(12); console->setTerminalFont(font); //console->setColorScheme(COLOR_SCHEME_BLACK_ON_LIGHT_YELLOW); console->setScrollBarPosition(QTermWidget::ScrollBarRight); + + foreach (QString arg, QApplication::arguments()) + { + if (console->availableColorSchemes().contains(arg)) + console->setColorScheme(arg); + if (console->availableKeyBindings().contains(arg)) + console->setKeyBindings(arg); + } mainWindow->setCentralWidget(console); - mainWindow->resize(902, 810); + mainWindow->resize(600, 400); + // info output + qDebug() << "* INFO *************************"; + qDebug() << " availableKeyBindings:" << console->availableKeyBindings(); + qDebug() << " keyBindings:" << console->keyBindings(); + qDebug() << " availableColorSchemes:" << console->availableColorSchemes(); + qDebug() << "* INFO END *********************"; + + // real startup QObject::connect(console, SIGNAL(finished()), mainWindow, SLOT(close())); mainWindow->show();