From 8855a325266a464e03940bca9ff82acea2e5e85a Mon Sep 17 00:00:00 2001 From: stojce Date: Mon, 6 Jan 2014 11:15:15 +0100 Subject: [PATCH] removed unused widgets --- interface/resources/styles/import_dialog.qss | 39 +++++++ interface/src/ImportDialog.cpp | 108 +++++++++++++++---- interface/src/ImportDialog.h | 21 ++-- interface/src/VoxelImporter.cpp | 1 - 4 files changed, 139 insertions(+), 30 deletions(-) create mode 100644 interface/resources/styles/import_dialog.qss diff --git a/interface/resources/styles/import_dialog.qss b/interface/resources/styles/import_dialog.qss new file mode 100644 index 0000000000..3c4d46de47 --- /dev/null +++ b/interface/resources/styles/import_dialog.qss @@ -0,0 +1,39 @@ +/* +* import_dialog.qss +* hifi +* +* Created by Stojce on 1/5/2014. +* Copyright (c) 2014 High Fidelity, Inc. All rights reserved. +*/ + +QSidebar, QTreeView { + border: 1px solid #E5E5E5; +} + +QTreeView { + border-left: none; +} + +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; +} + + diff --git a/interface/src/ImportDialog.cpp b/interface/src/ImportDialog.cpp index 41fabeee6b..ea55839770 100644 --- a/interface/src/ImportDialog.cpp +++ b/interface/src/ImportDialog.cpp @@ -6,45 +6,48 @@ // Copyright (c) 2013 High Fidelity, Inc. All rights reserved. // #include "ImportDialog.h" -#include "Application.h" #include #include -#include +#include -const QString WINDOW_NAME = QObject::tr("Import Voxels"); -const QString IMPORT_BUTTON_NAME = QObject::tr("Import"); -const QString IMPORT_FILE_TYPES = QObject::tr("Sparse Voxel Octree Files, " - "Square PNG, " - "Schematic Files " - "(*.svo *.png *.schematic)"); +const QString WINDOW_NAME = QObject::tr("Import Voxels"); +const QString IMPORT_BUTTON_NAME = QObject::tr("Import"); +const QString CANCEL_BUTTON_NAME = QObject::tr("Cancel"); +const QString IMPORT_FILE_TYPES = QObject::tr("Sparse Voxel Octree Files, " + "Square PNG, " + "Schematic Files " + "(*.svo *.png *.schematic)"); +const QString INFO_LABEL_TEXT = QObject::tr("This will load selected file into Hifi and\n" + "allow you to place it with Command V"); const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation); -ImportDialog::ImportDialog(QWidget *parent) - : QFileDialog(parent, WINDOW_NAME, DESKTOP_LOCATION, IMPORT_FILE_TYPES), - _importButton (IMPORT_BUTTON_NAME, this) { +ImportDialog::ImportDialog(QWidget *parent) : QFileDialog(parent, WINDOW_NAME, DESKTOP_LOCATION, IMPORT_FILE_TYPES), +_importButton(IMPORT_BUTTON_NAME, this), +_cancelButton(CANCEL_BUTTON_NAME, this), +_importLabel(IMPORT_BUTTON_NAME), +_infoLabel(INFO_LABEL_TEXT) { + setOption(QFileDialog::DontUseNativeDialog, true); setFileMode(QFileDialog::ExistingFile); setViewMode(QFileDialog::Detail); + setLayout(); QGridLayout* gridLayout = (QGridLayout*) layout(); - gridLayout->addWidget(&_importButton , 2, 2); + gridLayout->addWidget(&_importLabel, 0, 0); + gridLayout->addWidget(&_infoLabel, 2, 0); + gridLayout->addWidget(&_cancelButton, 2, 1); + gridLayout->addWidget(&_importButton, 2, 2); gridLayout->setColumnStretch(3, 1); connect(&_importButton, SIGNAL(pressed()), SLOT(import())); - connect(this, SIGNAL(currentChanged(QString)), SLOT(saveCurrentFile(QString))); } ImportDialog::~ImportDialog() { } -void ImportDialog::init() { - VoxelSystem* voxelSystem = Application::getInstance()->getSharedVoxelSystem(); - connect(voxelSystem, SIGNAL(importSize(float,float,float)), SLOT(setGLCamera(float,float,float))); -} - void ImportDialog::import() { _importButton.setDisabled(true); emit accepted(); @@ -69,3 +72,72 @@ void ImportDialog::reset() { void ImportDialog::saveCurrentFile(QString filename) { _currentFile = filename; } + +void ImportDialog::setLayout() { + + // set ObjectName used in qss + _importButton.setObjectName("importButton"); + _cancelButton.setObjectName("cancelButton"); + + // set size policy used in + _importButton.setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + _cancelButton.setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + + // hide unused embeded widgets in QFileDialog + QWidget* widget = findChild("lookInLabel"); + widget->hide(); + + widget = findChild("lookInCombo"); + widget->hide(); + + widget = findChild("backButton"); + widget->hide(); + + widget = findChild("forwardButton"); + widget->hide(); + + widget = findChild("toParentButton"); + widget->hide(); + + widget = findChild("newFolderButton"); + widget->hide(); + + widget = findChild("listModeButton"); + widget->hide(); + + widget = findChild("detailModeButton"); + widget->hide(); + + widget = findChild("fileNameEdit"); + widget->hide(); + + widget = findChild("fileNameLabel"); + widget->hide(); + + widget = findChild("fileTypeCombo"); + widget->hide(); + + widget = findChild("fileTypeLabel"); + widget->hide(); + + widget = findChild("buttonBox"); + widget->hide(); + + QSplitter *splitter = findChild("splitter"); + splitter->setHandleWidth(0); + + // remove blue outline on Mac + widget = findChild("sidebar"); + widget->setAttribute(Qt::WA_MacShowFocusRect, false); + widget = findChild("treeView"); + widget->setAttribute(Qt::WA_MacShowFocusRect, false); + + // set custom file icons + // setIconProvider(new HiFiIconProvider()); + + switchToResourcesParentIfRequired(); + QFile styleSheet("resources/styles/import_dialog.qss"); + if (styleSheet.open(QIODevice::ReadOnly)) { + setStyleSheet(styleSheet.readAll()); + } +} diff --git a/interface/src/ImportDialog.h b/interface/src/ImportDialog.h index a4bfc35b91..d666917c50 100644 --- a/interface/src/ImportDialog.h +++ b/interface/src/ImportDialog.h @@ -9,24 +9,18 @@ #ifndef __hifi__ImportDialog__ #define __hifi__ImportDialog__ -#include - #include #include -#include -#include -#include -#include - -class GLWidget; +#include +#include class ImportDialog : public QFileDialog { Q_OBJECT + public: ImportDialog(QWidget* parent = NULL); ~ImportDialog(); - void init(); void reset(); QString getCurrentFile() const { return _currentFile; } @@ -44,8 +38,13 @@ private slots: void saveCurrentFile(QString); private: - QString _currentFile; - QPushButton _importButton; + QString _currentFile; + QPushButton _importButton; + QPushButton _cancelButton; + QLabel _importLabel; + QLabel _infoLabel; + + void setLayout(); }; #endif /* defined(__hifi__ImportDialog__) */ diff --git a/interface/src/VoxelImporter.cpp b/interface/src/VoxelImporter.cpp index d0390c59c1..5c7a0db7d2 100644 --- a/interface/src/VoxelImporter.cpp +++ b/interface/src/VoxelImporter.cpp @@ -34,7 +34,6 @@ VoxelImporter::VoxelImporter(QWidget* parent) } void VoxelImporter::init() { - _importDialog.init(); } VoxelImporter::~VoxelImporter() {