Skip to content

Commit

Permalink
more updates and fixes of VariableDetailDataObject dialog (including …
Browse files Browse the repository at this point in the history
…dataObjectTable and dataObjectMetaWidget widgets)
  • Loading branch information
magro11 committed Jul 4, 2021
1 parent 6d09605 commit 715cd3e
Show file tree
Hide file tree
Showing 17 changed files with 714 additions and 102 deletions.
3 changes: 3 additions & 0 deletions Qitom/iconThemeBright.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,8 @@
<file alias="icons/find.png">icons/find.png</file>
<file alias="icons/leftAlign.png">icons/leftAlign.png</file>
</qresource>
<qresource prefix="/general">
<file alias="icons/decimals.png">icons/decimals.png</file>
</qresource>
</RCC>

5 changes: 4 additions & 1 deletion Qitom/iconThemeDark.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@
<qresource prefix="/plugins">
<file alias="icons/pluginFilter.png">icons_dark/pluginFilter.png</file>
</qresource>
<qresource prefix="/editor">
<qresource prefix="/editor">
<file alias="icons/editCut.png">icons_dark/editCut.png</file>
<file alias="icons/find.png">icons_dark/find.png</file>
<file alias="icons/leftAlign.png">icons_dark/leftAlign.png</file>
</qresource>
<qresource prefix="/general">
<file alias="icons/decimals.png">icons_dark/decimals.png</file>
</qresource>
</RCC>

Binary file added Qitom/icons/decimals.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
114 changes: 114 additions & 0 deletions Qitom/icons/decimals.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Qitom/icons_dark/decimals.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions Qitom/ui/dialogVariableDetailDataObject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
#include <qclipboard.h>
#include <qmap.h>
#include <qspinbox.h>
#include <qboxlayout.h>
#include <qmainwindow.h>
#include <qtoolbar.h>

namespace ito {

Expand All @@ -47,6 +50,16 @@ DialogVariableDetailDataObject::DialogVariableDetailDataObject(
ui.txtType->setText(type);
ui.txtDType->setText(dtype);

QMainWindow *tableMain = new QMainWindow(this);
tableMain->setWindowFlag(Qt::Widget, true);
QToolBar *tb = tableMain->addToolBar("myToolbar");

QVBoxLayout *tableLayout = qobject_cast<QVBoxLayout*>(ui.tabTable->layout());
tableLayout->insertWidget(0, tableMain);
tableLayout->removeWidget(ui.dataTable);
tableMain->setCentralWidget(ui.dataTable);
tb->addActions(ui.dataTable->actions());

ui.dataTable->setReadOnly(true);
connect(
ui.dataTable,
Expand Down
30 changes: 14 additions & 16 deletions Qitom/ui/dialogVariableDetailDataObject.ui
Original file line number Diff line number Diff line change
Expand Up @@ -258,20 +258,8 @@
<attribute name="title">
<string>Table</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_3">
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="DataObjectTable" name="dataTable">
<property name="enabled">
<bool>true</bool>
Expand All @@ -286,7 +274,7 @@
<bool>true</bool>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="rowCount" stdset="0">
<number>3</number>
Expand All @@ -302,7 +290,7 @@
</attribute>
</widget>
</item>
<item row="1" column="0">
<item>
<widget class="QLabel" name="lblSelectionInformation">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
Expand Down Expand Up @@ -514,6 +502,16 @@
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
<item/>
</widget>
</item>
</layout>
Expand Down
2 changes: 1 addition & 1 deletion iconThemes/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if(${CMAKE_VERSION} VERSION_LESS 3.12)
endif()

include(CMakeParseArguments)

# _itom_qt5_parse_qrc_file(infile _out_depends _rc_depends)
# internal
function(_ITOM_QT5_PARSE_QRC_FILE infile _out_depends _rc_depends)
Expand Down
Loading

0 comments on commit 715cd3e

Please sign in to comment.