1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-24 16:55:20 +03:00

Allow direct editing of paths

This commit is contained in:
Romolo Manfredini 2015-05-02 12:18:07 +02:00
parent c98cbbcd12
commit d99752b458
3 changed files with 71 additions and 185 deletions

View file

@ -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());

View file

@ -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();

View file

@ -291,37 +291,7 @@ May be different from firmware language</string>
<bool>true</bool>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="10" column="2">
<widget class="QPushButton" name="sdPathClear">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="companion.qrc">
<normaloff>:/themes/classic/16/clear.png</normaloff>:/themes/classic/16/clear.png</iconset>
</property>
</widget>
</item>
<item row="10" column="3">
<widget class="QPushButton" name="sdPathButton">
<property name="text">
<string>Open Folder</string>
<bool>false</bool>
</property>
</widget>
</item>
@ -341,40 +311,7 @@ May be different from firmware language</string>
<string>If set it will override the application general setting</string>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="11" column="2">
<widget class="QPushButton" name="pBackupPathClear">
<property name="minimumSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="companion.qrc">
<normaloff>:/themes/classic/16/clear.png</normaloff>:/themes/classic/16/clear.png</iconset>
</property>
</widget>
</item>
<item row="11" column="3">
<widget class="QPushButton" name="ProfilebackupPathButton">
<property name="toolTip">
<string>The profile specific folder, if set, will override general Backup folder</string>
</property>
<property name="text">
<string>Open Folder</string>
<bool>false</bool>
</property>
</widget>
</item>
@ -684,6 +621,23 @@ Mode 4:
</property>
</widget>
</item>
<item row="10" column="2" colspan="2">
<widget class="QPushButton" name="sdPathButton">
<property name="text">
<string>Open Folder</string>
</property>
</widget>
</item>
<item row="11" column="2" colspan="2">
<widget class="QPushButton" name="ProfilebackupPathButton">
<property name="toolTip">
<string>The profile specific folder, if set, will override general Backup folder</string>
</property>
<property name="text">
<string>Open Folder</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="applicationTab">
@ -742,16 +696,6 @@ Mode 4:
</property>
</widget>
</item>
<item row="13" column="1">
<widget class="QLineEdit" name="libraryPath">
<property name="enabled">
<bool>true</bool>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="15" column="1">
<spacer name="verticalSpacer_2">
<property name="orientation">
@ -765,13 +709,6 @@ Mode 4:
</property>
</spacer>
</item>
<item row="9" column="3">
<widget class="QPushButton" name="backupPathButton">
<property name="text">
<string>Open Folder</string>
</property>
</widget>
</item>
<item row="12" column="0">
<widget class="QLabel" name="label_10">
<property name="sizePolicy">
@ -798,13 +735,6 @@ Mode 4:
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="ge_pathButton">
<property name="text">
<string>Find Executable</string>
</property>
</widget>
</item>
<item row="1" column="1" colspan="3">
<widget class="Line" name="line_4">
<property name="orientation">
@ -812,26 +742,6 @@ Mode 4:
</property>
</widget>
</item>
<item row="13" column="3">
<widget class="QPushButton" name="libraryPathButton">
<property name="text">
<string>Open Folder</string>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QLineEdit" name="backupPath">
<property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
</size>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="ge_label">
<property name="text">
@ -895,50 +805,13 @@ Mode 4:
</property>
</widget>
</item>
<item row="9" column="2">
<widget class="QPushButton" name="backupPathClear">
<property name="maximumSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="companion.qrc">
<normaloff>:/themes/classic/16/clear.png</normaloff>:/themes/classic/16/clear.png</iconset>
</property>
</widget>
</item>
<item row="13" column="2">
<widget class="QPushButton" name="libraryPathClear">
<property name="maximumSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="companion.qrc">
<normaloff>:/themes/classic/16/clear.png</normaloff>:/themes/classic/16/clear.png</iconset>
</property>
</widget>
</item>
<item row="0" column="1" colspan="2">
<widget class="QLineEdit" name="ge_lineedit">
<property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
</size>
<item row="13" column="1">
<widget class="QLineEdit" name="libraryPath">
<property name="enabled">
<bool>true</bool>
</property>
<property name="readOnly">
<bool>true</bool>
<bool>false</bool>
</property>
</widget>
</item>
@ -962,6 +835,53 @@ Mode 4:
</item>
</widget>
</item>
<item row="9" column="1">
<widget class="QLineEdit" name="backupPath">
<property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
</size>
</property>
<property name="readOnly">
<bool>false</bool>
</property>
</widget>
</item>
<item row="9" column="2" colspan="2">
<widget class="QPushButton" name="backupPathButton">
<property name="text">
<string>Open Folder</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="ge_lineedit">
<property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
</size>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="2" colspan="2">
<widget class="QPushButton" name="ge_pathButton">
<property name="text">
<string>Find Executable</string>
</property>
</widget>
</item>
<item row="13" column="2" colspan="2">
<widget class="QPushButton" name="libraryPathButton">
<property name="text">
<string>Open Folder</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="simulatorTab">