[rkward/frameworks] rkward: Merge branch 'master' into frameworks
Thomas Friedrichsmeier
thomas.friedrichsmeier at ruhr-uni-bochum.de
Fri Nov 13 10:09:30 UTC 2015
Git commit e8ed8e3120b3d894860b5c6c2dc734a3b05b06fd by Thomas Friedrichsmeier.
Committed on 13/11/2015 at 10:09.
Pushed by tfry into branch 'frameworks'.
Merge branch 'master' into frameworks
Conflicts:
rkward/core/robjectlist.cpp
rkward/misc/CMakeLists.txt
rkward/misc/rkobjectlistview.cpp
rkward/windows/robjectbrowser.cpp
M +30 -32 rkward/core/robjectlist.cpp
M +1 -0 rkward/misc/CMakeLists.txt
M +250 -113 rkward/misc/rkobjectlistview.cpp
M +1 -2 rkward/misc/rksaveobjectchooser.cpp
M +102 -80 rkward/plugin/rkoptionset.cpp
M +2 -6 rkward/plugin/rkstandardcomponent.cpp
M +45 -8 rkward/plugin/rkvarselector.cpp
M +35 -56 rkward/settings/rksettingsmoduleobjectbrowser.cpp
M +4 -101 rkward/windows/robjectbrowser.cpp
http://commits.kde.org/rkward/e8ed8e3120b3d894860b5c6c2dc734a3b05b06fd
diff --cc rkward/core/robjectlist.cpp
index febf539,0f803a0..98d9e57
--- a/rkward/core/robjectlist.cpp
+++ b/rkward/core/robjectlist.cpp
@@@ -294,19 -307,5 +307,4 @@@ QString RObjectList::removeChildComman
return ("remove (" + object->getFullName () + ')');
}
- //static
- REnvironmentObject *RObjectList::getGlobalEnv () {
- RK_TRACE (OBJECTS);
-
- RObjectList *list = getObjectList ();
- RK_ASSERT (list);
-
- RK_ASSERT (!list->isEmpty ());
- REnvironmentObject *envobj = static_cast<REnvironmentObject*> (list->childmap[0]);
- RK_ASSERT (envobj);
- RK_ASSERT (envobj->isType (RObject::GlobalEnv));
-
- return envobj;
- }
-
-#include "robjectlist.moc"
diff --cc rkward/misc/CMakeLists.txt
index 92892b6,6f521e2..6facdf0
--- a/rkward/misc/CMakeLists.txt
+++ b/rkward/misc/CMakeLists.txt
@@@ -26,8 -26,13 +26,9 @@@ SET(misc_STAT_SRC
rkmessagecatalog.cpp
rkdbusapi.cpp
rkfindbar.cpp
+ rkaccordiontable.cpp
)
-QT4_AUTOMOC(${misc_STAT_SRCS})
-# Urghs. QT4_AUTOMOC scans only the .h-file for Q_OBJECT macros. Let's hope this will be better with KF5
-QT4_GENERATE_MOC (rkaccordiontable.cpp ${CMAKE_CURRENT_BINARY_DIR}/rkaccordiontablemodel_moc.cpp)
-
ADD_LIBRARY(misc STATIC ${misc_STAT_SRCS})
diff --cc rkward/misc/rkobjectlistview.cpp
index 199f779,c19162e..3614df6
--- a/rkward/misc/rkobjectlistview.cpp
+++ b/rkward/misc/rkobjectlistview.cpp
@@@ -314,36 -484,5 +484,3 @@@ void RKObjectListViewSettings::updateSe
emit (settingsChanged ());
}
--
- void RKObjectListViewSettings::globalSettingsChanged (RKSettings::SettingsPage page) {
- if (page != RKSettings::PageObjectBrowser) return;
-
- RK_TRACE (APP);
-
- for (int i = 0; i < SettingsCount; ++i) {
- if (settings_default[i]) { // should only default settings be copied?
- settings[i] = RKSettingsModuleObjectBrowser::isSettingActive ((Settings) i);
- }
- }
-
- updateSelf ();
- }
-
- void RKObjectListViewSettings::settingToggled (QAction* which) {
- RK_TRACE (APP);
-
- int setting = -1;
- for (int i = 0; i < SettingsCount; ++i) {
- if (actions[i] == which) {
- setting = i;
- break;
- }
- }
- if (setting < 0) {
- RK_ASSERT (false);
- return;
- }
-
- setSetting (static_cast<Settings> (setting), which->isChecked ());
- }
-
-#include "rkobjectlistview.moc"
diff --cc rkward/plugin/rkoptionset.cpp
index c162118,4e90dab..d0c28c6
--- a/rkward/plugin/rkoptionset.cpp
+++ b/rkward/plugin/rkoptionset.cpp
@@@ -878,4 -870,35 +870,34 @@@ void RKOptionSetDisplayModel::triggerRe
}
}
+ QString optionsetdisplaymodel_mt ("application/x-rkaccordiontableitem");
+ QStringList RKOptionSetDisplayModel::mimeTypes () const {
+ return QStringList (optionsetdisplaymodel_mt);
+ }
+
+ QMimeData* RKOptionSetDisplayModel::mimeData (const QModelIndexList& indexes) const {
+ RK_ASSERT (indexes.length () >= 1);
+ QMimeData *ret = new QMimeData ();
+ ret->setData (optionsetdisplaymodel_mt, QByteArray (QString::number (indexes.first ().row ()).toAscii ()));
+ return (ret);
+ }
+
+ bool RKOptionSetDisplayModel::dropMimeData (const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) {
+ Q_UNUSED (column);
+ if (action == Qt::IgnoreAction) return true;
+ if (action == Qt::MoveAction) {
+ if (parent.isValid ()) return false;
+ int srow = QString::fromAscii (data->data (optionsetdisplaymodel_mt)).toInt ();
+ set->moveRow (srow, row);
+ }
+ return false;
+ }
+
+ Qt::ItemFlags RKOptionSetDisplayModel::flags (const QModelIndex& index) const {
+ return QAbstractItemModel::flags (index) | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled;
+ }
+
+ Qt::DropActions RKOptionSetDisplayModel::supportedDropActions () const {
+ return Qt::MoveAction;
+ }
-#include "rkoptionset.moc"
diff --cc rkward/windows/robjectbrowser.cpp
index 2f01ddb,b4353ed..9eec419
--- a/rkward/windows/robjectbrowser.cpp
+++ b/rkward/windows/robjectbrowser.cpp
@@@ -277,97 -274,5 +274,3 @@@ void RObjectBrowserInternal::doubleClic
RKWorkplace::mainWorkplace ()->newObjectViewer (object);
}
}
--
-
- //////////////////// RKObjectListViewSettingsWidget //////////////////////////
- RKObjectListViewSettingsWidget::RKObjectListViewSettingsWidget (RKObjectListViewSettings *settings, QWidget *parent) : QWidget (parent) {
- RK_TRACE (APP);
-
- RKObjectListViewSettingsWidget::settings = settings;
- connect (settings, SIGNAL (settingsChanged()), this, SLOT (settingsChanged()));
-
- QVBoxLayout *layout = new QVBoxLayout (this);
- layout->setContentsMargins (0, 0, 0, 0);
-
- QButtonGroup *group = new QButtonGroup (this);
- QHBoxLayout *hbox = new QHBoxLayout ();
- hbox->setContentsMargins (0, 0, 0, 0);
- group->addButton (all = new QRadioButton (i18n ("All"), this));
- group->addButton (nonfunctions = new QRadioButton (i18n ("Non-Functions"), this));
- group->addButton (functions = new QRadioButton (i18n ("Functions"), this));
- hbox->addWidget (all);
- hbox->addWidget (nonfunctions);
- hbox->addWidget (functions);
- connect (all, SIGNAL(clicked(bool)), this, SLOT(modeChanged(bool)));
- connect (nonfunctions, SIGNAL(clicked(bool)), this, SLOT(modeChanged(bool)));
- connect (functions, SIGNAL(clicked(bool)), this, SLOT(modeChanged(bool)));
- layout->addLayout (hbox);
-
- all_envirs = new QCheckBox (i18n ("Show All Environments"), this);
- connect (all_envirs, SIGNAL (clicked(bool)), this, SLOT (boxChanged(bool)));
- layout->addWidget (all_envirs);
-
- hidden_objects = new QCheckBox (i18n ("Show Hidden Objects"), this);
- connect (hidden_objects, SIGNAL (clicked(bool)), this, SLOT (boxChanged(bool)));
- layout->addWidget (hidden_objects);
-
- settingsChanged ();
- }
-
- RKObjectListViewSettingsWidget::~RKObjectListViewSettingsWidget () {
- RK_TRACE (APP);
- }
-
- void RKObjectListViewSettingsWidget::settingsChanged () {
- RK_TRACE (APP);
-
- all_envirs->setChecked (settings->getSetting (RKObjectListViewSettings::ShowObjectsAllEnvironments));
- hidden_objects->setChecked (settings->getSetting (RKObjectListViewSettings::ShowObjectsHidden));
-
- bool functions_shown = settings->getSetting (RKObjectListViewSettings::ShowObjectsFunction);
- bool vars_shown = settings->getSetting (RKObjectListViewSettings::ShowObjectsVariable);
- bool containers_shown = settings->getSetting (RKObjectListViewSettings::ShowObjectsContainer);
-
- if (functions_shown && vars_shown && containers_shown) {
- all->setChecked (true);
- } else if (vars_shown && containers_shown) {
- nonfunctions->setChecked (true);
- } else if (functions_shown && (!(vars_shown || containers_shown))) {
- functions->setChecked (true);
- } else {
- all->setChecked (false);
- nonfunctions->setChecked (false);
- functions->setChecked (false);
- }
- }
-
- void RKObjectListViewSettingsWidget::modeChanged (bool) {
- RK_TRACE (APP);
-
- if (all->isChecked ()) {
- settings->setSetting (RKObjectListViewSettings::ShowObjectsFunction, true);
- settings->setSetting (RKObjectListViewSettings::ShowObjectsVariable, true);
- settings->setSetting (RKObjectListViewSettings::ShowObjectsContainer, true);
- } else if (functions->isChecked ()) {
- settings->setSetting (RKObjectListViewSettings::ShowObjectsFunction, true);
- settings->setSetting (RKObjectListViewSettings::ShowObjectsVariable, false);
- settings->setSetting (RKObjectListViewSettings::ShowObjectsContainer, false);
- } else if (nonfunctions->isChecked ()) {
- settings->setSetting (RKObjectListViewSettings::ShowObjectsFunction, false);
- settings->setSetting (RKObjectListViewSettings::ShowObjectsVariable, true);
- settings->setSetting (RKObjectListViewSettings::ShowObjectsContainer, true);
- } else {
- RK_ASSERT (false);
- }
- }
-
- void RKObjectListViewSettingsWidget::boxChanged (bool) {
- RK_TRACE (APP);
-
- if (sender () == all_envirs) {
- settings->setSetting (RKObjectListViewSettings::ShowObjectsAllEnvironments, all_envirs->isChecked ());
- } else {
- settings->setSetting (RKObjectListViewSettings::ShowObjectsHidden, hidden_objects->isChecked ());
- }
- }
-
-#include "robjectbrowser.moc"
More information about the rkward-tracker
mailing list