From 06ecf03180149ecc1b6df291e7d3be8d7bf0c996 Mon Sep 17 00:00:00 2001
From: stojce <stojce@me.com>
Date: Mon, 13 Jan 2014 23:04:19 +0100
Subject: [PATCH] Layout fix (notes from Grayson)

---
 interface/resources/styles/import_dialog.qss | 15 +++++++++++----
 interface/src/ImportDialog.cpp               | 10 +++++-----
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/interface/resources/styles/import_dialog.qss b/interface/resources/styles/import_dialog.qss
index c6fb3bcd2f..f9d765b238 100644
--- a/interface/resources/styles/import_dialog.qss
+++ b/interface/resources/styles/import_dialog.qss
@@ -6,21 +6,27 @@
 *  Copyright (c) 2014 High Fidelity, Inc. All rights reserved.
 */
 
+* {
+    font-family: Helvetica, Arial, sans-serif;
+}
+
 QLabel {
     font-size: 16px;
     color: #333333;
 }
 
 QLabel#fileNameLabel {
-    padding: 10px;
+    margin-top: 18px;
+    padding: 10px 0 0 7px;
 }
 
 QPushButton {
     border-width: 0;
     border-radius: 9px;
     font-size: 18px;
-    padding: 14px 0px;
+    padding: 16px 0px;
     width: 107px;
+    margin: 20px 6px 18px;
 }
 
 QPushButton#importButton {
@@ -37,12 +43,13 @@ QPushButton#importButton:!enabled {
 
 QPushButton#cancelButton {
     color: #333333;
-    background: #FFFFFF;
+    background-color: #FFFFFF;
 }
 
 QSidebar, QTreeView {
     border: 1px solid #E5E5E5;
     font-size: 14px;
+    margin: 0px;
 }
 
 QTreeView {
@@ -69,7 +76,7 @@ QTreeView QHeaderView:section {
 
 QSidebar::item,
 QTreeView::item {
-    padding: 3px 0;
+    padding: 5px 0 4px;
 }
 
 QSidebar::item:selected,
diff --git a/interface/src/ImportDialog.cpp b/interface/src/ImportDialog.cpp
index 300e26d37b..2832534131 100644
--- a/interface/src/ImportDialog.cpp
+++ b/interface/src/ImportDialog.cpp
@@ -98,14 +98,14 @@ _cancelButton(CANCEL_BUTTON_NAME, this) {
     setOption(QFileDialog::DontUseNativeDialog, true);
     setFileMode(QFileDialog::ExistingFile);
     setViewMode(QFileDialog::Detail);
-
+    
+    QGridLayout* gridLayout = (QGridLayout*) layout();
+    gridLayout->addWidget(&_cancelButton, 2, 1, 2, 1);
+    gridLayout->addWidget(&_importButton, 2, 2, 2, 1);
+    
     setImportTypes();
     setLayout();
 
-    QGridLayout* gridLayout = (QGridLayout*) layout();
-    gridLayout->addWidget(&_cancelButton, 2, 1);
-    gridLayout->addWidget(&_importButton, 2, 2);
-
     connect(&_importButton, SIGNAL(pressed()), SLOT(import()));
     connect(&_cancelButton, SIGNAL(pressed()), SLOT(close()));
     connect(this, SIGNAL(currentChanged(QString)), SLOT(saveCurrentFile(QString)));