X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/ced7cbd022b68c8dedd61b5d34d27b9c1296df15..dc3e19744dedef4b185eb0becb00a28c74381c4c:/src/viewpropertiesdialog.cpp diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp index de5c74a01..48e565a09 100644 --- a/src/viewpropertiesdialog.cpp +++ b/src/viewpropertiesdialog.cpp @@ -15,11 +15,16 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #include "viewpropertiesdialog.h" #include "viewpropsprogressinfo.h" +#include "dolphinview.h" +#include "dolphinsettings.h" +#include "dolphinsortfilterproxymodel.h" +#include "generalsettings.h" +#include "viewproperties.h" #include #include @@ -34,13 +39,18 @@ #include #include -#include "viewproperties.h" -#include "dolphinview.h" - ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : KDialog(dolphinView), m_isDirty(false), - m_dolphinView(dolphinView) + m_dolphinView(dolphinView), + m_viewProps(0), + m_viewMode(0), + m_sorting(0), + m_sortOrder(0), + m_showPreview(0), + m_showHiddenFiles(0), + m_applyToSubFolders(0), + m_useAsDefault(0) { assert(dolphinView != 0); @@ -61,7 +71,6 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : m_viewMode = new QComboBox(propsBox); m_viewMode->addItem(SmallIcon("view_icon"), i18n("Icons")); m_viewMode->addItem(SmallIcon("view_text"), i18n("Details")); - m_viewMode->addItem(SmallIcon("gvdirpart"), i18n("Previews")); const int index = static_cast(m_viewProps->viewMode()); m_viewMode->setCurrentIndex(index); @@ -70,14 +79,10 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : m_sorting->addItem("By Name"); m_sorting->addItem("By Size"); m_sorting->addItem("By Date"); - int sortingIdx = 0; - switch (m_viewProps->sorting()) { - case DolphinView::SortByName: sortingIdx = 0; break; - case DolphinView::SortBySize: sortingIdx = 1; break; - case DolphinView::SortByDate: sortingIdx = 2; break; - default: break; - } - m_sorting->setCurrentIndex(sortingIdx); + m_sorting->addItem("By Permissions"); + m_sorting->addItem("By Owner"); + m_sorting->addItem("By Group"); + m_sorting->setCurrentIndex(m_viewProps->sorting()); QLabel* sortOrderLabel = new QLabel(i18n("Sort order:"), propsBox); m_sortOrder = new QComboBox(propsBox); @@ -86,8 +91,11 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : const int sortOrderIdx = (m_viewProps->sortOrder() == Qt::Ascending) ? 0 : 1; m_sortOrder->setCurrentIndex(sortOrderIdx); + m_showPreview = new QCheckBox(i18n("Show preview"), propsBox); + m_showPreview->setChecked(m_viewProps->showPreview()); + m_showHiddenFiles = new QCheckBox(i18n("Show hidden files"), propsBox); - m_showHiddenFiles->setChecked(m_viewProps->isShowHiddenFilesEnabled()); + m_showHiddenFiles->setChecked(m_viewProps->showHiddenFiles()); QGridLayout* propsBoxLayout = new QGridLayout(propsBox); propsBoxLayout->addWidget(viewModeLabel, 0, 0); @@ -97,24 +105,10 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : propsBoxLayout->addWidget(m_sorting, 1, 1); propsBoxLayout->addWidget(sortOrderLabel, 2, 0); propsBoxLayout->addWidget(m_sortOrder, 2, 1); - propsBoxLayout->addWidget(m_showHiddenFiles, 3, 0); - - // create 'Apply view properties to:' group - QGroupBox* buttonBox = new QGroupBox(i18n("Apply view properties to:"), main); - m_applyToCurrentFolder = new QRadioButton(i18n("Current folder"), buttonBox); - m_applyToSubFolders = new QRadioButton(i18n("Current folder including all sub folders"), buttonBox); - m_applyToAllFolders = new QRadioButton(i18n("All folders"), buttonBox); - - QVBoxLayout* buttonBoxLayout = new QVBoxLayout(); - buttonBoxLayout->addWidget(m_applyToCurrentFolder); - buttonBoxLayout->addWidget(m_applyToSubFolders); - buttonBoxLayout->addWidget(m_applyToAllFolders); - buttonBox->setLayout(buttonBoxLayout); - - m_applyToCurrentFolder->setChecked(true); + propsBoxLayout->addWidget(m_showPreview, 3, 0); + propsBoxLayout->addWidget(m_showHiddenFiles, 4, 0); topLayout->addWidget(propsBox); - topLayout->addWidget(buttonBox); connect(m_viewMode, SIGNAL(activated(int)), this, SLOT(slotViewModeChanged(int))); @@ -122,18 +116,28 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : this, SLOT(slotSortingChanged(int))); connect(m_sortOrder, SIGNAL(activated(int)), this, SLOT(slotSortOrderChanged(int))); + connect(m_showPreview, SIGNAL(clicked()), + this, SLOT(slotShowPreviewChanged())); connect(m_showHiddenFiles, SIGNAL(clicked()), this, SLOT(slotShowHiddenFilesChanged())); - connect(m_applyToCurrentFolder, SIGNAL(clicked()), - this, SLOT(markAsDirty())); - connect(m_applyToSubFolders, SIGNAL(clicked()), - this, SLOT(markAsDirty())); - connect(m_applyToAllFolders, SIGNAL(clicked()), - this, SLOT(markAsDirty())); connect(this, SIGNAL(okClicked()), this, SLOT(slotOk())); connect(this, SIGNAL(applyClicked()), this, SLOT(slotApply())); + // Only show the following settings if the view properties are remembered + // for each directory: + if (!DolphinSettings::instance().generalSettings()->globalViewProps()) { + m_applyToSubFolders = new QCheckBox(i18n("Apply changes to all sub folders"), main); + m_useAsDefault = new QCheckBox(i18n("Use as default"), main); + topLayout->addWidget(m_applyToSubFolders); + topLayout->addWidget(m_useAsDefault); + + connect(m_applyToSubFolders, SIGNAL(clicked()), + this, SLOT(markAsDirty())); + connect(m_useAsDefault, SIGNAL(clicked()), + this, SLOT(markAsDirty())); + } + main->setLayout(topLayout); setMainWidget(main); } @@ -165,12 +169,7 @@ void ViewPropertiesDialog::slotViewModeChanged(int index) void ViewPropertiesDialog::slotSortingChanged(int index) { - DolphinView::Sorting sorting = DolphinView::SortByName; - switch (index) { - case 1: sorting = DolphinView::SortBySize; break; - case 2: sorting = DolphinView::SortByDate; break; - default: break; - } + const DolphinView::Sorting sorting = DolphinSortFilterProxyModel::sortingForColumn(index); m_viewProps->setSorting(sorting); m_isDirty = true; } @@ -182,10 +181,17 @@ void ViewPropertiesDialog::slotSortOrderChanged(int index) m_isDirty = true; } +void ViewPropertiesDialog::slotShowPreviewChanged() +{ + const bool show = m_showPreview->isChecked(); + m_viewProps->setShowPreview(show); + m_isDirty = true; +} + void ViewPropertiesDialog::slotShowHiddenFilesChanged() { const bool show = m_showHiddenFiles->isChecked(); - m_viewProps->setShowHiddenFilesEnabled(show); + m_viewProps->setShowHiddenFiles(show); m_isDirty = true; } @@ -196,34 +202,33 @@ void ViewPropertiesDialog::markAsDirty() void ViewPropertiesDialog::applyViewProperties() { - if (m_applyToAllFolders->isChecked()) { - if (m_isDirty) { - const QString text(i18n("The view properties of all folders will be replaced. Do you want to continue?")); - if (KMessageBox::questionYesNo(this, text) == KMessageBox::No) { - return; - } - } - - //ViewProperties props(QDir::homePath()); - //props.setViewMode(m_viewProps->viewMode()); - //props.setSorting(m_viewProps->sorting()); - //props.setSortOrder(m_viewProps->sortOrder()); - //props.setShowHiddenFilesEnabled(m_viewProps->isShowHiddenFilesEnabled()); - //props.setValidForSubDirs(true); - } - else if (m_applyToSubFolders->isChecked() && m_isDirty) { - const QString text(i18n("The view properties of all sub folders will be replaced. Do you want to continue?")); + const bool applyToSubFolders = m_isDirty && + (m_applyToSubFolders != 0) && + m_applyToSubFolders->isChecked(); + if (applyToSubFolders) { + const QString text(i18n("The view properties of all sub folders will be changed. Do you want to continue?")); if (KMessageBox::questionYesNo(this, text) == KMessageBox::No) { return; } - ViewPropsProgressInfo dlg(this, m_dolphinView->url(), m_viewProps); - dlg.exec(); + ViewPropsProgressInfo* info = new ViewPropsProgressInfo(m_dolphinView, + m_dolphinView->url(), + *m_viewProps); + info->setWindowModality(Qt::NonModal); + info->show(); } m_viewProps->save(); - m_dolphinView->setViewProperties(*m_viewProps); + + m_dolphinView->setMode(m_viewProps->viewMode()); + m_dolphinView->setSorting(m_viewProps->sorting()); + m_dolphinView->setSortOrder(m_viewProps->sortOrder()); + m_dolphinView->setShowPreview(m_viewProps->showPreview()); + m_dolphinView->setShowHiddenFiles(m_viewProps->showHiddenFiles()); + m_isDirty = false; + + // TODO: handle m_useAsDefault setting } #include "viewpropertiesdialog.moc"