History

File filter Display extensions

stojce committed 12 years ago

Commit 623def01 parent d81968d4 files · +22 −17Browse files

Showing the changes to interface/src/ImportDialog.cpp (1 of 4 files). Show all

Unified · Split

interface/src/ImportDialog.cpp+19−9
@@ -72,17 +72,28 @@ QIcon HiFiIconProvider::icon(const QFileInfo &info) const { · 71 unmodified lines
7272 }
7373
7474 QFileInfo iconFile("resources/icons/" + iconsMap[ext]);
75− if (iconFile.exists()) {
75+ if (iconFile.exists() && iconFile.isFile()) {
7676 return QIcon(iconFile.filePath());
7777 }
7878
7979 return QIcon("resources/icons/file.svg");
8080 }
8181
82+QString HiFiIconProvider::type(const QFileInfo &info) const {
83+ if (info.isFile()) {
84+ if (info.suffix().size() > 4) {
85+ return info.suffix().at(0).toUpper() + info.suffix().mid(1);
86+ }
87+ return info.suffix().toUpper();
88+ }
89+
90+ return QFileIconProvider::type(info);
91+}
92+
8293 ImportDialog::ImportDialog(QWidget *parent) :
83− QFileDialog(parent, WINDOW_NAME, DESKTOP_LOCATION, NULL),
84− _importButton(IMPORT_BUTTON_NAME, this),
85− _cancelButton(CANCEL_BUTTON_NAME, this) {
94+QFileDialog(parent, WINDOW_NAME, DESKTOP_LOCATION, NULL),
95+_importButton(IMPORT_BUTTON_NAME, this),
96+_cancelButton(CANCEL_BUTTON_NAME, this) {
8697
8798 setOption(QFileDialog::DontUseNativeDialog, true);
8899 setFileMode(QFileDialog::ExistingFile);
@@ -96,8 +107,8 @@ ImportDialog::ImportDialog(QWidget *parent) : · 7 unmodified lines
96107 gridLayout->addWidget(&_importButton, 2, 2);
97108
98109 connect(&_importButton, SIGNAL(pressed()), SLOT(import()));
99− connect(this, SIGNAL(currentChanged(QString)), SLOT(saveCurrentFile(QString)));
100110 connect(&_cancelButton, SIGNAL(pressed()), SLOT(close()));
111+ connect(this, SIGNAL(currentChanged(QString)), SLOT(saveCurrentFile(QString)));
101112 }
102113
103114 ImportDialog::~ImportDialog() {
@@ -210,7 +221,7 @@ void ImportDialog::setImportTypes() { · 106 unmodified lines
210221 if (!document.isNull() && !document.isEmpty()) {
211222
212223 QString importFormatsInfo;
213− QStringList importFormatsFilterList;
224+ QString importFormatsFilterList;
214225 QHash<QString, QString> iconsMap;
215226
216227 QJsonObject configObject = document.object();
@@ -233,7 +244,7 @@ void ImportDialog::setImportTypes() { · 16 unmodified lines
233244 importFormatsInfo.append(" or");
234245 }
235246
236− importFormatsFilterList.append(QString("%1 (*.%2)").arg(description, ext));
247+ importFormatsFilterList.append(QString("*.%1 ").arg(ext));
237248 importFormatsInfo.append(" .").append(ext);
238249 iconsMap[ext] = icon;
239250 ff++;
@@ -242,8 +253,7 @@ void ImportDialog::setImportTypes() { · 2 unmodified lines
242253
243254 // set custom file icons
244255 setIconProvider(new HiFiIconProvider(iconsMap));
245−
246− setNameFilters(importFormatsFilterList);
256+ setNameFilter(importFormatsFilterList);
247257
248258 setLabelText(QFileDialog::LookIn, QString(IMPORT_INFO).arg(importFormatsInfo));
249259 setLabelText(QFileDialog::FileName, INFO_LABEL_TEXT);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t