diff --git a/limereport/databrowser/lrdatabrowser.cpp b/limereport/databrowser/lrdatabrowser.cpp index b91605f..0ac9efb 100644 --- a/limereport/databrowser/lrdatabrowser.cpp +++ b/limereport/databrowser/lrdatabrowser.cpp @@ -198,9 +198,9 @@ void DataBrowser::updateVariablesTree() systemVariables->setIcon(0,QIcon(":/report/images/folder")); QTreeWidgetItem *externalVariables = new QTreeWidgetItem(QStringList(tr("External variables")),DataBrowserTree::Category); externalVariables->setIcon(0,QIcon(":/report/images/folder")); + ui->variablesTree->addTopLevelItem(externalVariables); ui->variablesTree->addTopLevelItem(reportVariables); ui->variablesTree->addTopLevelItem(systemVariables); - ui->variablesTree->addTopLevelItem(externalVariables); foreach(QString variableName,m_report->dataManager()->variableNames()){ QStringList values; diff --git a/limereport/databrowser/lrdatabrowser.ui b/limereport/databrowser/lrdatabrowser.ui index 2b60383..5d48986 100644 --- a/limereport/databrowser/lrdatabrowser.ui +++ b/limereport/databrowser/lrdatabrowser.ui @@ -35,8 +35,169 @@ <enum>QTabWidget::South</enum> </property> <property name="currentIndex"> - <number>0</number> + <number>1</number> </property> + <widget class="QWidget" name="tab_2"> + <attribute name="title"> + <string>Variables</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <property name="leftMargin"> + <number>2</number> + </property> + <property name="topMargin"> + <number>2</number> + </property> + <property name="rightMargin"> + <number>2</number> + </property> + <property name="bottomMargin"> + <number>2</number> + </property> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <property name="spacing"> + <number>2</number> + </property> + <item> + <widget class="QToolButton" name="addVariable"> + <property name="toolTip"> + <string>Add new variable</string> + </property> + <property name="text"> + <string>...</string> + </property> + <property name="icon"> + <iconset resource="lrdatabrowser.qrc"> + <normaloff>:/databrowser/images/value_add</normaloff>:/databrowser/images/value_add</iconset> + </property> + <property name="iconSize"> + <size> + <width>16</width> + <height>16</height> + </size> + </property> + <property name="popupMode"> + <enum>QToolButton::DelayedPopup</enum> + </property> + <property name="autoRaise"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="editVariable"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Edit variable</string> + </property> + <property name="text"> + <string>...</string> + </property> + <property name="icon"> + <iconset resource="lrdatabrowser.qrc"> + <normaloff>:/databrowser/images/value_edit</normaloff>:/databrowser/images/value_edit</iconset> + </property> + <property name="iconSize"> + <size> + <width>16</width> + <height>16</height> + </size> + </property> + <property name="autoRaise"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="deleteVariable"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Delete variable</string> + </property> + <property name="text"> + <string>...</string> + </property> + <property name="icon"> + <iconset resource="lrdatabrowser.qrc"> + <normaloff>:/databrowser/images/value_delete</normaloff>:/databrowser/images/value_delete</iconset> + </property> + <property name="iconSize"> + <size> + <width>16</width> + <height>16</height> + </size> + </property> + <property name="autoRaise"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="varToReport"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Grab variable</string> + </property> + <property name="text"> + <string>...</string> + </property> + <property name="icon"> + <iconset resource="lrdatabrowser.qrc"> + <normaloff>:/databrowser/images/varToReport</normaloff>:/databrowser/images/varToReport</iconset> + </property> + <property name="autoRaise"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_3"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <widget class="DataBrowserTree" name="variablesTree"> + <property name="dragEnabled"> + <bool>true</bool> + </property> + <property name="dragDropMode"> + <enum>QAbstractItemView::DragOnly</enum> + </property> + <property name="rootIsDecorated"> + <bool>true</bool> + </property> + <property name="columnCount"> + <number>1</number> + </property> + <attribute name="headerVisible"> + <bool>false</bool> + </attribute> + <column> + <property name="text"> + <string notr="true">1</string> + </property> + </column> + </widget> + </item> + </layout> + </widget> <widget class="QWidget" name="tab"> <attribute name="title"> <string>Datasources</string> @@ -329,167 +490,6 @@ </item> </layout> </widget> - <widget class="QWidget" name="tab_2"> - <attribute name="title"> - <string>Variables</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_3"> - <property name="leftMargin"> - <number>2</number> - </property> - <property name="topMargin"> - <number>2</number> - </property> - <property name="rightMargin"> - <number>2</number> - </property> - <property name="bottomMargin"> - <number>2</number> - </property> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <property name="spacing"> - <number>2</number> - </property> - <item> - <widget class="QToolButton" name="addVariable"> - <property name="toolTip"> - <string>Add new variable</string> - </property> - <property name="text"> - <string>...</string> - </property> - <property name="icon"> - <iconset resource="lrdatabrowser.qrc"> - <normaloff>:/databrowser/images/value_add</normaloff>:/databrowser/images/value_add</iconset> - </property> - <property name="iconSize"> - <size> - <width>16</width> - <height>16</height> - </size> - </property> - <property name="popupMode"> - <enum>QToolButton::DelayedPopup</enum> - </property> - <property name="autoRaise"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QToolButton" name="editVariable"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Edit variable</string> - </property> - <property name="text"> - <string>...</string> - </property> - <property name="icon"> - <iconset resource="lrdatabrowser.qrc"> - <normaloff>:/databrowser/images/value_edit</normaloff>:/databrowser/images/value_edit</iconset> - </property> - <property name="iconSize"> - <size> - <width>16</width> - <height>16</height> - </size> - </property> - <property name="autoRaise"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QToolButton" name="deleteVariable"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Delete variable</string> - </property> - <property name="text"> - <string>...</string> - </property> - <property name="icon"> - <iconset resource="lrdatabrowser.qrc"> - <normaloff>:/databrowser/images/value_delete</normaloff>:/databrowser/images/value_delete</iconset> - </property> - <property name="iconSize"> - <size> - <width>16</width> - <height>16</height> - </size> - </property> - <property name="autoRaise"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QToolButton" name="varToReport"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Grab variable</string> - </property> - <property name="text"> - <string>...</string> - </property> - <property name="icon"> - <iconset resource="lrdatabrowser.qrc"> - <normaloff>:/databrowser/images/varToReport</normaloff>:/databrowser/images/varToReport</iconset> - </property> - <property name="autoRaise"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_3"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> - <item> - <widget class="DataBrowserTree" name="variablesTree"> - <property name="dragEnabled"> - <bool>true</bool> - </property> - <property name="dragDropMode"> - <enum>QAbstractItemView::DragOnly</enum> - </property> - <property name="rootIsDecorated"> - <bool>true</bool> - </property> - <property name="columnCount"> - <number>1</number> - </property> - <attribute name="headerVisible"> - <bool>false</bool> - </attribute> - <column> - <property name="text"> - <string notr="true">1</string> - </property> - </column> - </widget> - </item> - </layout> - </widget> </widget> </item> </layout>