***************************************************************************/
#include "viewpropertiesdialog.h"
+#include "viewpropsprogressinfo.h"
+
#include <klocale.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <q3vbox.h>
-#include <q3buttongroup.h>
-#include <qcheckbox.h>
-#include <qradiobutton.h>
-#include <qpushbutton.h>
-#include <qsizepolicy.h>
-#include <q3groupbox.h>
-#include <qcombobox.h>
-//Added by qt3to4:
-#include <Q3VBoxLayout>
#include <kiconloader.h>
#include <kmessagebox.h>
#include <assert.h>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QLabel>
+#include <QRadioButton>
+#include <QVBoxLayout>
+
#include "viewproperties.h"
#include "dolphinview.h"
ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
- KDialog(dolphinView, static_cast<Qt::WFlags>(Ok /* KDE4-TODO: Apply | Cancel*/)),
+ KDialog(dolphinView),
m_isDirty(false),
m_dolphinView(dolphinView)
{
assert(dolphinView != 0);
- const int margin = KDialog::marginHint();
- const QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+ setCaption(i18n("View Properties"));
+ setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Apply);
const KUrl& url = dolphinView->url();
m_viewProps = new ViewProperties(url);
m_viewProps->setAutoSaveEnabled(false);
- Q3VBoxLayout* topLayout = new Q3VBoxLayout(mainWidget(), 0, spacingHint());
+ QWidget* main = new QWidget();
+ QVBoxLayout* topLayout = new QVBoxLayout();
// create 'Properties' group containing view mode, sorting, sort order and show hidden files
- Q3GroupBox* propsGroup = new Q3GroupBox(2, Qt::Horizontal, i18n("Properties"), mainWidget());
- propsGroup->setSizePolicy(sizePolicy);
- propsGroup->setMargin(margin);
-
- new QLabel(i18n("View mode:"), propsGroup);
- m_viewMode = new QComboBox(propsGroup);
- m_viewMode->insertItem(SmallIcon("view_icon"), i18n("Icons"));
- m_viewMode->insertItem(SmallIcon("view_text"), i18n("Details"));
- m_viewMode->insertItem(SmallIcon("gvdirpart"), i18n("Previews"));
+ QGroupBox* propsBox = new QGroupBox(i18n("Properties"), main);
+
+ QLabel* viewModeLabel = new QLabel(i18n("View mode:"), propsBox);
+ 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<int>(m_viewProps->viewMode());
- m_viewMode->setCurrentItem(index);
+ m_viewMode->setCurrentIndex(index);
- new QLabel(i18n("Sorting:"), propsGroup);
- m_sorting = new QComboBox(propsGroup);
- m_sorting->insertItem("By Name");
- m_sorting->insertItem("By Size");
- m_sorting->insertItem("By Date");
+ QLabel* sortingLabel = new QLabel(i18n("Sorting:"), propsBox);
+ m_sorting = new QComboBox(propsBox);
+ 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::SortByDate: sortingIdx = 2; break;
default: break;
}
- m_sorting->setCurrentItem(sortingIdx);
+ m_sorting->setCurrentIndex(sortingIdx);
- new QLabel(i18n("Sort order:"), propsGroup);
- m_sortOrder = new QComboBox(propsGroup);
- m_sortOrder->insertItem(i18n("Ascending"));
- m_sortOrder->insertItem(i18n("Descending"));
+ QLabel* sortOrderLabel = new QLabel(i18n("Sort order:"), propsBox);
+ m_sortOrder = new QComboBox(propsBox);
+ m_sortOrder->addItem(i18n("Ascending"));
+ m_sortOrder->addItem(i18n("Descending"));
const int sortOrderIdx = (m_viewProps->sortOrder() == Qt::Ascending) ? 0 : 1;
- m_sortOrder->setCurrentItem(sortOrderIdx);
+ m_sortOrder->setCurrentIndex(sortOrderIdx);
- m_showHiddenFiles = new QCheckBox(i18n("Show hidden files"), propsGroup);
+ m_showHiddenFiles = new QCheckBox(i18n("Show hidden files"), propsBox);
m_showHiddenFiles->setChecked(m_viewProps->isShowHiddenFilesEnabled());
+ QGridLayout* propsBoxLayout = new QGridLayout(propsBox);
+ propsBoxLayout->addWidget(viewModeLabel, 0, 0);
+ propsBoxLayout->addWidget(m_viewMode, 0, 1);
+ propsBoxLayout->addWidget(m_sorting, 1, 1);
+ propsBoxLayout->addWidget(sortingLabel, 1, 0);
+ 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
- Q3ButtonGroup* buttonGroup = new Q3ButtonGroup(3,
- Qt::Vertical,
- i18n("Apply view properties to:"),
- mainWidget());
- buttonGroup->setSizePolicy(sizePolicy);
- buttonGroup->setMargin(margin);
+ 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);
- m_applyToCurrentFolder = new QRadioButton(i18n("Current folder"), buttonGroup);
- buttonGroup->insert(m_applyToCurrentFolder);
+ QVBoxLayout* buttonBoxLayout = new QVBoxLayout();
+ buttonBoxLayout->addWidget(m_applyToCurrentFolder);
+ buttonBoxLayout->addWidget(m_applyToSubFolders);
+ buttonBoxLayout->addWidget(m_applyToAllFolders);
+ buttonBox->setLayout(buttonBoxLayout);
- m_applyToSubFolders = new QRadioButton(i18n("Current folder including all sub folders"), buttonGroup);
- buttonGroup->insert(m_applyToSubFolders);
+ m_applyToCurrentFolder->setChecked(true);
- m_applyToAllFolders = new QRadioButton(i18n("All folders"), buttonGroup);
- buttonGroup->insert(m_applyToAllFolders);
-
- if (m_viewProps->isValidForSubDirs()) {
- m_applyToSubFolders->setChecked(true);
- }
- else {
- m_applyToCurrentFolder->setChecked(true);
- }
-
- topLayout->addWidget(propsGroup);
- topLayout->addWidget(buttonGroup);
+ topLayout->addWidget(propsBox);
+ topLayout->addWidget(buttonBox);
connect(m_viewMode, SIGNAL(activated(int)),
this, SLOT(slotViewModeChanged(int)));
this, SLOT(slotApplyToSubFolders()));
connect(m_applyToAllFolders, SIGNAL(clicked()),
this, SLOT(slotApplyToAllFolders()));
+
+ connect(this, SIGNAL(okClicked()), this, SLOT(slotOk()));
+ connect(this, SIGNAL(applyClicked()), this, SLOT(slotApply()));
+
+ main->setLayout(topLayout);
+ setMainWidget(main);
}
ViewPropertiesDialog::~ViewPropertiesDialog()
void ViewPropertiesDialog::slotOk()
{
applyViewProperties();
- // KDE4-TODO: KDialog::slotOk();
+ accept();
}
void ViewPropertiesDialog::slotApply()
{
applyViewProperties();
- // KDE4-TODO: KDialog::slotApply();
}
void ViewPropertiesDialog::slotViewModeChanged(int index)
void ViewPropertiesDialog::slotApplyToCurrentFolder()
{
- m_viewProps->setValidForSubDirs(false);
m_isDirty = true;
}
void ViewPropertiesDialog::slotApplyToSubFolders()
{
- m_viewProps->setValidForSubDirs(true);
+ //m_viewProps->setValidForSubDirs(true);
m_isDirty = true;
}
}
}
- ViewProperties props(QDir::homeDirPath());
- props.setViewMode(m_viewProps->viewMode());
- props.setSorting(m_viewProps->sorting());
- props.setSortOrder(m_viewProps->sortOrder());
- props.setShowHiddenFilesEnabled(m_viewProps->isShowHiddenFilesEnabled());
- props.setValidForSubDirs(true);
+ //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?"));
if (KMessageBox::questionYesNo(this, text) == KMessageBox::No) {
return;
}
+
+ ViewPropsProgressInfo dlg(this, m_dolphinView->url(), m_viewProps);
+ dlg.exec();
}
m_viewProps->save();
projects / dolphin.git / blobdiff