ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/s10k/Vago/preferences.cpp

Comparing:
Vago/trunk/Vago/preferences.cpp (file contents), Revision 998 by s10k, Fri Apr 25 21:05:54 2014 UTC vs.
s10k/Vago/preferences.cpp (file contents), Revision 1093 by s10k, Sat Dec 30 13:57:32 2017 UTC

#	Line 16 | Line 16 | Preferences::Preferences(QWidget *parent
16		ui->leHeight->setText(this->vagoSettings->value("WindowHeight").toString());
17		ui->cbOniWindow->setChecked(this->vagoSettings->value("OniWindow").toBool());
18		ui->cbSeparate->setChecked(this->vagoSettings->value("SeparateInWorkspace").toBool());
19	<	ui->cbVagoExit->setChecked(this->vagoSettings->value("ConfirmExit").toBool());
19	>	ui->cbAskSaveProject->setChecked(this->vagoSettings->value("AskSaveProject").toBool());
20	>	ui->cbAskOpenLastProject->setChecked(this->vagoSettings->value("AskToOpenLastProject").toBool());
21	>	#ifdef Q_OS_MAC
22	>	ui->cbUseYesAsDefaultWhenRemovingItems->setChecked(this->vagoSettings->value("useYesAsDefaultWhenRemovingItems").toBool());
23	>	#endif
24
25		#ifdef Q_OS_WIN
26	<	ui->cbClearButtonYes->hide(); // don't display this mac os only option in windows
26	>	ui->cbUseYesAsDefaultWhenRemovingItems->hide(); // don't display this mac os only option in windows
27		#endif
28
29		}
#	Line 33 | Line 37 | Preferences::~Preferences()
37		// http://stackoverflow.com/questions/3261676/how-to-make-qdialogbuttonbox-not-close-its-parent-qdialog
38		void Preferences::accept (){
39		QStringList options;
40	<	QRect screenRes = Util::getScreenResolution();
40	>	QRect screenRes = Util::System::getScreenResolution();
41
42		options << ui->leAEfolder->text() << ui->leWorkspace->text() << ui->leWidth->text() << ui->leHeight->text();
43
44	<	if(Util::checkEmptySpaces(options)){
45	<	Util::showErrorPopUp("Setting not saved! There are empty settings.");
44	>	if(Util::Validation::checkEmptySpaces(options)){
45	>	Util::Dialogs::showError("Setting not saved! There are empty settings.");
46		return;
47		}
48
49	<	if(Util::checkIfIntegers(QStringList() << ui->leWidth->text() << ui->leHeight->text() )){
50	<	Util::showErrorPopUp("Setting not saved! Width and Height must be numbers.");
49	>	if(Util::Validation::checkIfIntegers(QStringList() << ui->leWidth->text() << ui->leHeight->text() )){
50	>	Util::Dialogs::showError("Setting not saved! Width and Height must be numbers.");
51		return;
52		}
53
54		if(ui->leWidth->text().toInt() > screenRes.width() || ui->leHeight->text().toInt() > screenRes.height()){
55	<	Util::showErrorPopUp("Setting not saved! Width or Height specified are greater than actual screen resolution.");
55	>	Util::Dialogs::showError("Setting not saved! Width or Height specified are greater than actual screen resolution.");
56		return;
57		}
58
59		if(ui->leWidth->text().toInt() <= 0  || ui->leHeight->text().toInt() <= 0 ){
60	<	Util::showErrorPopUp("Settings not saved! Width and Height must be greater than 0.");
60	>	Util::Dialogs::showError("Settings not saved! Width and Height must be greater than 0.");
61		return;
62		}
63
#	Line 63 | Line 67 | void Preferences::accept (){
67		this->vagoSettings->setValue("WindowHeight",ui->leHeight->text());
68		this->vagoSettings->setValue("OniWindow",ui->cbOniWindow->isChecked());
69		this->vagoSettings->setValue("SeparateInWorkspace",ui->cbSeparate->isChecked());
70	<	this->vagoSettings->setValue("ConfirmExit",ui->cbVagoExit->isChecked());
70	>	this->vagoSettings->setValue("AskSaveProject",ui->cbAskSaveProject->isChecked());
71	>	this->vagoSettings->setValue("AskToOpenLastProject",ui->cbAskOpenLastProject->isChecked());
72		#ifdef Q_OS_MAC
73	<	this->vagoSettings->setValue("UseYesButtonClear",ui->cbClearButtonYes->isChecked());
73	>	this->vagoSettings->setValue("useYesAsDefaultWhenRemovingItems",ui->cbUseYesAsDefaultWhenRemovingItems->isChecked());
74		#endif
75
76	<
72	<	Util::showPopUp("You need to restart the application to all changes take effect.");
76	>	Util::Dialogs::showInfo("You need to restart the application to all changes take effect.");
77
78		QDialog::accept();
79		}
#	Line 77 | Line 81 | void Preferences::accept (){
81		void Preferences::on_pbChooseWorkspace_clicked()
82		{
83		QString newDir=QFileDialog::getExistingDirectory(this,"Choose workspace folder...");
84	<	newDir=Util::normalizePath(newDir);
84	>	newDir=Util::FileSystem::normalizePath(newDir);
85
86		if(!newDir.isEmpty()){
87		ui->leWorkspace->setText(newDir);
#	Line 87 | Line 91 | void Preferences::on_pbChooseWorkspace_c
91		void Preferences::on_pbChooseAE_clicked()
92		{
93		QString newDir=QFileDialog::getExistingDirectory(this,"Choose AE folder...");
94	<	newDir=Util::normalizePath(newDir);
94	>	newDir=Util::FileSystem::normalizePath(newDir);
95
96		if(!newDir.isEmpty()){
97		ui->leAEfolder->setText(newDir);

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)