Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

Merge pull request #564 from ff2000/bookmarks_simplified_1.3.5

Browse Source 
Take the edited page title into account
This commit is contained in:
David Rosca 2012-09-10 09:05:58 -07:00
commit a15f0bd0ee
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/bookmarks/bookmarkswidget.cpp
View File

@ -49,7 +49,8 @@ BookmarksWidget::BookmarksWidget(QupZilla* mainClass, WebView* view, QWidget* pa
if (m_bookmarkId > 0) {
connect(ui->saveRemove, SIGNAL(clicked()), this, SLOT(removeBookmark()));
ui->saveRemove->setText(tr("Remove"));
} else {
}
else {
connect(ui->saveRemove, SIGNAL(clicked()), this, SLOT(saveBookmark()));
}
connect(ui->speeddialButton, SIGNAL(clicked()), this, SLOT(toggleSpeedDial()));
@ -87,7 +88,8 @@ void BookmarksWidget::loadBookmark()
ui->name->setEnabled(false);
ui->folder->setEnabled(false);
} else {
}
else {
ui->name->setText(m_view->title());
ui->folder->setCurrentIndex(0);
}
@ -95,8 +97,9 @@ void BookmarksWidget::loadBookmark()
ui->name->setCursorPosition(0);
}
namespace {
const int hideDelay = 270;
namespace
{
const int hideDelay = 270;
}
void BookmarksWidget::removeBookmark()
@ -108,8 +111,7 @@ void BookmarksWidget::removeBookmark()
void BookmarksWidget::saveBookmark()
{
// m_bookmarksModel->editBookmark(m_bookmarkId, ui->name->text(), QUrl(), ui->folder->itemData(ui->folder->currentIndex()).toString());
m_bookmarksModel->saveBookmark(m_view, ui->folder->currentText());
m_bookmarksModel->saveBookmark(m_url, ui->name->text(), m_view->icon(), ui->folder->currentText());
QTimer::singleShot(hideDelay, this, SLOT(close()));
}