Showing the changes to interface/src/AvatarBookmarks.cpp (1 of 7 files). Show all
Unified · Split
| @@ -106,10 +106,9 @@ void AvatarBookmarks::changeToBookmarkedAvatar() { · 105 unmodified lines | |||
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | void AvatarBookmarks::addBookmark() { | 108 | void AvatarBookmarks::addBookmark() { |
| 109 | auto offscreenUi = DependencyManager::get<OffscreenUi>(); | 109 | ModalDialogListener* dlg = OffscreenUi::getTextAsync(OffscreenUi::ICON_PLACEMARK, "Bookmark Avatar", "Name", QString()); |
| 110 | connect(offscreenUi.data(), &OffscreenUi::inputDialogResponse, this, [=] (QVariant response) { | 110 | connect(dlg, &ModalDialogListener::response, this, [=] (QVariant response) { |
| 111 | disconnect(offscreenUi.data(), &OffscreenUi::inputDialogResponse, this, nullptr); | 111 | disconnect(dlg, &ModalDialogListener::response, this, nullptr); |
| 112 | auto offscreenUi = DependencyManager::get<OffscreenUi>(); | ||
| 113 | auto bookmarkName = response.toString(); | 112 | auto bookmarkName = response.toString(); |
| 114 | bookmarkName = bookmarkName.trimmed().replace(QRegExp("(\r\n|[\r\n\t\v ])+"), " "); | 113 | bookmarkName = bookmarkName.trimmed().replace(QRegExp("(\r\n|[\r\n\t\v ])+"), " "); |
| 115 | if (bookmarkName.length() == 0) { | 114 | if (bookmarkName.length() == 0) { |
| @@ -130,7 +129,7 @@ void AvatarBookmarks::addBookmark() { · 14 unmodified lines | |||
| 130 | 129 | ||
| 131 | Bookmarks::addBookmarkToFile(bookmarkName, *bookmark); | 130 | Bookmarks::addBookmarkToFile(bookmarkName, *bookmark); |
| 132 | }); | 131 | }); |
| 133 | OffscreenUi::getTextAsync(OffscreenUi::ICON_PLACEMARK, "Bookmark Avatar", "Name", QString()); | 132 | |
| 134 | } | 133 | } |
| 135 | 134 | ||
| 136 | void AvatarBookmarks::addBookmarkToMenu(Menu* menubar, const QString& name, const QVariant& bookmark) { | 135 | void AvatarBookmarks::addBookmarkToMenu(Menu* menubar, const QString& name, const QVariant& bookmark) { |