From 5b678cb24db2bbb772fe9efdbd5f4eb9d73efdef Mon Sep 17 00:00:00 2001 From: stojce Date: Thu, 9 Jan 2014 18:15:39 +0100 Subject: [PATCH] Layout fix --- interface/resources/styles/import_dialog.qss | 53 +++++++++++--------- interface/src/ImportDialog.cpp | 10 ++-- 2 files changed, 36 insertions(+), 27 deletions(-) diff --git a/interface/resources/styles/import_dialog.qss b/interface/resources/styles/import_dialog.qss index 3757abaac7..ac55bd24c3 100644 --- a/interface/resources/styles/import_dialog.qss +++ b/interface/resources/styles/import_dialog.qss @@ -6,12 +6,29 @@ * Copyright (c) 2014 High Fidelity, Inc. All rights reserved. */ -* { - font-family: Helvetica, Arial, sans-serif; -} - QLabel { font-size: 16px; + color: #333333; +} + +QPushButton { + + margin-top: 30px; + border-width: 0; + border-radius: 9px; + font-size: 18px; + padding: 14px 0px; + width: 107px; +} + +QPushButton#importButton { + background: #333333; + color: #FFFFFF; +} + +QPushButton#cancelButton { + color: #333333; + background: #FFFFFF; } QSidebar, QTreeView { @@ -33,22 +50,8 @@ QSplitter::handle, QDialog { background-color: white; } -QPushButton { - border-width: 0; - border-radius: 9px; - font-size: 18px; - padding: 14px 0px; - width: 107px; -} - -QPushButton#importButton { - background: #333333; - color: #FFFFFF; -} - -QPushButton#cancelButton { - color: #333333; - background: #FFFFFF; +QTreeView QHeaderView { + background: white; } QTreeView QHeaderView:section { @@ -59,12 +62,14 @@ QTreeView QHeaderView:section { background: white; color: #666666; padding: 10px 20px; - font-size: 22px; - font-weight: bold; } QTreeView::item { - padding: 5px 0; + height: 30px; +} + +QListView::item::icon { + height: 30px; } QListView::item:selected, @@ -73,4 +78,6 @@ QTreeView::item:selected, QTreeView::item:selected:active { background: #BDE4E3; color: #333333; + padding: 0; + margin: 0; } diff --git a/interface/src/ImportDialog.cpp b/interface/src/ImportDialog.cpp index ab90ba2032..dfb4ea69b1 100644 --- a/interface/src/ImportDialog.cpp +++ b/interface/src/ImportDialog.cpp @@ -91,7 +91,7 @@ QIcon HiFiIconProvider::icon(const QFileInfo &info) const { } QFileInfo iconFile = QFileInfo("resources/icons/" + ext + ".svg"); - qDebug() << "Icon type: " << iconFile.filePath(); + qDebug() << "Icon type: " << iconFile.filePath(); if (iconFile.exists()) { return QIcon(iconFile.filePath()); } @@ -113,12 +113,14 @@ _infoLabel(INFO_LABEL_TEXT) { _importLabel->setText(IMPORT_INFO); QGridLayout* gridLayout = (QGridLayout*) layout(); - gridLayout->addWidget(&_infoLabel, 2, 0, Qt::AlignLeft); - gridLayout->addWidget(&_cancelButton, 2, 1, Qt::AlignRight); - gridLayout->addWidget(&_importButton, 2, 2, Qt::AlignRight); + gridLayout->addWidget(&_infoLabel, 2, 0); + gridLayout->addWidget(&_cancelButton, 2, 1); + gridLayout->addWidget(&_importButton, 2, 2); connect(&_importButton, SIGNAL(pressed()), SLOT(import())); connect(this, SIGNAL(currentChanged(QString)), SLOT(saveCurrentFile(QString))); + + resize(QSize(790, 477)); } ImportDialog::~ImportDialog() {