Commits · 1fc675f0436a651157f99803f0749953bf6316b1 · Software / ArmarX / ArmarXGui

Sep 10, 2019
- added missing components doc page · 1fc675f0
  Mirko Wächter authored 5 years ago
  
  1fc675f0
Sep 06, 2019
- Merge branch 'master' of gitlab.com:ArmarX/ArmarXGui · 2875beae
  Raphael Grimm authored 5 years ago
  
  2875beae
Sep 05, 2019
- Merge branch 'Ice3.7-ScenarioManagerIceExecuting' into 'master' · ccb55029
  Mirko Wächter authored 5 years ago
  
  Ice Deployment in Scenario Manager and improved LogViewe See merge request ArmarX/ArmarXGui!62
  ccb55029
Sep 04, 2019

Derive CheckBoxBuilder from LabelMixin · 0381e496
Raphael Grimm authored 5 years ago

0381e496

Merge remote-tracking branch 'origin/master' into Ice3.7-ScenarioManagerIceExecuting · b7593ec6

Mirko Wächter authored 5 years ago

# Conflicts:
#	source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.h
#	source/ArmarXGui/gui-plugins/ScenarioManager/gui/applicationdatabaseview.cpp
#	source/ArmarXGui/gui-plugins/ScenarioManager/gui/createpropertyview.cpp
#	source/ArmarXGui/gui-plugins/ScenarioManager/gui/createscenarioview.cpp
#	source/ArmarXGui/gui-plugins/ScenarioManager/gui/detailedapplicationview.cpp
#	source/ArmarXGui/gui-plugins/ScenarioManager/gui/namelocationview.cpp
#	source/ArmarXGui/gui-plugins/ScenarioManager/gui/openscenarioview.cpp
#	source/ArmarXGui/gui-plugins/ScenarioManager/gui/packageadderview.cpp
#	source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.cpp
#	source/ArmarXGui/gui-plugins/ScenarioManager/gui/settingsview.cpp

b7593ec6

Sep 03, 2019
- Fix missing semicolon and add access function for children to Layout builders · 0f733002
  Raphael Grimm authored 5 years ago
  
  0f733002
Aug 31, 2019
- Remove #ifs for Qt versions · 272c5c96
  Raphael Grimm authored 5 years ago
  
  272c5c96
Aug 28, 2019
- fixed comboboxbutton and scenario index · 440bf3b9
  Mirko Wächter authored 5 years ago
  
  440bf3b9
Aug 26, 2019
- fixed qt moc includes · c617fa23
  ArmarX User authored 5 years ago
  
  c617fa23
Aug 21, 2019
- qt moc fix: create directory correctly · a69acc57
  Mirko Wächter authored 5 years ago
  
  a69acc57
- minor qt moc debug change · 099efa39
  Mirko Wächter authored 5 years ago
  
  099efa39
- qt moc fix · 427458bc
  Mirko Wächter authored 5 years ago
  
  427458bc
- qt moc fix for scenario manager · 22ca93e2
  Mirko Wächter authored 5 years ago
  
  22ca93e2
- qt moc fix: create directory correctly · 6a7bc3b6
  Mirko Wächter authored 5 years ago
  
  6a7bc3b6
- fix gui icons · 29a79fb9
  Mirko Wächter authored 5 years ago
  
  (cherry picked from commit 857266d1)
  29a79fb9
- fix gui icons · 857266d1
  Mirko Wächter authored 5 years ago
  
  857266d1
Aug 20, 2019
- minor qt moc debug change · 12fa0ec7
  Mirko Wächter authored 5 years ago
  
  12fa0ec7
- Merge remote-tracking branch 'origin/master' into Ice3.7-ScenarioManagerIceExecuting · 75d9b384
  Mirko Wächter authored 5 years ago
  
  75d9b384
- qt moc fix · 9468b77d
  Mirko Wächter authored 5 years ago
  
  9468b77d
Aug 19, 2019
- fixed installation of ArmarXGuiBase lib · 258ffe10
  Mirko Wächter authored 5 years ago
  
  (cherry picked from commit 0fdd1d7b)
  258ffe10
- fixed installation of ArmarXGuiBase lib · 0fdd1d7b
  Mirko Wächter authored 5 years ago
  
  0fdd1d7b
Aug 14, 2019
- Merge remote-tracking branch 'origin/master' into Ice3.7-ScenarioManagerIceExecuting · 7b55af70
  Mirko Wächter authored 5 years ago
  
  # Conflicts: # source/ArmarXGui/gui-plugins/SystemStateMonitorPlugin/ArmarXManagerModel.cpp
  7b55af70
Aug 10, 2019
- binaries-not-found popup is only shown once · d01ee100
  Mirko Wächter authored 5 years ago
  
  fixed scenario/package state accumulation
  d01ee100
- added clear buttons to filter-lineedits · 534d633a
  Mirko Wächter authored 5 years ago
  
  534d633a
Aug 06, 2019
- Merge branch 'Ice3.7' · 854d79c5
  Rainer Kartmann authored 5 years ago
  
  854d79c5
Aug 02, 2019
- reduced statechart loading time · 3b4d36f4
  Mirko Wächter authored 5 years ago
  
  3b4d36f4
- scenario manager: fixed resetting of properties (again) · 5694f021
  Mirko Wächter authored 5 years ago
  
  5694f021
- scenario manager: clean up and property reset fix · ebc8fea7
  Mirko Wächter authored 5 years ago
  
  ebc8fea7
Aug 01, 2019
- scenariomanager: added default values as combo box, changed auto history to combobox · 71d534c0
  Mirko Wächter authored 5 years ago
  
  71d534c0
- some fixes for SystemStateMonitor · f5bd6c5b
  Mirko Wächter authored 5 years ago
  
  f5bd6c5b
- added macro to make sure that a function is not in the Qt thread(should be... · b36e87bf
  Mirko Wächter authored 5 years ago
  
  added macro to make sure that a function is not in the Qt thread(should be done for all functions with network calls)
  b36e87bf
Jul 18, 2019
- reduced spam · adda009c
  Mirko Wächter authored 5 years ago and Mirko Wächter committed 5 years ago
  
  adda009c
- systemstatemonitor: fixed that endpoint row was always shown · da7bef45
  Mirko Wächter authored 5 years ago and Mirko Wächter committed 5 years ago
  
  da7bef45
- reduced spam · 50b47cc7
  Mirko Wächter authored 5 years ago
  
  50b47cc7
- systemstatemonitor: fixed that endpoint row was always shown · 89c6a66d
  Mirko Wächter authored 5 years ago
  
  89c6a66d
- fixed merge problems in logviewer · 56e48b7b
  Mirko Wächter authored 5 years ago
  
  56e48b7b
Jul 17, 2019
- Merge branch 'Ice3.7' into Ice3.7-ScenarioManagerIceExecuting · aea416a9
  Mirko Wächter authored 5 years ago
  
  aea416a9
Jul 16, 2019
- Removed ARMARX_INFO logs · a79de204
  Fabian Tërnava authored 5 years ago
  
  a79de204
- Switched to Qt built-in methods · 80680010
  Fabian Tërnava authored 5 years ago
  
  80680010
- Made filter case insensitive · fb5e49f7
  Fabian Tërnava authored 5 years ago
  
  fb5e49f7