History

importing file w/ double click

stojce committed 12 years ago

Commit dcdbf721 parent ef39d012 files · +10 −2Browse files

Unified · Split

2 files
  1. interface/src/ImportDialog.cpp +9 −2
  2. interface/src/ImportDialog.h +1 −0
interface/src/ImportDialog.cpp+9−2
@@ -97,7 +97,8 @@ QString HiFiIconProvider::type(const QFileInfo &info) const { · 96 unmodified lines
97ImportDialog::ImportDialog(QWidget* parent) :97ImportDialog::ImportDialog(QWidget* parent) :
98 QFileDialog(parent, WINDOW_NAME, DESKTOP_LOCATION, NULL),98 QFileDialog(parent, WINDOW_NAME, DESKTOP_LOCATION, NULL),
99 _importButton(IMPORT_BUTTON_NAME, this),99 _importButton(IMPORT_BUTTON_NAME, this),
100 _cancelButton(CANCEL_BUTTON_NAME, this) {100 _cancelButton(CANCEL_BUTTON_NAME, this),
101 fileAccepted(false) {
101 102
102 setOption(QFileDialog::DontUseNativeDialog, true);103 setOption(QFileDialog::DontUseNativeDialog, true);
103 setFileMode(QFileDialog::ExistingFile);104 setFileMode(QFileDialog::ExistingFile);
@@ -131,11 +132,17 @@ ImportDialog::~ImportDialog() { · 27 unmodified lines
131}132}
132 133
133void ImportDialog::import() {134void ImportDialog::import() {
135 fileAccepted = true;
134 emit accepted();136 emit accepted();
135}137}
136 138
137void ImportDialog::accept() {139void ImportDialog::accept() {
138 QFileDialog::accept();140 if (!fileAccepted) {
141 fileAccepted = true;
142 emit accepted();
143 } else {
144 QFileDialog::accept();
145 }
139}146}
140 147
141void ImportDialog::reject() {148void ImportDialog::reject() {
interface/src/ImportDialog.h+1−0
@@ -56,6 +56,7 @@ private: · 55 unmodified lines
56 56
57 void setLayout();57 void setLayout();
58 void setImportTypes();58 void setImportTypes();
59 bool fileAccepted;
59};60};
60 61
61#endif /* defined(__hifi__ImportDialog__) */62#endif /* defined(__hifi__ImportDialog__) */

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