From 3a5ebd712c4f481fe99b006fa4edcca09535a95f Mon Sep 17 00:00:00 2001 From: Helbrass Date: Sun, 26 Jun 2011 12:23:05 +0300 Subject: [PATCH] Qt demo is similar to Java now --- demo/qt/main.cxx | 76 ++++++++++++++++++++++-- demo/qt/mainwindow.cxx | 48 --------------- demo/qt/mainwindow.h | 18 ------ demo/qt/{qtlabel.pro => qtfontview.pro} | 9 ++- demo/qtdemo-opensuse-x64-bin | Bin 35547 -> 0 bytes demo/qtfontview-opensuse-x64-bin | Bin 0 -> 23807 bytes run-demo-java.sh | 4 +- run-demo-qt.sh | 2 +- 8 files changed, 78 insertions(+), 79 deletions(-) delete mode 100644 demo/qt/mainwindow.cxx delete mode 100644 demo/qt/mainwindow.h rename demo/qt/{qtlabel.pro => qtfontview.pro} (51%) delete mode 100755 demo/qtdemo-opensuse-x64-bin create mode 100755 demo/qtfontview-opensuse-x64-bin diff --git a/demo/qt/main.cxx b/demo/qt/main.cxx index 9ae175bf1..2a12e8aea 100644 --- a/demo/qt/main.cxx +++ b/demo/qt/main.cxx @@ -1,11 +1,77 @@ +#include +#include +#include #include -#include "mainwindow.h" +#include +#include +#include +#include +#include -int main(int argc, char *argv[]) -{ +int main(int argc, char *argv[]) { QApplication a(argc, argv); - MainWindow w; - w.show(); + + QString file("/usr/share/fonts/truetype/DejaVuSansMono.ttf"); + int size = 10; + + QTextStream out(stdout); + out << "Qt font viewer demo.\n" + << "By default shown font is " + << file + << " size " + << size + << ".\n" + << "usage: --file --size \n"; + out.flush(); + + QStringList args = a.arguments(); + // starting i is 1 because app name at position 0 + for (int i = 1; i < args.size(); i++) { + if (args.at(i) == "--file") { + i++; + file = args.at(i); + continue; + } + if (args.at(i) == "--size") { + i++; + size = args.at(i).toInt(); + continue; + } + } + + int fontId = QFontDatabase::addApplicationFont(file); + QString family = QFontDatabase::applicationFontFamilies(fontId).at(0); + + QFont font(family, size); + QLabel* label = new QLabel("The quick brown fox jumps over the lazy dog"); + QPalette p = label->palette(); + p.setColor(QPalette::WindowText, Qt::black); + label->setPalette(p); + label->setFont(font); + label->setContentsMargins(0, 0, 0, 0); + + QVBoxLayout* layout = new QVBoxLayout(); + layout->setContentsMargins(0, 0, 0, 0); + layout->setMargin(0); + layout->setSpacing(0); + layout->addWidget(label, 0, Qt::AlignCenter); + + QWidget* centralWidget = new QWidget(); + centralWidget->setContentsMargins(20, 20, 20, 20); + centralWidget->setLayout(layout); + centralWidget->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); + centralWidget->adjustSize(); + centralWidget->updateGeometry(); + + QMainWindow* w = new QMainWindow(); + p = w->palette(); + p.setColor(QPalette::Window, Qt::white); + w->setPalette(p); + w->setWindowTitle("fontview qt"); + w->setCentralWidget(centralWidget); + w->move(0, 0); + w->resize(centralWidget->size()); + w->show(); return a.exec(); } diff --git a/demo/qt/mainwindow.cxx b/demo/qt/mainwindow.cxx deleted file mode 100644 index 00f62207c..000000000 --- a/demo/qt/mainwindow.cxx +++ /dev/null @@ -1,48 +0,0 @@ -#include "mainwindow.h" - -#include - -MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) { - QPalette pltt = palette(); - pltt.setColor(QPalette::Window, Qt::white); - pltt.setColor(QPalette::WindowText, Qt::black); - setPalette(pltt); - - QWidget* widget = new QWidget(this); - setCentralWidget(widget); - - QVBoxLayout* layout = new QVBoxLayout(widget); - layout->setContentsMargins(12, 12, 12, 12); - layout->addWidget(createLabel("DejaVu Sans Mono", 10)); - layout->addWidget(createLabel("Consolas", 10)); - layout->addSpacing(20); - layout->addWidget(createLabel("DejaVu Sans Mono", 12)); - layout->addWidget(createLabel("Consolas", 12)); - layout->addSpacing(20); - layout->addWidget(createLabel("Monospace", 0)); - layout->addWidget(createLabel("SansSerif", 0)); - layout->addWidget(createLabel("Serif", 0)); -} - -MainWindow::~MainWindow() { -} - -QLabel* MainWindow::createLabel(const QString &fontFamily, const int fontSize) { - - QString text("The quick brown fox jumps over the lazy dog ("); - text+=fontFamily; - if (fontSize > 0) { - text+=" "; - text+=QString::number(fontSize); - } - text+=")"; - - QLabel* label = new QLabel(text, this); - QFont fnt = label->font(); - fnt.setFamily(fontFamily); - if (fontSize > 0) { - fnt.setPointSize(fontSize); - } - label->setFont(fnt); - return label; -} diff --git a/demo/qt/mainwindow.h b/demo/qt/mainwindow.h deleted file mode 100644 index c734e1153..000000000 --- a/demo/qt/mainwindow.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include -#include - -class MainWindow : public QMainWindow { - Q_OBJECT - -public: - MainWindow(QWidget *parent = 0); - ~MainWindow(); - -private: - QLabel* createLabel(const QString& fontFamily, const int fontSize); -}; - -#endif // MAINWINDOW_H diff --git a/demo/qt/qtlabel.pro b/demo/qt/qtfontview.pro similarity index 51% rename from demo/qt/qtlabel.pro rename to demo/qt/qtfontview.pro index 39d7453aa..a75e1104f 100644 --- a/demo/qt/qtlabel.pro +++ b/demo/qt/qtfontview.pro @@ -1,16 +1,15 @@ #------------------------------------------------- # -# Project created by QtCreator 2011-06-21T13:38:03 +# Project created by QtCreator 2011-06-26T11:12:27 # #------------------------------------------------- QT += core gui -TARGET = qtlabel +TARGET = qtfontview TEMPLATE = app -SOURCES += main.cxx\ - mainwindow.cxx +SOURCES += main.cxx -HEADERS += mainwindow.h +HEADERS += diff --git a/demo/qtdemo-opensuse-x64-bin b/demo/qtdemo-opensuse-x64-bin deleted file mode 100755 index 6747094576f000fe552ac3d4c674ffbe3f4518f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35547 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 S?$5N^$=}RS59I7tfBz3+$OE|m literal 0 HcmV?d00001 diff --git a/run-demo-java.sh b/run-demo-java.sh index 35717acc6..57ab0bfce 100755 --- a/run-demo-java.sh +++ b/run-demo-java.sh @@ -8,9 +8,9 @@ javai586="$thisdirname/openjdk-b145/build/linux-i586/j2re-image/bin/java" javax86="$thisdirname/openjdk-b145/build/linux-amd64/j2re-image/bin/java" if [ -x $javai586 ] ; then - $javai586 $OPT_FLAGS -jar $thisdirname/demo/java/dist/swinglabel.jar + $javai586 $OPT_FLAGS -jar $thisdirname/demo/java/dist/javafontview.jar $* elif [ -x $javax86 ] ; then - $javax86 $OPT_FLAGS -jar $thisdirname/demo/java/dist/swinglabel.jar + $javax86 $OPT_FLAGS -jar $thisdirname/demo/java/dist/javafontview.jar $* else echo 'No builded OpenJDK found. Build openjdk from this repository before launching test application.' exit 1; diff --git a/run-demo-qt.sh b/run-demo-qt.sh index ba8b10c89..5e6b8f8fd 100755 --- a/run-demo-qt.sh +++ b/run-demo-qt.sh @@ -1,3 +1,3 @@ #!/bin/sh thisdirname=$( readlink -f "$( dirname "$0" )" ) -demo/qtdemo-opensuse-x64-bin +demo/qtfontview-opensuse-x64-bin $*