Skip to content

Commit ff37a85

Browse files
committed
edit configuration
1 parent d26150f commit ff37a85

4 files changed

Lines changed: 25 additions & 19 deletions

File tree

cpp/mainwindow.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ MainWindow::MainWindow(QWidget *parent) :
5454
ui(new Ui::MainWindow),
5555
not_ask_workspace(false),
5656
workspace_dir(QDir::root()),
57+
output_dir(QDir::root()),
58+
archives_dir(QDir::root()),
59+
packages_dir(QDir::root()),
5760
package_dir(QDir::root()),
5861
package_files_dir(QDir::root()),
5962
package_install_dir(QDir::root())
@@ -357,6 +360,9 @@ void MainWindow::on_action_Change_Workspace_triggered()
357360
WorkspaceDialog wd(this);
358361
if(wd.exec() == QDialog::Accepted){
359362
workspace_dir = QDir(wd.get_workspace());
363+
output_dir = QDir(wd.get_output_dir());
364+
archives_dir = QDir(wd.get_archives_dir());
365+
packages_dir = QDir(wd.get_packages_dir());
360366
not_ask_workspace = wd.get_not_ask_workspace();
361367
w_terminal->setWorkingDirectory(workspace_dir.absolutePath());
362368
w_terminal->changeDir(workspace_dir.absolutePath());

cpp/workspacedialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ void WorkspaceDialog::save_settings()
8585
return;
8686
QSettings settings;
8787
settings.beginGroup("main");
88-
settings.setValue("not_ask_workspace", not_ask_workspace);
8988
settings.setValue("workspace", workspace);
9089
settings.setValue("output_dir", output_dir);
9190
settings.setValue("archives_dir", archives_dir);
9291
settings.setValue("packages_dir", packages_dir);
92+
settings.setValue("not_ask_workspace", not_ask_workspace);
9393
settings.endGroup();
9494
}
9595

pisido.pro.user

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE QtCreatorProject>
3-
<!-- Written by QtCreator 3.1.2, 2015-09-10T19:39:15. -->
3+
<!-- Written by QtCreator 3.1.2, 2015-09-10T21:01:45. -->
44
<qtcreator>
55
<data>
66
<variable>ProjectExplorer.Project.ActiveTarget</variable>

ui/workspacedialog.ui

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,6 @@
7272
</property>
7373
</widget>
7474
</item>
75-
<item row="8" column="1">
76-
<spacer name="verticalSpacer">
77-
<property name="orientation">
78-
<enum>Qt::Vertical</enum>
79-
</property>
80-
<property name="sizeHint" stdset="0">
81-
<size>
82-
<width>20</width>
83-
<height>33</height>
84-
</size>
85-
</property>
86-
</spacer>
87-
</item>
8875
<item row="1" column="2">
8976
<widget class="QPushButton" name="pb_browse">
9077
<property name="text">
@@ -183,6 +170,19 @@
183170
</property>
184171
</widget>
185172
</item>
173+
<item row="8" column="0" colspan="3">
174+
<spacer name="verticalSpacer">
175+
<property name="orientation">
176+
<enum>Qt::Vertical</enum>
177+
</property>
178+
<property name="sizeHint" stdset="0">
179+
<size>
180+
<width>20</width>
181+
<height>33</height>
182+
</size>
183+
</property>
184+
</spacer>
185+
</item>
186186
</layout>
187187
</widget>
188188
<tabstops>
@@ -199,8 +199,8 @@
199199
<slot>accept()</slot>
200200
<hints>
201201
<hint type="sourcelabel">
202-
<x>326</x>
203-
<y>155</y>
202+
<x>422</x>
203+
<y>230</y>
204204
</hint>
205205
<hint type="destinationlabel">
206206
<x>242</x>
@@ -215,8 +215,8 @@
215215
<slot>reject()</slot>
216216
<hints>
217217
<hint type="sourcelabel">
218-
<x>428</x>
219-
<y>156</y>
218+
<x>474</x>
219+
<y>230</y>
220220
</hint>
221221
<hint type="destinationlabel">
222222
<x>407</x>

0 commit comments

Comments
 (0)