X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/5252c12db4929886dbe502013e0a1fee6500f568..abf17941f7:/src/generalsettingspage.cpp diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp index d1d22eb48..1c0965c66 100644 --- a/src/generalsettingspage.cpp +++ b/src/generalsettingspage.cpp @@ -15,7 +15,7 @@ * 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 "generalsettingspage.h" @@ -26,7 +26,7 @@ #include #include #include -#include + #include #include #include @@ -35,19 +35,21 @@ #include #include #include +#include #include "dolphinsettings.h" -#include "dolphin.h" +#include "dolphinmainwindow.h" #include "dolphinview.h" #include "generalsettings.h" -GeneralSettingsPage::GeneralSettingsPage(QWidget* parent) : +GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin,QWidget* parent) : SettingsPageBase(parent), - m_homeURL(0), + m_mainWindow(mainWin), + m_homeUrl(0), m_startSplit(0), m_startEditable(0) { - Q3VBoxLayout* topLayout = new Q3VBoxLayout(parent, 2, KDialog::spacingHint()); + Q3VBoxLayout* topLayout = new Q3VBoxLayout(this, 2, KDialog::spacingHint()); const int spacing = KDialog::spacingHint(); const int margin = KDialog::marginHint(); @@ -55,29 +57,29 @@ GeneralSettingsPage::GeneralSettingsPage(QWidget* parent) : GeneralSettings* settings = DolphinSettings::instance().generalSettings(); - Q3VBox* vBox = new Q3VBox(parent); + KVBox* vBox = new KVBox(this); vBox->setSizePolicy(sizePolicy); vBox->setSpacing(spacing); vBox->setMargin(margin); vBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Ignored); - // create 'Home URL' editor - Q3GroupBox* homeGroup = new Q3GroupBox(1, Qt::Horizontal, i18n("Home URL"), vBox); + // create 'Home Url' editor + Q3GroupBox* homeGroup = new Q3GroupBox(1, Qt::Horizontal, i18n("Home Folder"), vBox); homeGroup->setSizePolicy(sizePolicy); homeGroup->setMargin(margin); - Q3HBox* homeURLBox = new Q3HBox(homeGroup); - homeURLBox->setSizePolicy(sizePolicy); - homeURLBox->setSpacing(spacing); + KHBox* homeUrlBox = new KHBox(homeGroup); + homeUrlBox->setSizePolicy(sizePolicy); + homeUrlBox->setSpacing(spacing); - new QLabel(i18n("Location:"), homeURLBox); - m_homeURL = new QLineEdit(settings->homeURL(), homeURLBox); + new QLabel(i18n("Location:"), homeUrlBox); + m_homeUrl = new QLineEdit(settings->homeUrl(), homeUrlBox); - QPushButton* selectHomeURLButton = new QPushButton(SmallIcon("folder"), QString::null, homeURLBox); - connect(selectHomeURLButton, SIGNAL(clicked()), - this, SLOT(selectHomeURL())); + QPushButton* selectHomeUrlButton = new QPushButton(SmallIcon("folder"), QString::null, homeUrlBox); + connect(selectHomeUrlButton, SIGNAL(clicked()), + this, SLOT(selectHomeUrl())); - Q3HBox* buttonBox = new Q3HBox(homeGroup); + KHBox* buttonBox = new KHBox(homeGroup); buttonBox->setSizePolicy(sizePolicy); buttonBox->setSpacing(spacing); QPushButton* useCurrentButton = new QPushButton(i18n("Use current location"), buttonBox); @@ -87,28 +89,19 @@ GeneralSettingsPage::GeneralSettingsPage(QWidget* parent) : connect(useDefaultButton, SIGNAL(clicked()), this, SLOT(useDefaulLocation())); - // create 'Default View Mode' group - Q3ButtonGroup* buttonGroup = new Q3ButtonGroup(3, Qt::Vertical, i18n("Default View Mode"), vBox); - buttonGroup->setSizePolicy(sizePolicy); - buttonGroup->setMargin(margin); - - m_iconsView = new QRadioButton(i18n("Icons"), buttonGroup); - m_detailsView = new QRadioButton(i18n("Details"), buttonGroup); - m_previewsView = new QRadioButton(i18n("Previews"), buttonGroup); - - switch (settings->defaultViewMode()) { - case DolphinView::IconsView: m_iconsView->setChecked(true); break; - case DolphinView::DetailsView: m_detailsView->setChecked(true); break; - case DolphinView::PreviewsView: m_previewsView->setChecked(true); break; - } + QGroupBox* startBox = new QGroupBox(i18n("Start"), vBox); // create 'Start with split view' checkbox - m_startSplit = new QCheckBox(i18n("Start with split view"), vBox); + m_startSplit = new QCheckBox(i18n("Start with split view"), startBox); m_startSplit->setChecked(settings->splitView()); // create 'Start with editable navigation bar' checkbox - m_startEditable = new QCheckBox(i18n("Start with editable navigation bar"), vBox); - m_startEditable->setChecked(settings->editableURL()); + m_startEditable = new QCheckBox(i18n("Start with editable navigation bar"), startBox); + m_startEditable->setChecked(settings->editableUrl()); + + QVBoxLayout* startBoxLayout = new QVBoxLayout(startBox); + startBoxLayout->addWidget(m_startSplit); + startBoxLayout->addWidget(m_startEditable); // Add a dummy widget with no restriction regarding // a vertical resizing. This assures that the dialog layout @@ -127,43 +120,34 @@ void GeneralSettingsPage::applySettings() { GeneralSettings* settings = DolphinSettings::instance().generalSettings(); - const KURL url(m_homeURL->text()); + const KUrl url(m_homeUrl->text()); KFileItem fileItem(S_IFDIR, KFileItem::Unknown, url); if (url.isValid() && fileItem.isDir()) { - settings->setHomeURL(url.prettyURL()); - } - - DolphinView::Mode viewMode = DolphinView::IconsView; - if (m_detailsView->isChecked()) { - viewMode = DolphinView::DetailsView; - } - else if (m_previewsView->isChecked()) { - viewMode = DolphinView::PreviewsView; + settings->setHomeUrl(url.prettyUrl()); } - settings->setDefaultViewMode(viewMode); settings->setSplitView(m_startSplit->isChecked()); - settings->setEditableURL(m_startEditable->isChecked()); + settings->setEditableUrl(m_startEditable->isChecked()); } -void GeneralSettingsPage::selectHomeURL() +void GeneralSettingsPage::selectHomeUrl() { - const QString homeURL(m_homeURL->text()); - KURL url(KFileDialog::getExistingURL(homeURL)); + const QString homeUrl(m_homeUrl->text()); + KUrl url(KFileDialog::getExistingUrl(homeUrl)); if (!url.isEmpty()) { - m_homeURL->setText(url.prettyURL()); + m_homeUrl->setText(url.prettyUrl()); } } void GeneralSettingsPage::useCurrentLocation() { - const DolphinView* view = Dolphin::mainWin().activeView(); - m_homeURL->setText(view->url().prettyURL()); + const DolphinView* view = m_mainWindow->activeView(); + m_homeUrl->setText(view->url().prettyUrl()); } void GeneralSettingsPage::useDefaulLocation() { - m_homeURL->setText("file://" + QDir::homeDirPath()); + m_homeUrl->setText("file://" + QDir::homePath()); } #include "generalsettingspage.moc"