diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-09-23 14:18:40 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-09-23 14:18:40 -0700 |
| commit | 6ee2a44235cd3cf391aec6d6a60098e19fd01e81 (patch) | |
| tree | 6ffb0abae7092c10748a977ab5984850fbf72632 /qt-ui/maintab.ui | |
| parent | 148b30849abadef23fc20a0480964a1763f8104d (diff) | |
| parent | 483320a0c094c57c5806fda39bd4a56d29ff7687 (diff) | |
| download | subsurface-6ee2a44235cd3cf391aec6d6a60098e19fd01e81.tar.gz | |
Merge branch 'NewLocationEditDropdown'
Diffstat (limited to 'qt-ui/maintab.ui')
| -rw-r--r-- | qt-ui/maintab.ui | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/qt-ui/maintab.ui b/qt-ui/maintab.ui index 23bacbf85..28c96454e 100644 --- a/qt-ui/maintab.ui +++ b/qt-ui/maintab.ui @@ -188,7 +188,7 @@ <number>2</number> </property> <item> - <widget class="QLineEdit" name="location"/> + <widget class="DiveLocationLineEdit" name="location"/> </item> <item> <widget class="QToolButton" name="editDiveSiteButton"> @@ -1131,6 +1131,11 @@ <header>qtwaitingspinner.h</header> <container>1</container> </customwidget> + <customwidget> + <class>DiveLocationLineEdit</class> + <extends>QLineEdit</extends> + <header>locationinformation.h</header> + </customwidget> </customwidgets> <tabstops> <tabstop>dateEdit</tabstop> |