Layout fix

This commit is contained in:
stojce 2014-01-09 18:15:39 +01:00
parent 6dc9ea8a2e
commit 5b678cb24d
2 changed files with 36 additions and 27 deletions

View file

@ -6,12 +6,29 @@
* Copyright (c) 2014 High Fidelity, Inc. All rights reserved. * Copyright (c) 2014 High Fidelity, Inc. All rights reserved.
*/ */
* {
font-family: Helvetica, Arial, sans-serif;
}
QLabel { QLabel {
font-size: 16px; 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 { QSidebar, QTreeView {
@ -33,22 +50,8 @@ QSplitter::handle, QDialog {
background-color: white; background-color: white;
} }
QPushButton { QTreeView QHeaderView {
border-width: 0; background: white;
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:section { QTreeView QHeaderView:section {
@ -59,12 +62,14 @@ QTreeView QHeaderView:section {
background: white; background: white;
color: #666666; color: #666666;
padding: 10px 20px; padding: 10px 20px;
font-size: 22px;
font-weight: bold;
} }
QTreeView::item { QTreeView::item {
padding: 5px 0; height: 30px;
}
QListView::item::icon {
height: 30px;
} }
QListView::item:selected, QListView::item:selected,
@ -73,4 +78,6 @@ QTreeView::item:selected,
QTreeView::item:selected:active { QTreeView::item:selected:active {
background: #BDE4E3; background: #BDE4E3;
color: #333333; color: #333333;
padding: 0;
margin: 0;
} }

View file

@ -91,7 +91,7 @@ QIcon HiFiIconProvider::icon(const QFileInfo &info) const {
} }
QFileInfo iconFile = QFileInfo("resources/icons/" + ext + ".svg"); QFileInfo iconFile = QFileInfo("resources/icons/" + ext + ".svg");
qDebug() << "Icon type: " << iconFile.filePath(); qDebug() << "Icon type: " << iconFile.filePath();
if (iconFile.exists()) { if (iconFile.exists()) {
return QIcon(iconFile.filePath()); return QIcon(iconFile.filePath());
} }
@ -113,12 +113,14 @@ _infoLabel(INFO_LABEL_TEXT) {
_importLabel->setText(IMPORT_INFO); _importLabel->setText(IMPORT_INFO);
QGridLayout* gridLayout = (QGridLayout*) layout(); QGridLayout* gridLayout = (QGridLayout*) layout();
gridLayout->addWidget(&_infoLabel, 2, 0, Qt::AlignLeft); gridLayout->addWidget(&_infoLabel, 2, 0);
gridLayout->addWidget(&_cancelButton, 2, 1, Qt::AlignRight); gridLayout->addWidget(&_cancelButton, 2, 1);
gridLayout->addWidget(&_importButton, 2, 2, Qt::AlignRight); gridLayout->addWidget(&_importButton, 2, 2);
connect(&_importButton, SIGNAL(pressed()), SLOT(import())); connect(&_importButton, SIGNAL(pressed()), SLOT(import()));
connect(this, SIGNAL(currentChanged(QString)), SLOT(saveCurrentFile(QString))); connect(this, SIGNAL(currentChanged(QString)), SLOT(saveCurrentFile(QString)));
resize(QSize(790, 477));
} }
ImportDialog::~ImportDialog() { ImportDialog::~ImportDialog() {