Differential D28661 Diff 79885 src/lib/bookmarks/bookmarkswidget.cpp

Changeset View

Standalone View

View Options

src/lib/bookmarks/bookmarkswidget.cpp

Context not available.
70 if (m_edited) { 70​ if (m_edited) {
71 // Change folder 71​ // Change folder
72 m_bookmarks->removeBookmark(m_bookmark); 72​ m_bookmarks->removeBookmark(m_bookmark);
73​ m_bookmark->setKeyword(ui->keyword->text());
73 m_bookmarks->addBookmark(ui->folderButton->selectedFolder(), m_bookmark); 74​ m_bookmarks->addBookmark(ui->folderButton->selectedFolder(), m_bookmark);
74 } 75​ }
75 else { 76​ else {
Context not available.
82 BookmarkItem* bookmark = new BookmarkItem(BookmarkItem::Url); 83​ BookmarkItem* bookmark = new BookmarkItem(BookmarkItem::Url);
83 bookmark->setTitle(m_view->title()); 84​ bookmark->setTitle(m_view->title());
84 bookmark->setUrl(m_view->url()); 85​ bookmark->setUrl(m_view->url());
86​ bookmark->setKeyword(ui->keyword->text());
85 m_bookmarks->addBookmark(ui->folderButton->selectedFolder(), bookmark); 87​ m_bookmarks->addBookmark(ui->folderButton->selectedFolder(), bookmark);
86 } 88​ }
87 89​
Context not available.
96 98​
97 m_edited = true; 99​ m_edited = true;
98 ui->bookmarksButton->setText(tr("Update Bookmark")); 100​ ui->bookmarksButton->setText(tr("Update Bookmark"));
101​ ui->keyword->setText(m_bookmark->keyword());
99 ui->bookmarksButton->setFlat(true); 102​ ui->bookmarksButton->setFlat(true);
100} 103​}
101 104​
Context not available.
118 121​
119 // Init Bookmarks button 122​ // Init Bookmarks button
120 if (m_bookmark) { 123​ if (m_bookmark) {
124​
125​ QString keyword = m_bookmark->keyword();
126​ ui->keyword->setText(keyword);
121 ui->bookmarksButton->setText(tr("Remove from Bookmarks")); 127​ ui->bookmarksButton->setText(tr("Remove from Bookmarks"));
122 ui->bookmarksButton->setFlat(false); 128​ ui->bookmarksButton->setFlat(false);
123 129​
124 Q_ASSERT(m_bookmark->parent()); 130​ Q_ASSERT(m_bookmark->parent());
125 ui->folderButton->setSelectedFolder(m_bookmark->parent()); 131​ ui->folderButton->setSelectedFolder(m_bookmark->parent());
132​ connect(ui->keyword, &QLineEdit::textChanged, this, &BookmarksWidget::bookmarkEdited);
126 connect(ui->folderButton, &BookmarksFoldersButton::selectedFolderChanged, this, &BookmarksWidget::bookmarkEdited); 133​ connect(ui->folderButton, &BookmarksFoldersButton::selectedFolderChanged, this, &BookmarksWidget::bookmarkEdited);
127 } 134​ }
128 135​
129 connect(ui->speeddialButton, &QAbstractButton::clicked, this, &BookmarksWidget::toggleSpeedDial); 136​ connect(ui->speeddialButton, &QAbstractButton::clicked, this, &BookmarksWidget::toggleSpeedDial);
130 connect(ui->bookmarksButton, &QAbstractButton::clicked, this, &BookmarksWidget::toggleBookmark); 137​ connect(ui->bookmarksButton, &QAbstractButton::clicked, this, &BookmarksWidget::toggleBookmark);
131 138​
Context not available.