diff --git a/companion/src/apppreferencesdialog.cpp b/companion/src/apppreferencesdialog.cpp
index efac55a3f..610605c11 100644
--- a/companion/src/apppreferencesdialog.cpp
+++ b/companion/src/apppreferencesdialog.cpp
@@ -18,10 +18,6 @@ AppPreferencesDialog::AppPreferencesDialog(QWidget *parent) :
ui->setupUi(this);
updateLock=false;
setWindowIcon(CompanionIcon("apppreferences.png"));
- ui->backupPathClear->setIcon(CompanionIcon("clear.png"));
- ui->pBackupPathClear->setIcon(CompanionIcon("clear.png"));
- ui->libraryPathClear->setIcon(CompanionIcon("clear.png"));
- ui->sdPathClear->setIcon(CompanionIcon("clear.png"));
initSettings();
connect(ui->downloadVerCB, SIGNAL(currentIndexChanged(int)), this, SLOT(baseFirmwareChanged()));
@@ -256,32 +252,6 @@ void AppPreferencesDialog::on_ProfilebackupPathButton_clicked()
}
}
-void AppPreferencesDialog::on_sdPathClear_clicked()
-{
- g.profile[g.id()].sdPath("");
- ui->sdPath->clear();
-}
-
-void AppPreferencesDialog::on_pBackupPathClear_clicked()
-{
- g.profile[g.id()].pBackupDir("");
- ui->profilebackupPath->clear();
- ui->pbackupEnable->setDisabled(true);
-}
-
-void AppPreferencesDialog::on_backupPathClear_clicked()
-{
- g.backupDir("");
- ui->backupPath->clear();
- ui->backupEnable->setDisabled(true);
-}
-
-void AppPreferencesDialog::on_libraryPathClear_clicked()
-{
- g.libDir("");
- ui->libraryPath->clear();
-}
-
void AppPreferencesDialog::on_ge_pathButton_clicked()
{
QString fileName = QFileDialog::getOpenFileName(this, tr("Select Google Earth executable"),ui->ge_lineedit->text());
diff --git a/companion/src/apppreferencesdialog.h b/companion/src/apppreferencesdialog.h
index f2e8bd172..bace7c642 100644
--- a/companion/src/apppreferencesdialog.h
+++ b/companion/src/apppreferencesdialog.h
@@ -49,10 +49,6 @@ class AppPreferencesDialog : public QDialog
void on_backupPathButton_clicked();
void on_ProfilebackupPathButton_clicked();
void on_ge_pathButton_clicked();
- void on_sdPathClear_clicked();
- void on_pBackupPathClear_clicked();
- void on_backupPathClear_clicked();
- void on_libraryPathClear_clicked();
void on_sdPathButton_clicked();
void on_removeProfileButton_clicked();
diff --git a/companion/src/apppreferencesdialog.ui b/companion/src/apppreferencesdialog.ui
index e5e531b76..bb814f702 100644
--- a/companion/src/apppreferencesdialog.ui
+++ b/companion/src/apppreferencesdialog.ui
@@ -291,37 +291,7 @@ May be different from firmware language
true
- true
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 16
- 16
-
-
-
-
-
-
-
- :/themes/classic/16/clear.png:/themes/classic/16/clear.png
-
-
-
- -
-
-
- Open Folder
+ false
@@ -341,40 +311,7 @@ May be different from firmware language
If set it will override the application general setting
- true
-
-
-
- -
-
-
-
- 16
- 16
-
-
-
-
- 16
- 16
-
-
-
-
-
-
-
- :/themes/classic/16/clear.png:/themes/classic/16/clear.png
-
-
-
- -
-
-
- The profile specific folder, if set, will override general Backup folder
-
-
- Open Folder
+ false
@@ -684,6 +621,23 @@ Mode 4:
+ -
+
+
+ Open Folder
+
+
+
+ -
+
+
+ The profile specific folder, if set, will override general Backup folder
+
+
+ Open Folder
+
+
+
@@ -742,16 +696,6 @@ Mode 4:
- -
-
-
- true
-
-
- true
-
-
-
-
@@ -765,13 +709,6 @@ Mode 4:
- -
-
-
- Open Folder
-
-
-
-
@@ -798,13 +735,6 @@ Mode 4:
- -
-
-
- Find Executable
-
-
-
-
@@ -812,26 +742,6 @@ Mode 4:
- -
-
-
- Open Folder
-
-
-
- -
-
-
-
- 350
- 0
-
-
-
- true
-
-
-
-
@@ -895,50 +805,13 @@ Mode 4:
- -
-
-
-
- 16
- 16
-
-
-
-
-
-
-
- :/themes/classic/16/clear.png:/themes/classic/16/clear.png
-
-
-
- -
-
-
-
- 16
- 16
-
-
-
-
-
-
-
- :/themes/classic/16/clear.png:/themes/classic/16/clear.png
-
-
-
- -
-
-
-
- 350
- 0
-
+
-
+
+
+ true
- true
+ false
@@ -962,6 +835,53 @@ Mode 4:
+ -
+
+
+
+ 350
+ 0
+
+
+
+ false
+
+
+
+ -
+
+
+ Open Folder
+
+
+
+ -
+
+
+
+ 350
+ 0
+
+
+
+ true
+
+
+
+ -
+
+
+ Find Executable
+
+
+
+ -
+
+
+ Open Folder
+
+
+