Skip to content

Commit

Permalink
UI Upgrade of message type configuration (jopohl#532)
Browse files Browse the repository at this point in the history 
* first step of message type ui upgrade

* remove preselected index from ProtocolLabelDialog constructor

* remove selection changed for label

* move edit message type button to table

* remove delete button, functionality is now in table

* improve message type context menu

* add color selection to protocol label table

* allowing hiding of message types

* sync selection between message type table and message table

* make label visibility configurable in table

* enable deletion of labels in table

* update unittests

* fix selection bug

* update coveragerc

* support copy of labels to other message type

* avoid creating new object when reading message types from project

* fix test

* update changelog

* Make configuration button transparent

* selected label bold

* resize headers

* add show/hide all action

* same behaviour for label edits in tables

* adapt unittest

* cleanup on_table_selection_timer_timeout + update selection ui

* make current label and message type bold + add message type icon

* adapt unittest

* draw number of configured rules

* increase timeout for ci

* show num active rules only

* minor fixes

* increase timeout for ci

* sync show state

* disable grid

* close all -> close all files

* add close project action

* fix close project action

* clear message types on new project

* update changelog and project dialog buttons

* adapt unittests

* adapt unittests

* remove live update of qapp style to prevent segfault

* improve icon
  • Loading branch information
@jopohl
jopohl authored Sep 27, 2018
1 parent e4d24a1 commit 3538687
Show file tree
Hide file tree
Showing 56 changed files with 3,941 additions and 3,070 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
# Changelog
## v2.2.5 (upcoming)
## v2.3.0 (upcoming)
### New features
- added native support for BladeRF [#524](https://github.com/jopohl/urh/pull/524)
- added backward compatibility for SDRPlay < 2.13 [#528](https://github.com/jopohl/urh/pull/528)
- improved UI for message type and label configuration in analysis [#532](https://github.com/jopohl/urh/pull/532)
- rename __close all__ action to __close all files__ for more clarity [#532](https://github.com/jopohl/urh/pull/532)
- added a __close project__ action [#532](https://github.com/jopohl/urh/pull/532)


## v2.2.4 (30/08/2018)
### Bugfixes
Expand Down
68 changes: 68 additions & 0 deletions data/icons/message_type.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
161 changes: 79 additions & 82 deletions data/ui/analysis.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,12 @@ image: url(:/icons/icons/splitter_handle_vertical.svg);
<property name="acceptDrops">
<bool>false</bool>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgba(255, 255, 255, 0);</string>
</property>
<property name="frame">
<bool>false</bool>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
Expand Down Expand Up @@ -955,6 +961,12 @@ image: url(:/icons/icons/splitter_handle_vertical.svg);
<property name="acceptDrops">
<bool>false</bool>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgba(255, 255, 255, 0);</string>
</property>
<property name="frame">
<bool>false</bool>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
Expand Down Expand Up @@ -996,6 +1008,12 @@ image: url(:/icons/icons/splitter_handle_vertical.svg);
<property name="acceptDrops">
<bool>false</bool>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgba(255, 255, 255, 0);</string>
</property>
<property name="frame">
<bool>false</bool>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
Expand Down Expand Up @@ -1045,62 +1063,6 @@ image: url(:/icons/icons/splitter_handle_vertical.svg);
</property>
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QComboBox" name="cbMessagetypes">
<property name="editable">
<bool>true</bool>
</property>
<property name="insertPolicy">
<enum>QComboBox::NoInsert</enum>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="btnMessagetypeSettings">
<property name="toolTip">
<string>Settings for message type</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset theme="preferences-other">
<normaloff>.</normaloff>.</iconset>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="btnAddMessagetype">
<property name="toolTip">
<string>Add a new message type</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset theme="list-add">
<normaloff>.</normaloff>.</iconset>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="btnRemoveMessagetype">
<property name="toolTip">
<string>Delete current message type</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset theme="list-remove">
<normaloff>.</normaloff>.</iconset>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="sizePolicy">
Expand All @@ -1110,11 +1072,53 @@ image: url(:/icons/icons/splitter_handle_vertical.svg);
</sizepolicy>
</property>
<property name="text">
<string>Message type:</string>
<string>Message types</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="lblLabelValues">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Labels for message</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QToolButton" name="btnAddMessagetype">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Add a new message type</string>
</property>
<property name="text">
<string>Add new message type</string>
</property>
<property name="icon">
<iconset theme="list-add">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
<item row="1" column="1" rowspan="2">
<item row="1" column="1" rowspan="3">
<widget class="LabelValueTableView" name="tblLabelValues">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
Expand Down Expand Up @@ -1148,24 +1152,8 @@ image: url(:/icons/icons/splitter_handle_vertical.svg);
</attribute>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="lblLabelValues">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Label values for message</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="ProtocolLabelListView" name="listViewLabelNames">
<item row="1" column="0" rowspan="2">
<widget class="MessageTypeTableView" name="tblViewMessageTypes">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
Expand All @@ -1176,11 +1164,20 @@ image: url(:/icons/icons/splitter_handle_vertical.svg);
<bool>false</bool>
</property>
<property name="toolTip">
<string>Manage your estimations for protocol fields here. To add custom field types use Rightclick -&gt; Edit.</string>
<string/>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="alternatingRowColors">
<bool>true</bool>
</property>
<property name="showGrid">
<bool>false</bool>
</property>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
</widget>
</item>
</layout>
Expand All @@ -1196,11 +1193,6 @@ image: url(:/icons/icons/splitter_handle_vertical.svg);
</layout>
</widget>
<customwidgets>
<customwidget>
<class>ProtocolLabelListView</class>
<extends>QListView</extends>
<header>urh.ui.views.ProtocolLabelListView.h</header>
</customwidget>
<customwidget>
<class>ProtocolTableView</class>
<extends>QTableView</extends>
Expand All @@ -1216,6 +1208,11 @@ image: url(:/icons/icons/splitter_handle_vertical.svg);
<extends>QTreeView</extends>
<header>urh.ui.views.ProtocolTreeView.h</header>
</customwidget>
<customwidget>
<class>MessageTypeTableView</class>
<extends>QTableView</extends>
<header>urh.ui.views.MessageTypeTableView.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="urh.qrc"/>
Expand Down
17 changes: 13 additions & 4 deletions data/ui/main.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ image: url(:/icons/icons/splitter_handle_vertical.svg);
<x>0</x>
<y>0</y>
<width>798</width>
<height>27</height>
<height>28</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
Expand All @@ -361,6 +361,7 @@ image: url(:/icons/icons/splitter_handle_vertical.svg);
<addaction name="actionNew_Project"/>
<addaction name="actionProject_settings"/>
<addaction name="actionSave_project"/>
<addaction name="actionClose_project"/>
<addaction name="separator"/>
<addaction name="actionOpen"/>
<addaction name="actionOpen_directory"/>
Expand All @@ -371,7 +372,7 @@ image: url(:/icons/icons/splitter_handle_vertical.svg);
<addaction name="actionSniff_protocol"/>
<addaction name="separator"/>
<addaction name="actionSaveAllSignals"/>
<addaction name="actionClose_all"/>
<addaction name="actionCloseAllFiles"/>
<addaction name="separator"/>
<addaction name="actionConvert_Folder_to_Project"/>
</widget>
Expand Down Expand Up @@ -532,13 +533,13 @@ image: url(:/icons/icons/splitter_handle_vertical.svg);
<string>Show &amp;Compare Frame</string>
</property>
</action>
<action name="actionClose_all">
<action name="actionCloseAllFiles">
<property name="icon">
<iconset theme="window-close">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>&amp;Close all</string>
<string>&amp;Close all files</string>
</property>
<property name="iconVisibleInMenu">
<bool>true</bool>
Expand Down Expand Up @@ -745,6 +746,14 @@ image: url(:/icons/icons/splitter_handle_vertical.svg);
<string>IQ samples from csv</string>
</property>
</action>
<action name="actionClose_project">
<property name="icon">
<iconset theme="document-close"/>
</property>
<property name="text">
<string>Close project</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>
Expand Down
Loading

0 comments on commit 3538687

Please sign in to comment.