From 46edc8d5a2d159e62d69681dfb2bd9cd51f5b758 Mon Sep 17 00:00:00 2001 From: nowrep Date: Wed, 18 Jan 2012 15:05:50 +0100 Subject: [PATCH] Added option to edit bookmark from context menu in bookmarks toolbar. - also added new function to Speed Dial to be able to get path of background image file - closes #189 --- bin/locale/cs_CZ.qm | Bin 87419 -> 87900 bytes src/bookmarks/bookmarkstoolbar.cpp | 52 +++++++++++++++++++++++++++++ src/bookmarks/bookmarkstoolbar.h | 3 ++ src/plugins/speeddial.cpp | 5 +++ src/plugins/speeddial.h | 3 ++ translations/cs_CZ.ts | 46 +++++++++++++++++++++---- translations/de_DE.ts | 42 +++++++++++++++++++---- translations/el_GR.ts | 42 +++++++++++++++++++---- translations/empty.ts | 42 +++++++++++++++++++---- translations/es_ES.ts | 42 +++++++++++++++++++---- translations/fr_FR.ts | 42 +++++++++++++++++++---- translations/it_IT.ts | 42 +++++++++++++++++++---- translations/nl_NL.ts | 42 +++++++++++++++++++---- translations/pl_PL.ts | 42 +++++++++++++++++++---- translations/pt_PT.ts | 42 +++++++++++++++++++---- translations/ru_RU.ts | 42 +++++++++++++++++++---- translations/sk_SK.ts | 24 +++++++++++++ translations/sr_BA.ts | 42 +++++++++++++++++++---- translations/sr_RS.ts | 42 +++++++++++++++++++---- translations/zh_CN.ts | 42 +++++++++++++++++++---- 20 files changed, 595 insertions(+), 84 deletions(-) diff --git a/bin/locale/cs_CZ.qm b/bin/locale/cs_CZ.qm index adde6a5d719629d1e6664e8eca09e9147340d9a7..b9b49eabd719a47ea25eca76d2cb6c2fbb084db8 100644 GIT binary patch delta 7139 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 R$1c`uX`>U#&g{C)e*t(hUpxQ+ delta 6869 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 diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp index 0d5c0be84..71cb1d572 100644 --- a/src/bookmarks/bookmarkstoolbar.cpp +++ b/src/bookmarks/bookmarkstoolbar.cpp @@ -86,6 +86,7 @@ void BookmarksToolbar::showBookmarkContextMenu(const QPoint &pos) QMenu menu; menu.addAction(IconProvider::fromTheme("go-next"), tr("Move right"), this, SLOT(moveRight()))->setData(buttonPointer); menu.addAction(IconProvider::fromTheme("go-previous"), tr("Move left"), this, SLOT(moveLeft()))->setData(buttonPointer); + menu.addAction(tr("Edit bookmark"), this, SLOT(editBookmark()))->setData(buttonPointer); menu.addSeparator(); menu.addAction(IconProvider::fromTheme("list-remove"), tr("Remove bookmark"), this, SLOT(removeButton()))->setData(buttonPointer); @@ -169,6 +170,57 @@ void BookmarksToolbar::moveLeft() m_layout->insertWidget(index - 1, w); } +void BookmarksToolbar::editBookmark() +{ + QAction* act = qobject_cast (sender()); + if (!act) { + return; + } + + ToolButton* button = static_cast(act->data().value()); + if (!button) { + return; + } + + Bookmark b = button->data().value(); + + QDialog* dialog = new QDialog(this); + QFormLayout* layout = new QFormLayout(dialog); + QLabel* label = new QLabel(dialog); + QLineEdit* editUrl = new QLineEdit(dialog); + QLineEdit* editTitle = new QLineEdit(dialog); + QDialogButtonBox* box = new QDialogButtonBox(dialog); + box->addButton(QDialogButtonBox::Ok); + box->addButton(QDialogButtonBox::Cancel); + connect(box, SIGNAL(rejected()), dialog, SLOT(reject())); + connect(box, SIGNAL(accepted()), dialog, SLOT(accept())); + + label->setText(tr("Edit bookmark: ")); + layout->addRow(label); + layout->addRow(new QLabel(tr("Title: ")), editTitle); + layout->addRow(new QLabel(tr("Url: ")), editUrl); + layout->addRow(box); + + editUrl->setText(b.url.toString()); + editTitle->setText(b.title); + + dialog->setWindowTitle(tr("Edit Bookmark")); + dialog->setMinimumSize(400, 100); + dialog->exec(); + if (dialog->result() == QDialog::Rejected) { + return; + } + + QString url = editUrl->text(); + QString title = editTitle->text(); + + if (url.isEmpty() || title.isEmpty()) { + return; + } + + m_bookmarksModel->editBookmark(b.id, title, url, b.folder); +} + void BookmarksToolbar::removeButton() { QAction* act = qobject_cast (sender()); diff --git a/src/bookmarks/bookmarkstoolbar.h b/src/bookmarks/bookmarkstoolbar.h index c57c8f802..d4fbafeb4 100644 --- a/src/bookmarks/bookmarkstoolbar.h +++ b/src/bookmarks/bookmarkstoolbar.h @@ -21,6 +21,8 @@ #include #include #include +#include +#include #include #include "bookmarksmodel.h" @@ -54,6 +56,7 @@ private slots: void moveRight(); void moveLeft(); + void editBookmark(); void removeButton(); void hidePanel(); diff --git a/src/plugins/speeddial.cpp b/src/plugins/speeddial.cpp index 07d1220fd..79fb5a11c 100644 --- a/src/plugins/speeddial.cpp +++ b/src/plugins/speeddial.cpp @@ -196,6 +196,11 @@ void SpeedDial::removeImageForUrl(const QString &url) } } +QString SpeedDial::getOpenFileName() +{ + return QFileDialog::getOpenFileName(0, tr("Select image..."), QDir::homePath(), "(*.png *.jpg *.jpeg)"); +} + void SpeedDial::thumbnailCreated(const QPixmap &image) { PageThumbnailer* thumbnailer = qobject_cast(sender()); diff --git a/src/plugins/speeddial.h b/src/plugins/speeddial.h index f1db17e9a..30aa582f7 100644 --- a/src/plugins/speeddial.h +++ b/src/plugins/speeddial.h @@ -24,6 +24,7 @@ #include #include #include +#include class PageThumbnailer; class SpeedDial : public QObject @@ -49,6 +50,8 @@ public slots: Q_INVOKABLE void loadThumbnail(const QString &url, bool loadTitle = false); Q_INVOKABLE void removeImageForUrl(const QString &url); + Q_INVOKABLE QString getOpenFileName(); + private slots: void thumbnailCreated(const QPixmap &image); diff --git a/translations/cs_CZ.ts b/translations/cs_CZ.ts index a9160dbb2..0ebc7f8ab 100644 --- a/translations/cs_CZ.ts +++ b/translations/cs_CZ.ts @@ -706,23 +706,52 @@ Posunout doleva - + + Edit bookmark + Upravit záložku + + + Remove bookmark Odstranit záložku - + + Edit bookmark: + Upravit záložku: + + + + Title: + Titulek: + + + + Url: + Url: + + + URL: + Url: + + + + Edit Bookmark + Upravit záložku + + + Most visited Nejnavštěvovanější - + Sites you visited the most Nejvíce navštěvované stránky - - + + Empty Prázdný @@ -4039,7 +4068,12 @@ Po přidání či odstranění cest k certifikátům je nutné k projevení změ SpeedDial - + + Select image... + Zvolte obrázek... + + + Unable to load Nepodařilo se načíst diff --git a/translations/de_DE.ts b/translations/de_DE.ts index b36b859c2..fdeb210e0 100644 --- a/translations/de_DE.ts +++ b/translations/de_DE.ts @@ -706,23 +706,48 @@ Nach links - + + Edit bookmark + + + + Remove bookmark Lesezeichen entfernen - + + Edit bookmark: + + + + + Title: + + + + + Url: + + + + + Edit Bookmark + + + + Most visited Meistbesuchte - + Sites you visited the most Meistbesuchte Seiten - - + + Empty Leer @@ -4039,7 +4064,12 @@ Nachdem Speicherpfade hinzugefügt oder gelöscht wurden, muss QupZilla neu gest SpeedDial - + + Select image... + + + + Unable to load Laden nicht möglich diff --git a/translations/el_GR.ts b/translations/el_GR.ts index 5dac1c465..f1a7b8261 100644 --- a/translations/el_GR.ts +++ b/translations/el_GR.ts @@ -706,23 +706,48 @@ Μετακίνηση αριστερά - + + Edit bookmark + + + + Remove bookmark Αφαίρεση σελιδοδείκτη - + + Edit bookmark: + + + + + Title: + + + + + Url: + + + + + Edit Bookmark + + + + Most visited Πιο δημοφιλείς - + Sites you visited the most Σελίδες που επισκεφτήκατε περισσότερο - - + + Empty Άδειο @@ -4037,7 +4062,12 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla SpeedDial - + + Select image... + + + + Unable to load Αδυναμία φόρτωσης diff --git a/translations/empty.ts b/translations/empty.ts index ce0e071d2..13215d014 100644 --- a/translations/empty.ts +++ b/translations/empty.ts @@ -698,23 +698,48 @@ - + + Edit bookmark + + + + Remove bookmark - + + Edit bookmark: + + + + + Title: + + + + + Url: + + + + + Edit Bookmark + + + + Most visited - + Sites you visited the most - - + + Empty @@ -4011,7 +4036,12 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla SpeedDial - + + Select image... + + + + Unable to load diff --git a/translations/es_ES.ts b/translations/es_ES.ts index fa999c9f1..e784551bd 100644 --- a/translations/es_ES.ts +++ b/translations/es_ES.ts @@ -706,23 +706,48 @@ Mover a la izquierda - + + Edit bookmark + + + + Remove bookmark Eliminar marcador - + + Edit bookmark: + + + + + Title: + + + + + Url: + + + + + Edit Bookmark + + + + Most visited Más visitados - + Sites you visited the most Sitios más visitados - - + + Empty Vacío @@ -4036,7 +4061,12 @@ Después de añadir o eliminar rutas de certificados, es necesario reiniciar Qup SpeedDial - + + Select image... + + + + Unable to load No se puede cargar diff --git a/translations/fr_FR.ts b/translations/fr_FR.ts index 8d43359f7..661b0fefb 100644 --- a/translations/fr_FR.ts +++ b/translations/fr_FR.ts @@ -709,23 +709,48 @@ Déplacer vers la gauche - + + Edit bookmark + + + + Remove bookmark Supprimer le marque-page - + + Edit bookmark: + + + + + Title: + + + + + Url: + + + + + Edit Bookmark + + + + Most visited Plus visités - + Sites you visited the most Sites les plus visités - - + + Empty Vide @@ -4040,7 +4065,12 @@ Après avoir ajouté ou retiré un certificat, il est nécessaire de redémarrer SpeedDial - + + Select image... + + + + Unable to load Impossible d'actualiser diff --git a/translations/it_IT.ts b/translations/it_IT.ts index 02e168650..3786e0a03 100644 --- a/translations/it_IT.ts +++ b/translations/it_IT.ts @@ -706,23 +706,48 @@ Sposta a sinistra - + + Edit bookmark + + + + Remove bookmark Rimuovi segnalibro - + + Edit bookmark: + + + + + Title: + + + + + Url: + + + + + Edit Bookmark + + + + Most visited Più visitati - + Sites you visited the most Siti che visiti più spesso - - + + Empty Vuoto @@ -4039,7 +4064,12 @@ Dopo l'aggiunta o la rimozione dei percorsi di certificazione, è necessari SpeedDial - + + Select image... + + + + Unable to load Caricamento impossibile diff --git a/translations/nl_NL.ts b/translations/nl_NL.ts index 340d082b2..e5014ea9d 100644 --- a/translations/nl_NL.ts +++ b/translations/nl_NL.ts @@ -706,23 +706,48 @@ Verplaats naar links - + + Edit bookmark + + + + Remove bookmark Verwijder bladwijzer - + + Edit bookmark: + + + + + Title: + + + + + Url: + + + + + Edit Bookmark + + + + Most visited Meest bezocht - + Sites you visited the most Websites die u het meest bezocht heeft - - + + Empty Leeg @@ -4039,7 +4064,12 @@ Na het toevoegen of verwijderen van paden, is het noodzakelijk om de browser te SpeedDial - + + Select image... + + + + Unable to load Niet in staat om te laden diff --git a/translations/pl_PL.ts b/translations/pl_PL.ts index f7b638160..4e25d6355 100644 --- a/translations/pl_PL.ts +++ b/translations/pl_PL.ts @@ -707,23 +707,48 @@ Przesuń w lewo - + + Edit bookmark + + + + Remove bookmark Usuń zakładkę - + + Edit bookmark: + + + + + Title: + + + + + Url: + + + + + Edit Bookmark + + + + Most visited Najczęściej odwiedzane - + Sites you visited the most Strony które często odwiedzasz - - + + Empty Pusto @@ -4040,7 +4065,12 @@ Po dodaniu lub usunięciu ścieżki certyfikatu, konieczne jest ponowne uruchomi SpeedDial - + + Select image... + + + + Unable to load Nie można wczytać diff --git a/translations/pt_PT.ts b/translations/pt_PT.ts index 07ed578ea..f22ef72dd 100755 --- a/translations/pt_PT.ts +++ b/translations/pt_PT.ts @@ -706,23 +706,48 @@ Mover para a esquerda - + + Edit bookmark + + + + Remove bookmark Remover marcador - + + Edit bookmark: + + + + + Title: + + + + + Url: + + + + + Edit Bookmark + + + + Most visited Mais visitados - + Sites you visited the most As páginas mais visitadas - - + + Empty Vazio @@ -4036,7 +4061,12 @@ Após adicionar ou remover os caminhos dos certificados, tem que reiniciar o Qup SpeedDial - + + Select image... + + + + Unable to load Incapaz de carregar diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index c0ea0d813..2101c459f 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -709,23 +709,48 @@ Назад - + + Edit bookmark + + + + Remove bookmark Удалить закладку - + + Edit bookmark: + + + + + Title: + + + + + Url: + + + + + Edit Bookmark + + + + Most visited Самые посещаемые - + Sites you visited the most Самые посещаемые вами сайты - - + + Empty Пусто @@ -4049,7 +4074,12 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla SpeedDial - + + Select image... + + + + Unable to load Невозможно загрузить diff --git a/translations/sk_SK.ts b/translations/sk_SK.ts index eda7f0646..64281d39f 100644 --- a/translations/sk_SK.ts +++ b/translations/sk_SK.ts @@ -574,6 +574,26 @@ Bookmark &All Tabs Pridať všetky k&arty do záložiek + + Edit bookmark + + + + Edit bookmark: + + + + Title: + + + + Edit Bookmark + + + + Url: + + BookmarksWidget @@ -3217,6 +3237,10 @@ Po pridaní či odobratí ciest k certifikátom je nutné reštartovať prehliad Unable to load Nepodarilo sa načítať + + Select image... + + TabBar diff --git a/translations/sr_BA.ts b/translations/sr_BA.ts index 60f0777bd..5717abf95 100644 --- a/translations/sr_BA.ts +++ b/translations/sr_BA.ts @@ -698,23 +698,48 @@ Помјери лијево - + + Edit bookmark + + + + Remove bookmark Уклони обиљеживач - + + Edit bookmark: + + + + + Title: + + + + + Url: + + + + + Edit Bookmark + + + + Most visited Најпосјећеније - + Sites you visited the most Сајтови које сте највише посјећивали - - + + Empty Празно @@ -4016,7 +4041,12 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla SpeedDial - + + Select image... + + + + Unable to load Не могу да учитам diff --git a/translations/sr_RS.ts b/translations/sr_RS.ts index b53d675c6..955077cbe 100644 --- a/translations/sr_RS.ts +++ b/translations/sr_RS.ts @@ -698,23 +698,48 @@ Помери лево - + + Edit bookmark + + + + Remove bookmark Уклони обележивач - + + Edit bookmark: + + + + + Title: + + + + + Url: + + + + + Edit Bookmark + + + + Most visited Најпосећеније - + Sites you visited the most Сајтови које сте највише посећивали - - + + Empty Празно @@ -4016,7 +4041,12 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla SpeedDial - + + Select image... + + + + Unable to load Не могу да учитам diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts index 21a3cc01c..8db3595d5 100644 --- a/translations/zh_CN.ts +++ b/translations/zh_CN.ts @@ -702,23 +702,48 @@ 向左移动 - + + Edit bookmark + + + + Remove bookmark 删除书签 - + + Edit bookmark: + + + + + Title: + + + + + Url: + + + + + Edit Bookmark + + + + Most visited - + Sites you visited the most 您最常访问的网站 - - + + Empty 空页面 @@ -4028,7 +4053,12 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla SpeedDial - + + Select image... + + + + Unable to load 无法加载