diff options
Diffstat (limited to 'rbutil/rbutilqt/install.cpp')
-rw-r--r-- | rbutil/rbutilqt/install.cpp | 38 |
1 files changed, 4 insertions, 34 deletions
diff --git a/rbutil/rbutilqt/install.cpp b/rbutil/rbutilqt/install.cpp index 2818d1af61..6a240f4807 100644 --- a/rbutil/rbutilqt/install.cpp +++ b/rbutil/rbutilqt/install.cpp | |||
@@ -28,7 +28,6 @@ Install::Install(QWidget *parent) : QDialog(parent) | |||
28 | connect(ui.radioStable, SIGNAL(toggled(bool)), this, SLOT(setDetailsStable(bool))); | 28 | connect(ui.radioStable, SIGNAL(toggled(bool)), this, SLOT(setDetailsStable(bool))); |
29 | connect(ui.radioCurrent, SIGNAL(toggled(bool)), this, SLOT(setDetailsCurrent(bool))); | 29 | connect(ui.radioCurrent, SIGNAL(toggled(bool)), this, SLOT(setDetailsCurrent(bool))); |
30 | connect(ui.radioArchived, SIGNAL(toggled(bool)), this, SLOT(setDetailsArchived(bool))); | 30 | connect(ui.radioArchived, SIGNAL(toggled(bool)), this, SLOT(setDetailsArchived(bool))); |
31 | connect(ui.buttonBrowse, SIGNAL(clicked()), this, SLOT(browseFolder())); | ||
32 | } | 31 | } |
33 | 32 | ||
34 | 33 | ||
@@ -68,43 +67,14 @@ void Install::setProxy(QUrl proxy_url) | |||
68 | } | 67 | } |
69 | 68 | ||
70 | 69 | ||
71 | void Install::setMountPoint(QString mount) | ||
72 | { | ||
73 | QFileInfo m(mount); | ||
74 | if(m.isDir()) | ||
75 | ui.lineMountPoint->setText(mount); | ||
76 | } | ||
77 | |||
78 | |||
79 | void Install::browseFolder() | ||
80 | { | ||
81 | QFileDialog browser(this); | ||
82 | if(QFileInfo(ui.lineMountPoint->text()).isDir()) | ||
83 | browser.setDirectory(ui.lineMountPoint->text()); | ||
84 | else | ||
85 | browser.setDirectory("/media"); | ||
86 | browser.setReadOnly(true); | ||
87 | browser.setFileMode(QFileDialog::DirectoryOnly); | ||
88 | browser.setAcceptMode(QFileDialog::AcceptOpen); | ||
89 | if(browser.exec()) { | ||
90 | qDebug() << browser.directory(); | ||
91 | QStringList files = browser.selectedFiles(); | ||
92 | setMountPoint(files.at(0)); | ||
93 | } | ||
94 | } | ||
95 | |||
96 | |||
97 | void Install::accept() | 70 | void Install::accept() |
98 | { | 71 | { |
99 | logger = new ProgressLoggerGui(this); | 72 | logger = new ProgressLoggerGui(this); |
100 | logger->show(); | 73 | logger->show(); |
101 | 74 | QString mountPoint = userSettings->value("defaults/mountpoint").toString(); | |
75 | qDebug() << "mountpoint:" << userSettings->value("defaults/mountpoint").toString(); | ||
102 | // show dialog with error if mount point is wrong | 76 | // show dialog with error if mount point is wrong |
103 | if(QFileInfo(ui.lineMountPoint->text()).isDir()) { | 77 | if(!QFileInfo(mountPoint).isDir()) { |
104 | mountPoint = ui.lineMountPoint->text(); | ||
105 | userSettings->setValue("defaults/mountpoint", mountPoint); | ||
106 | } | ||
107 | else { | ||
108 | logger->addItem(tr("Mount point is wrong!"),LOGERROR); | 78 | logger->addItem(tr("Mount point is wrong!"),LOGERROR); |
109 | logger->abort(); | 79 | logger->abort(); |
110 | return; | 80 | return; |
@@ -147,7 +117,7 @@ void Install::accept() | |||
147 | installer->setMountPoint(mountPoint); | 117 | installer->setMountPoint(mountPoint); |
148 | installer->install(logger); | 118 | installer->install(logger); |
149 | 119 | ||
150 | connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool))); | 120 | connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool))); |
151 | 121 | ||
152 | } | 122 | } |
153 | 123 | ||