From f5d61a60f82759d2c9cd41e027b9bdb681f1d240 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Tue, 14 Jun 2011 19:33:31 -0400 Subject: [PATCH] Replace text with end-user version --- src/settingsdialog.cpp | 24 +++------ src/stackedsettingsdialog.ui | 101 ++++++++++++++++++----------------- 2 files changed, 61 insertions(+), 64 deletions(-) diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp index 4d6d9e625..4ce763879 100644 --- a/src/settingsdialog.cpp +++ b/src/settingsdialog.cpp @@ -121,22 +121,17 @@ SettingsDialog::SettingsDialog( QWidget *parent ) connect( ui->scannerDirModeButton, SIGNAL( clicked( bool ) ), SLOT( updateScanOptionsView() ) ); connect( ui->scannerFileModeButton, SIGNAL( clicked( bool ) ), SLOT( updateScanOptionsView() ) ); if ( s->scannerMode() == TomahawkSettings::Files ) - { - ui->scanInformationLabel->setText( "Files mode uses the changed time of every file to determine if the file has\nchanged. This can be more processor, disk, and network-intensive, especially\nfor files over a network connection. This mode is recommended, but switch\nto Directory Mode or raise the time between scans if you encounter trouble." ); ui->scannerFileModeButton->setChecked( true ); - } else - { - ui->scanInformationLabel->setText( "Directory mode mode uses the changed time of collection directories to\ndetermine if files have changed. This is less processor, disk, and \nnetwork-intensive when simply running checks, so may be better for\nfiles over a network connection. However, it will only pick up changes\nif a file has been added to or removed from a directory, and scans\nentire directories at once (so is not good for very flat collections)." ); ui->scannerDirModeButton->setChecked( true ); - } if ( ui->checkBoxWatchForChanges->isChecked() ) { ui->scanTimeLabel->show(); ui->scannerTimeSpinBox->show(); ui->scannerDirModeButton->show(); ui->scannerFileModeButton->show(); - ui->scanInformationLabel->show(); + ui->scanInformationLabelFiles->show(); + ui->scanInformationLabelDirs->show(); } else { @@ -144,7 +139,8 @@ SettingsDialog::SettingsDialog( QWidget *parent ) ui->scannerTimeSpinBox->hide(); ui->scannerDirModeButton->hide(); ui->scannerFileModeButton->hide(); - ui->scanInformationLabel->hide(); + ui->scanInformationLabelFiles->hide(); + ui->scanInformationLabelDirs->hide(); } // NOW PLAYING @@ -375,17 +371,12 @@ SettingsDialog::updateScanOptionsView() ui->scannerTimeSpinBox->show(); ui->scannerDirModeButton->show(); ui->scannerFileModeButton->show(); - ui->scanInformationLabel->show(); + ui->scanInformationLabelFiles->show(); + ui->scanInformationLabelDirs->show(); if ( sender() == ui->scannerFileModeButton || ( sender() == ui->checkBoxWatchForChanges && TomahawkSettings::instance()->scannerMode() == TomahawkSettings::Files ) ) - { - ui->scanInformationLabel->setText( "Files mode uses the changed time of every file to determine if the file has\nchanged. This can be more processor, disk, and network-intensive, especially\nfor files over a network connection. This mode is recommended, but switch\nto Directory Mode or raise the time between scans if you encounter trouble." ); ui->scannerFileModeButton->setChecked( true ); - } else - { - ui->scanInformationLabel->setText( "Directory mode mode uses the changed time of collection directories to\ndetermine if files have changed. This is less processor, disk, and \nnetwork-intensive when simply running checks, so may be better for\nfiles over a network connection. However, it will only pick up changes\nif a file has been added to or removed from a directory, and scans\nentire directories at once (so is not good for very flat collections)." ); ui->scannerDirModeButton->setChecked( true ); - } } else { @@ -393,7 +384,8 @@ SettingsDialog::updateScanOptionsView() ui->scannerTimeSpinBox->hide(); ui->scannerDirModeButton->hide(); ui->scannerFileModeButton->hide(); - ui->scanInformationLabel->hide(); + ui->scanInformationLabelFiles->hide(); + ui->scanInformationLabelDirs->hide(); } } diff --git a/src/stackedsettingsdialog.ui b/src/stackedsettingsdialog.ui index 08e3f702e..6cead8d72 100644 --- a/src/stackedsettingsdialog.ui +++ b/src/stackedsettingsdialog.ui @@ -7,7 +7,7 @@ 0 0 641 - 370 + 393 @@ -302,7 +302,7 @@ - Files Mode + Files Mode (Recommended) @@ -315,55 +315,60 @@ + + + + + + + + ⚫ More accurate +⚫ Uses more computer resources + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + 2 + + + + + + + ⚫ Less accurate +⚫ Uses less computer resources +⚫ Can be better for network files + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + 2 + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + - - - - - Qt::Vertical - - - QSizePolicy::Minimum - - - - 20 - 20 - - - - - - - - Directory mode mode uses the changed time of collection directories to -determine if files have changed. This is less processor, disk, and -network-intensive when simply running checks, so may be better for -files over a network connection. However, it will only pick up changes -if a file has been added to or removed from a directory, and scans -entire directories at once (so is not good for very flat collections). - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - Now Playing Information @@ -390,7 +395,7 @@ entire directories at once (so is not good for very flat collections). - + Qt::Vertical