Commits · 59951f7104f3aded1660c9a819ae0b02a7edb7fa · cellframe / libdap-qt-ui

Apr 21, 2020
- Merge branch 'feature-3354' into release-5.x · 59951f71
  alexandr.mruchok authored 4 years ago
  
  59951f71
Apr 20, 2020
- Merge branch 'features-3257' into 'release-5.x' · 6c74cd93
  Alexandr Mruchok authored 4 years ago
```
Features 3257

See merge request !33
```
  6c74cd93
- Features 3257 · 34e4ba1a
  konstantin.kukharenko authored 4 years ago and Alexandr Mruchok committed 4 years ago
  
  34e4ba1a
- [*] changed Utils::findChild() · 7683574f
  alexandr.mruchok authored 4 years ago
  
  7683574f
Apr 18, 2020
- [*] Changed Utils::findChild; · 379f0611
  alexandr.mruchok authored 4 years ago
  
  379f0611
- Merge branch 'master' into release-5.x · bcac7b1e
  alexandr.mruchok authored 4 years ago
```
# Conflicts:
#	controls/CustomPlacementButton.h
```
  bcac7b1e
Apr 17, 2020
- Merge branch 'features-3487' into 'release-5.x' · a1d2072e
  Alexandr Mruchok authored 4 years ago
```
Features 3487

See merge request !32
```
  a1d2072e
- Features 3487 · 1a985053
  konstantin.kukharenko authored 4 years ago and Alexandr Mruchok committed 4 years ago
  
  1a985053
- [*] Renamed findObjectChild to findChild · 825de38e
  alexandr.mruchok authored 4 years ago
  
  825de38e
- [+] Utils::findObjectChild() · 469d13a2
  alexandr.mruchok authored 4 years ago
  
  469d13a2
- Merge branch 'features-3455' into 'release-5.x' · 90d54009
  Alexandr Mruchok authored 4 years ago
```
features-3455

See merge request !31
```
  90d54009
Apr 16, 2020
- [*]Edit property shedow · 4b6b2ba7
  konstantin.kukharenko authored 4 years ago
  
  4b6b2ba7
- Merge branch 'bugs-3437' into 'master' · 7ef936e3
  dmitriy.gerasimov authored 4 years ago
```
bugs-3437 | Fixed tab-focus control

See merge request !30
```
  7ef936e3
Apr 15, 2020
- bugs-3437 | Fixed tab-focus control · 66dfd1e3
  Danil Martynenko authored 4 years ago
  
  66dfd1e3
Apr 09, 2020
- Merge branch 'develop_old' into develop · 71b9bb73
  alexandr.mruchok authored 4 years ago
  
  71b9bb73
- Merge branch 'features-3351' into develop_old · e32ab3c4
  alexandr.mruchok authored 4 years ago
  
  e32ab3c4
- [*] moved CaptionPolicy to CustomButtonComboBox · c8570516
  alexandr.mruchok authored 4 years ago
```
[*] minorChanges
[-] removed default destructor
```
  c8570516
Apr 05, 2020
- [+]New Widget · a2cdcdfe
  konstantin.kukharenko authored 4 years ago
  
  a2cdcdfe
Apr 04, 2020
- Merge https://gitlab.demlabs.net/cellframe/libdap-qt-ui into feature-3349 · d841a233
  konstantin.kukharenko authored 4 years ago
  
  d841a233
- Merge branch 'features-3349' into feature-3349 · 1e6d835c
  konstantin.kukharenko authored 4 years ago
  
  1e6d835c
- Merge branch 'features-3332' into features-3349 · e0bfbe70
  konstantin.kukharenko authored 4 years ago
  
  e0bfbe70
Apr 03, 2020
- Merge branch 'features-3332' of https://gitlab.demlabs.net/cellframe/libdap-qt-ui into feature-3349 · 1924a536
  konstantin.kukharenko authored 4 years ago
  
  1924a536
- [*}Edit comments · 6a8b515d
  konstantin.kukharenko authored 4 years ago
  
  6a8b515d
Apr 02, 2020
- Merge branch 'develop_old' into develop · 80c7b840
  alexandr.mruchok authored 4 years ago
  
  80c7b840
- Merge branch 'master' into develop_old · 1e7dfdfd
  alexandr.mruchok authored 4 years ago
  
  1e7dfdfd
- [*]Edit comments · 06c602a0
  konstantin.kukharenko authored 4 years ago
  
  06c602a0
- [+] inserting AdaptiveWidget::m_variants; · ab99af30
  alexandr.mruchok authored 4 years ago
  
  ab99af30
- [*] Changed wrong method names in MultiScreenAbstract · 2df3a04b
  alexandr.mruchok authored 4 years ago
```
[+] MultiScreenAbstract::findChangingWidget()
```
  2df3a04b
- [*]Edit comments · 5ef03322
  konstantin.kukharenko authored 4 years ago
  
  5ef03322
Apr 01, 2020
- Merge branch 'features-3168' of... · 15d6ac0e
  konstantin.kukharenko authored 4 years ago
```
Merge branch 'features-3168' of https://gitlab.demlabs.net/cellframe/libdap-qt-ui into features-3332
```
  15d6ac0e
- Merge branch 'features-3269' of... · e6e1d85d
  konstantin.kukharenko authored 4 years ago
```
Merge branch 'features-3269' of https://gitlab.demlabs.net/cellframe/libdap-qt-ui into features-3332
```
  e6e1d85d
- [*]Edit hover state · 9f1d355b
  konstantin.kukharenko authored 4 years ago
  
  9f1d355b
- [*] Edit changePolicy · 06bbee18
  konstantin.kukharenko authored 4 years ago
  
  06bbee18
Mar 31, 2020
- Merge branch 'features-3168' of... · 1c9feb37
  konstantin.kukharenko authored 4 years ago
```
Merge branch 'features-3168' of https://gitlab.demlabs.net/cellframe/libdap-qt-ui into features-3168
```
  1c9feb37
- [*] Edit signals lineEdit · 3049bce4
  konstantin.kukharenko authored 4 years ago
  
  3049bce4
- [*]Edit Shedow · 91385b67
  konstantin.kukharenko authored 4 years ago
  
  91385b67
Mar 30, 2020
- [+]new custom button · 1d237f96
  konstantin.kukharenko authored 4 years ago
  
  1d237f96
Mar 27, 2020
- Merge branch 'develop_old' into 'features-3168' · 2e86497b
  konstantin.kukharenko authored 4 years ago
```
# Conflicts:
#   controls/CustomPlacementButton.cpp
#   controls/CustomPlacementButton.h
```
  2e86497b
- [*]Editing according to comments · 78a6bb19
  konstantin.kukharenko authored 4 years ago
  
  78a6bb19
Mar 26, 2020
- [*] for new screen · 7ac25011
  konstantin.kukharenko authored 4 years ago
  
  7ac25011