From 11178cc470e750120afc701f56a87406732fce0c Mon Sep 17 00:00:00 2001 From: graffy76 Date: Wed, 10 Jul 2013 21:44:25 -0500 Subject: [PATCH] Repo permissions commit fix #3 --- apps/opencs/view/doc/view.cpp | 3 ++- apps/opencs/view/settings/abstractblock.hpp | 2 +- apps/opencs/view/settings/abstractwidget.cpp | 2 +- .../view/settings/datadisplayformatpage.cpp | 2 ++ apps/opencs/view/settings/groupblock.cpp | 2 +- apps/opencs/view/settings/support.hpp | 7 +++++-- .../view/settings/usersettingsdialog.cpp | 13 ++++++------- .../view/settings/usersettingsdialog.hpp | 4 ++-- .../opencs/view/world/recordstatusdelegate.cpp | 2 +- apps/opencs/view/world/table.cpp | 18 ++++++------------ 10 files changed, 27 insertions(+), 28 deletions(-) diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp index 937d9b341..3c061ca8a 100644 --- a/apps/opencs/view/doc/view.cpp +++ b/apps/opencs/view/doc/view.cpp @@ -391,10 +391,11 @@ void CSVDoc::View::resizeViewHeight (int height) void CSVDoc::View::updateEditorSetting (const QString &settingName, const QString &settingValue) { - if ( (settingName == "Record Status Display") || (settingName == "Referenceable ID Type Display") + if ( (settingName == "Record Status Display") || (settingName == "Referenceable ID Type Display") ) { foreach (QObject *view, mSubViewWindow.children()) { + // not all mSubviewWindow children are CSVDoc::Subview objects CSVDoc::SubView *subview = dynamic_cast(view); if (subview) diff --git a/apps/opencs/view/settings/abstractblock.hpp b/apps/opencs/view/settings/abstractblock.hpp index 36108d752..361339fe2 100644 --- a/apps/opencs/view/settings/abstractblock.hpp +++ b/apps/opencs/view/settings/abstractblock.hpp @@ -43,7 +43,7 @@ namespace CSVSettings protected: - /// Creates the layout which for the blocks QGroupBox + /// Creates the layout for the block's QGroupBox QLayout *createLayout (Orientation direction, bool isZeroMargin, QWidget* parent = 0); /// Creates widgets that exist as direct children of the block diff --git a/apps/opencs/view/settings/abstractwidget.cpp b/apps/opencs/view/settings/abstractwidget.cpp index 94044e267..f268d3b27 100644 --- a/apps/opencs/view/settings/abstractwidget.cpp +++ b/apps/opencs/view/settings/abstractwidget.cpp @@ -19,7 +19,7 @@ void CSVSettings::AbstractWidget::buildLabelAndWidget (QWidget *widget, WidgetDe if (!(def.caption.isEmpty() || noLabel) ) { - QLabel *label = new QLabel (def.caption, dynamic_cast(parent())); + QLabel *label = new QLabel (def.caption, &dynamic_cast( *parent())); label->setBuddy (widget); mLayout->addWidget (label); diff --git a/apps/opencs/view/settings/datadisplayformatpage.cpp b/apps/opencs/view/settings/datadisplayformatpage.cpp index 29257f0c8..cf25237f9 100755 --- a/apps/opencs/view/settings/datadisplayformatpage.cpp +++ b/apps/opencs/view/settings/datadisplayformatpage.cpp @@ -22,6 +22,8 @@ CSVSettings::GroupBlockDef *CSVSettings::DataDisplayFormatPage::setupDataDisplay statusBlock->settingItems << statusItem; + statusBlock->isZeroMargin = false; + return statusBlock; } diff --git a/apps/opencs/view/settings/groupblock.cpp b/apps/opencs/view/settings/groupblock.cpp index 85720ad41..e31e526c0 100644 --- a/apps/opencs/view/settings/groupblock.cpp +++ b/apps/opencs/view/settings/groupblock.cpp @@ -19,7 +19,7 @@ int CSVSettings::GroupBlock::build (GroupBlockDef *def) setVisible (def->isVisible); - mBox->setLayout(createLayout (def->widgetOrientation, true)); + mBox->setLayout(createLayout (def->widgetOrientation, def->isZeroMargin)); setObjectName (def->title); mBox->setTitle (def->title); diff --git a/apps/opencs/view/settings/support.hpp b/apps/opencs/view/settings/support.hpp index 1df0dac1e..5d954505c 100644 --- a/apps/opencs/view/settings/support.hpp +++ b/apps/opencs/view/settings/support.hpp @@ -168,11 +168,14 @@ namespace CSVSettings /// generic default value attribute QString defaultValue; - GroupBlockDef (): title(""), widgetOrientation (Orient_Vertical), isVisible (true), isProxy (false), defaultValue ("") + /// shows / hides margins + bool isZeroMargin; + + GroupBlockDef (): title(""), widgetOrientation (Orient_Vertical), isVisible (true), isProxy (false), defaultValue (""), isZeroMargin (true) {} GroupBlockDef (QString blockTitle) - : title (blockTitle), widgetOrientation (Orient_Vertical), isProxy (false), isVisible (true), defaultValue ("") + : title (blockTitle), widgetOrientation (Orient_Vertical), isProxy (false), isVisible (true), defaultValue (""), isZeroMargin (true) {} }; diff --git a/apps/opencs/view/settings/usersettingsdialog.cpp b/apps/opencs/view/settings/usersettingsdialog.cpp index 05072e45a..947e8cd1b 100644 --- a/apps/opencs/view/settings/usersettingsdialog.cpp +++ b/apps/opencs/view/settings/usersettingsdialog.cpp @@ -56,8 +56,8 @@ void CSVSettings::UserSettingsDialog::setWidgetStates () if (sectionSettings.find(pageName) != sectionSettings.end()) { CSMSettings::SettingMap *settings = sectionSettings.value(pageName); - AbstractPage *page = getAbstractPage (i); - page->initializeWidgets(*settings); + AbstractPage &page = getAbstractPage (i); + page.initializeWidgets(*settings); } } } @@ -96,16 +96,15 @@ void CSVSettings::UserSettingsDialog::writeSettings() for (int i = 0; i < mStackedWidget->count(); ++i) { - AbstractPage *page = getAbstractPage (i); - settings [page->objectName()] = page->getSettings(); + AbstractPage &page = getAbstractPage (i); + settings [page.objectName()] = page.getSettings(); } CSMSettings::UserSettings::instance().writeSettings(settings); } -CSVSettings::AbstractPage *CSVSettings::UserSettingsDialog::getAbstractPage (int index) +CSVSettings::AbstractPage &CSVSettings::UserSettingsDialog::getAbstractPage (int index) { - AbstractPage *page = dynamic_cast (mStackedWidget->widget (index)); - return page; + return dynamic_cast (*(mStackedWidget->widget (index))); } void CSVSettings::UserSettingsDialog::slotChangePage(QListWidgetItem *current, QListWidgetItem *previous) diff --git a/apps/opencs/view/settings/usersettingsdialog.hpp b/apps/opencs/view/settings/usersettingsdialog.hpp index cda08707b..3b3fa5b79 100644 --- a/apps/opencs/view/settings/usersettingsdialog.hpp +++ b/apps/opencs/view/settings/usersettingsdialog.hpp @@ -36,7 +36,7 @@ namespace CSVSettings { /// return the setting page by name /// performs dynamic cast to AbstractPage * - AbstractPage *getAbstractPage (int index); + AbstractPage &getAbstractPage (int index); void setWidgetStates (); void buildPages(); void writeSettings(); @@ -47,7 +47,7 @@ namespace CSVSettings { { T *page = new T(mStackedWidget); - mStackedWidget->addWidget (dynamic_cast(page)); + mStackedWidget->addWidget (&dynamic_cast(*page)); new QListWidgetItem (page->objectName(), mListWidget); diff --git a/apps/opencs/view/world/recordstatusdelegate.cpp b/apps/opencs/view/world/recordstatusdelegate.cpp index 7a84769bb..4e137e635 100644 --- a/apps/opencs/view/world/recordstatusdelegate.cpp +++ b/apps/opencs/view/world/recordstatusdelegate.cpp @@ -24,7 +24,7 @@ void CSVWorld::RecordStatusDelegate::updateEditorSetting (const QString &setting mDisplayMode = Mode_IconAndText; else if (settingValue == "Icon Only") - mDoisplayMode = Mode_IconOnly; + mDisplayMode = Mode_IconOnly; else if (settingValue == "Text Only") mDisplayMode = Mode_TextOnly; diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp index b26eac913..f188adfaf 100644 --- a/apps/opencs/view/world/table.cpp +++ b/apps/opencs/view/world/table.cpp @@ -209,23 +209,17 @@ void CSVWorld::Table::updateEditorSetting (const QString &settingName, const QSt { if (settingName == "Record Status Display") { - RecordStatusDelegate *rsDelegate = dynamic_cast (itemDelegateForColumn(1)); + RecordStatusDelegate &rsDelegate = dynamic_cast (*itemDelegateForColumn(1)); - if (rsDelegate) - { - rsDelegate->updateEditorSetting (settingName, settingValue); - emit dataChanged(mModel->index(0,1), mModel->index(mModel->rowCount()-1, 1)); - } + rsDelegate.updateEditorSetting (settingName, settingValue); + emit dataChanged(mModel->index(0,1), mModel->index(mModel->rowCount()-1, 1)); } if (settingName == "Referenceable ID Type Display") { - RefIdTypeDelegate *refidDelegate = dynamic_cast (itemDelegateForColumn(2)); + RefIdTypeDelegate &refidDelegate = dynamic_cast (*itemDelegateForColumn(2)); - if (refidDelegate) - { - refidDelegate->updateEditorSetting (settingName, settingValue); - emit dataChanged(mModel->index(0,1), mModel->index(mModel->rowCount()-1, 1)); - } + refidDelegate.updateEditorSetting (settingName, settingValue); + emit dataChanged(mModel->index(0,1), mModel->index(mModel->rowCount()-1, 1)); } }