diff -Nru otter-browser-git-0.9.99~git20171117+r10~ubuntu17.04.1/debian/bzr-builder.manifest otter-browser-git-0.9.99~git20171118+r10~ubuntu17.04.1/debian/bzr-builder.manifest --- otter-browser-git-0.9.99~git20171117+r10~ubuntu17.04.1/debian/bzr-builder.manifest 2017-11-17 08:31:52.000000000 +0000 +++ otter-browser-git-0.9.99~git20171118+r10~ubuntu17.04.1/debian/bzr-builder.manifest 2017-11-18 08:32:16.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.3 deb-version {debupstream}20171117+r10 -lp:~otter-browser/otter-browser/master revid:git-v1:d2c224e5fca3f608df638d70fb1e44dc88fc67a4 +# bzr-builder format 0.3 deb-version {debupstream}20171118+r10 +lp:~otter-browser/otter-browser/master revid:git-v1:a026c6193a1859c153874d67b467001746a00371 merge packaging lp:~otter-browser/otter-browser/otter-debian-master revid:michal@emdek.pl-20170810084252-z7v6ywkh1t16ycm4 diff -Nru otter-browser-git-0.9.99~git20171117+r10~ubuntu17.04.1/debian/changelog otter-browser-git-0.9.99~git20171118+r10~ubuntu17.04.1/debian/changelog --- otter-browser-git-0.9.99~git20171117+r10~ubuntu17.04.1/debian/changelog 2017-11-17 08:31:52.000000000 +0000 +++ otter-browser-git-0.9.99~git20171118+r10~ubuntu17.04.1/debian/changelog 2017-11-18 08:32:16.000000000 +0000 @@ -1,8 +1,8 @@ -otter-browser-git (0.9.99~git20171117+r10~ubuntu17.04.1) zesty; urgency=low +otter-browser-git (0.9.99~git20171118+r10~ubuntu17.04.1) zesty; urgency=low * Auto build. - -- Launchpad Package Builder Fri, 17 Nov 2017 08:31:52 +0000 + -- Launchpad Package Builder Sat, 18 Nov 2017 08:32:16 +0000 otter-browser-git (0.9.99~git-1~precise~ppa1) precise; urgency=medium Binary files /tmp/tmppmt7pc/g0Ril1Mch5/otter-browser-git-0.9.99~git20171117+r10~ubuntu17.04.1/resources/translations/otter-browser_da.qm and /tmp/tmppmt7pc/Tik6sdktLK/otter-browser-git-0.9.99~git20171118+r10~ubuntu17.04.1/resources/translations/otter-browser_da.qm differ diff -Nru otter-browser-git-0.9.99~git20171117+r10~ubuntu17.04.1/resources/translations/otter-browser_da.ts otter-browser-git-0.9.99~git20171118+r10~ubuntu17.04.1/resources/translations/otter-browser_da.ts --- otter-browser-git-0.9.99~git20171117+r10~ubuntu17.04.1/resources/translations/otter-browser_da.ts 2017-11-17 08:31:45.000000000 +0000 +++ otter-browser-git-0.9.99~git20171118+r10~ubuntu17.04.1/resources/translations/otter-browser_da.ts 2017-11-18 08:32:09.000000000 +0000 @@ -984,7 +984,7 @@ Expires: - + Udløber: @@ -1024,7 +1024,7 @@ Expires - + Udløber @@ -1256,7 +1256,7 @@ Value: - + Værdi: @@ -1422,7 +1422,7 @@ Invalid - + Ugyldig @@ -1440,12 +1440,12 @@ Current Value: - + Nuværende værdi: Default Value: - + Standardværdi: @@ -1460,7 +1460,7 @@ Name - + Navn @@ -1470,13 +1470,13 @@ Value - + Værdi Question - + Spørgsmål @@ -1502,7 +1502,7 @@ Save Value - + Gem værdi @@ -1535,12 +1535,12 @@ General - + Generelt Profiles - + Profiler @@ -1617,7 +1617,7 @@ Active Profiles - + Aktive profiler @@ -1637,7 +1637,7 @@ pop-up - + pop op @@ -1647,17 +1647,17 @@ script - + script image - + billede object - + objekt @@ -1701,7 +1701,7 @@ Never - + Aldrig @@ -1719,7 +1719,7 @@ Unknown - + Ukendt @@ -1749,7 +1749,7 @@ Privacy - + Privatliv @@ -1806,22 +1806,22 @@ Name: - + Navn: Value: - + Værdi: Expires: - + Udløber: this session only - + kun denne session @@ -1832,12 +1832,12 @@ Domain: - + Domæne: Path: - + Sti: @@ -1870,27 +1870,27 @@ Name: - + Navn: Value: - + Værdi: Expires: - + Udløber: Domain: - + Domæne: Path: - + Sti: @@ -1912,7 +1912,7 @@ Question - + Spørgsmål @@ -2003,24 +2003,24 @@ Network - + Netværk Security - + Sikkerhed CSS - + CSS JS - + JS @@ -2031,7 +2031,7 @@ Clear - + Ryd @@ -2041,12 +2041,12 @@ Close - + Luk All Tabs - + Alle faneblade @@ -2061,7 +2061,7 @@ Copy - + Kopiér @@ -2192,7 +2192,7 @@ Today - + I dag @@ -2222,7 +2222,7 @@ Older - + Ældre @@ -2309,7 +2309,7 @@ HTML Bookmarks - + HTML-bogmærker @@ -2329,17 +2329,17 @@ Select Icon - + Vælg ikon Images (*.png *.jpg *.bmp *.gif *.ico) - + Billeder (*.png *.jpg *.bmp *.gif *.ico) Icon Name: - + Ikonavn: @@ -2392,12 +2392,12 @@ Alternative text: - + Alternativ tekst: Long description: - + Lang beskrivelse: @@ -2409,22 +2409,22 @@ %1 GB (%2 bytes) - + %1 GB (%2 bytes) %1 MB (%2 bytes) - + %1 MB (%2 bytes) %1 KB (%2 bytes) - + %1 KB (%2 bytes) %1 B - + %1 B @@ -2453,12 +2453,12 @@ Source: - + Kilde: Results - + Resultater @@ -2547,19 +2547,19 @@ Ask - + Spørg Always - + Altid Never - + Aldrig @@ -2568,7 +2568,7 @@ (Untitled) - + (unavngivet) @@ -2576,12 +2576,12 @@ Profile Configuration - + Profilkonfiguration Actions - + Handlinger @@ -2611,37 +2611,37 @@ Description: - + Beskrivelse: Version: - + Version: Author: - + Forfatter: Status - + Status Action - + Handling Parameters - + Parametre Shortcut - + Genvej @@ -2651,7 +2651,7 @@ unknown action - + ukendt handling @@ -2679,7 +2679,7 @@ Name - + Navn @@ -2717,7 +2717,7 @@ System - + System @@ -2740,7 +2740,7 @@ Question - + Spørgsmål @@ -2841,7 +2841,7 @@ Menu - + Menu @@ -2869,7 +2869,7 @@ (Untitled) - + (unavngivet) @@ -2882,7 +2882,7 @@ Actions - + Handlinger @@ -2914,17 +2914,17 @@ Description: - + Beskrivelse: Version: - + Version: Author: - + Forfatter: @@ -2934,7 +2934,7 @@ Link - + Link @@ -2974,17 +2974,17 @@ Steps - + Trin Step - + Trin Select Action - + Vælg handling @@ -3254,7 +3254,7 @@ Save - + Gem @@ -3282,12 +3282,12 @@ Name - + Navn Value - + Værdi @@ -3299,7 +3299,7 @@ Question - + Spørgsmål @@ -3888,7 +3888,7 @@ Value - + Værdi @@ -3999,7 +3999,7 @@ Question - + Spørgsmål @@ -4503,7 +4503,7 @@ Expires - + Udløber @@ -4607,7 +4607,7 @@ Question - + Spørgsmål @@ -4908,7 +4908,7 @@ Question - + Spørgsmål @@ -5086,7 +5086,7 @@ Question - + Spørgsmål @@ -5364,7 +5364,7 @@ Value - + Værdi @@ -5374,7 +5374,7 @@ Question - + Spørgsmål @@ -5621,7 +5621,7 @@ Color: - + Farve: @@ -5631,7 +5631,7 @@ Automatic - + Automatisk @@ -5641,7 +5641,7 @@ % - + % @@ -5671,12 +5671,12 @@ Stretch - + Stræk Tile - + Fliselæg @@ -5699,7 +5699,7 @@ Reload - + Genindlæs @@ -5728,7 +5728,7 @@ Continue session - + Fortsæt session @@ -5794,7 +5794,7 @@ Question - + Spørgsmål @@ -5804,7 +5804,7 @@ Do you want to continue? - + Vil du fortsætte? @@ -5856,7 +5856,7 @@ Name: - + Navn: @@ -5928,7 +5928,7 @@ px - + px @@ -5938,7 +5938,7 @@ No limit - + Ingen grænse @@ -5991,12 +5991,12 @@ Icon only - + Kun ikon Text only - + Kun tekst @@ -6032,12 +6032,12 @@ Icon: - + Ikon: Text: - + Tekst: @@ -6047,7 +6047,7 @@ Global - + Globalt @@ -6067,7 +6067,7 @@ Menu - + Menu @@ -6313,7 +6313,7 @@ Question - + Spørgsmål @@ -6409,12 +6409,12 @@ Source: - + Kilde: Target: - + Mål: @@ -6436,7 +6436,7 @@ Stop - + Stop @@ -6447,12 +6447,12 @@ Status - + Status Filename - + Filnavn @@ -6472,7 +6472,7 @@ Speed - + Hastighed @@ -6607,7 +6607,7 @@ Details… - + Detaljer… @@ -6667,7 +6667,7 @@ Value: - + Værdi: @@ -6692,7 +6692,7 @@ Platform - + Platform @@ -6710,7 +6710,7 @@ Question - + Spørgsmål @@ -6811,12 +6811,12 @@ General - + Generelt Information - + Information @@ -6826,7 +6826,7 @@ Encoding: - + Kodning: @@ -6937,7 +6937,7 @@ Expires on: - + Udløber den: @@ -7037,7 +7037,7 @@ Never - + Aldrig @@ -7050,7 +7050,7 @@ Always - + Altid @@ -7077,7 +7077,7 @@ Ask - + Spørg @@ -7087,7 +7087,7 @@ URL - + URL @@ -7110,7 +7110,7 @@ Content - + Indhold @@ -7124,12 +7124,12 @@ Plugins: - + Plugins: Encoding: - + Kodning: @@ -7139,7 +7139,7 @@ Images: - + Billeder: @@ -7249,7 +7249,7 @@ Network - + Netværk @@ -7274,7 +7274,7 @@ Profiles: - + Profiler: @@ -7291,7 +7291,7 @@ Ask - + Spørg @@ -7311,7 +7311,7 @@ All images - + Alle billeder @@ -7344,14 +7344,14 @@ Always - + Altid Never - + Aldrig @@ -7382,7 +7382,7 @@ Expires - + Udløber @@ -7397,27 +7397,27 @@ Domain - + Domæne Name - + Navn Path - + Sti Value - + Værdi Expiration date - + Udløbsdato @@ -7435,12 +7435,12 @@ New tab - + Nyt faneblad New private tab - + Nyt privat faneblad @@ -7638,7 +7638,7 @@ Run Macro - + Kør makro @@ -7648,7 +7648,7 @@ New Tab - + Nyt faneblad @@ -7668,12 +7668,12 @@ Open… - + Åbn… Save… - + Gem… @@ -7943,7 +7943,7 @@ Reload - + Genindlæs @@ -7968,7 +7968,7 @@ Save Image… - + Gem billede… @@ -7983,7 +7983,7 @@ Reload Image - + Genindlæs billede @@ -7993,7 +7993,7 @@ Save Media… - + Gem medie… @@ -8851,7 +8851,7 @@ Plugins - + Plugins @@ -8866,7 +8866,7 @@ Pop-Ups - + Pop op'er @@ -8877,7 +8877,7 @@ This Folder - + Denne mappe @@ -8904,7 +8904,7 @@ Expires - + Udløber @@ -9019,12 +9019,12 @@ Save Video… - + Gem video… Save Audio… - + Gem lyd… @@ -9565,7 +9565,7 @@ Save File - + Gem fil Binary files /tmp/tmppmt7pc/g0Ril1Mch5/otter-browser-git-0.9.99~git20171117+r10~ubuntu17.04.1/resources/translations/otter-browser_pl.qm and /tmp/tmppmt7pc/Tik6sdktLK/otter-browser-git-0.9.99~git20171118+r10~ubuntu17.04.1/resources/translations/otter-browser_pl.qm differ diff -Nru otter-browser-git-0.9.99~git20171117+r10~ubuntu17.04.1/resources/translations/otter-browser_pl.ts otter-browser-git-0.9.99~git20171118+r10~ubuntu17.04.1/resources/translations/otter-browser_pl.ts --- otter-browser-git-0.9.99~git20171117+r10~ubuntu17.04.1/resources/translations/otter-browser_pl.ts 2017-11-17 08:31:45.000000000 +0000 +++ otter-browser-git-0.9.99~git20171118+r10~ubuntu17.04.1/resources/translations/otter-browser_pl.ts 2017-11-18 08:32:09.000000000 +0000 @@ -243,7 +243,7 @@ Open Addon File - Otwórz plik dodatków + Otwórz plik dodatku diff -Nru otter-browser-git-0.9.99~git20171117+r10~ubuntu17.04.1/src/core/NetworkManager.cpp otter-browser-git-0.9.99~git20171118+r10~ubuntu17.04.1/src/core/NetworkManager.cpp --- otter-browser-git-0.9.99~git20171117+r10~ubuntu17.04.1/src/core/NetworkManager.cpp 2017-11-17 08:31:45.000000000 +0000 +++ otter-browser-git-0.9.99~git20171118+r10~ubuntu17.04.1/src/core/NetworkManager.cpp 2017-11-18 08:32:09.000000000 +0000 @@ -79,7 +79,7 @@ { if (NetworkManagerFactory::usesSystemProxyAuthentication()) { - authenticator->setUser(QString()); + authenticator->setUser({}); return; } diff -Nru otter-browser-git-0.9.99~git20171117+r10~ubuntu17.04.1/src/core/NotificationsManager.cpp otter-browser-git-0.9.99~git20171118+r10~ubuntu17.04.1/src/core/NotificationsManager.cpp --- otter-browser-git-0.9.99~git20171117+r10~ubuntu17.04.1/src/core/NotificationsManager.cpp 2017-11-17 08:31:45.000000000 +0000 +++ otter-browser-git-0.9.99~git20171118+r10~ubuntu17.04.1/src/core/NotificationsManager.cpp 2017-11-18 08:32:09.000000000 +0000 @@ -26,7 +26,6 @@ #include #include #include -#include #include namespace Otter @@ -117,7 +116,13 @@ } else { - QTimer::singleShot(10000, effect, &QSoundEffect::deleteLater); + connect(effect, &QSoundEffect::playingChanged, m_instance, [=]() + { + if (!effect->isPlaying()) + { + effect->deleteLater(); + } + }); effect->play(); } @@ -159,35 +164,30 @@ { if (identifier < 0 || identifier >= m_definitions.count()) { - return EventDefinition(); + return {}; } const QSettings notificationsSettings(SessionsManager::getReadableDataPath(QLatin1String("notifications.ini")), QSettings::IniFormat); const QString eventName(getEventName(identifier)); + EventDefinition definition(m_definitions.at(identifier)); + definition.playSound = notificationsSettings.value(eventName + QLatin1String("/playSound"), {}).toString(); + definition.showAlert = notificationsSettings.value(eventName + QLatin1String("/showAlert"), false).toBool(); + definition.showNotification = notificationsSettings.value(eventName + QLatin1String("/showNotification"), false).toBool(); - m_definitions[identifier].playSound = notificationsSettings.value(eventName + QLatin1String("/playSound"), QString()).toString(); - m_definitions[identifier].showAlert = notificationsSettings.value(eventName + QLatin1String("/showAlert"), false).toBool(); - m_definitions[identifier].showNotification = notificationsSettings.value(eventName + QLatin1String("/showNotification"), false).toBool(); - - return m_definitions[identifier]; + return definition; } QVector NotificationsManager::getEventDefinitions() { - QSettings notificationsSettings(SessionsManager::getReadableDataPath(QLatin1String("notifications.ini")), QSettings::IniFormat); + QVector definitions; + definitions.reserve(m_definitions.count()); for (int i = 0; i < m_definitions.count(); ++i) { - notificationsSettings.beginGroup(getEventName(i)); - - m_definitions[i].playSound = notificationsSettings.value(QLatin1String("playSound")).toString(); - m_definitions[i].showAlert = notificationsSettings.value(QLatin1String("showAlert")).toBool(); - m_definitions[i].showNotification = notificationsSettings.value(QLatin1String("showNotification")).toBool(); - - notificationsSettings.endGroup(); + definitions.append(getEventDefinition(i)); } - return m_definitions; + return definitions; } int NotificationsManager::registerEvent(const QString &title, const QString &description) diff -Nru otter-browser-git-0.9.99~git20171117+r10~ubuntu17.04.1/src/modules/widgets/address/AddressWidget.cpp otter-browser-git-0.9.99~git20171118+r10~ubuntu17.04.1/src/modules/widgets/address/AddressWidget.cpp --- otter-browser-git-0.9.99~git20171117+r10~ubuntu17.04.1/src/modules/widgets/address/AddressWidget.cpp 2017-11-17 08:31:45.000000000 +0000 +++ otter-browser-git-0.9.99~git20171118+r10~ubuntu17.04.1/src/modules/widgets/address/AddressWidget.cpp 2017-11-18 08:32:09.000000000 +0000 @@ -540,7 +540,10 @@ menu.addSeparator(); } - menu.addAction(tr("Remove this Icon"), this, SLOT(removeEntry()))->setData(entry); + QAction *removeEntryAction(menu.addAction(tr("Remove this Icon"))); + removeEntryAction->setData(entry); + + connect(removeEntryAction, &QAction::triggered, this, &AddressWidget::removeEntry); } const ToolBarWidget *toolBar(qobject_cast(parentWidget())); @@ -914,11 +917,11 @@ QString name(rawLayout.at(i) + QLatin1String("Entry")); name[0] = name.at(0).toUpper(); - const EntryIdentifier identifier(static_cast(metaObject()->enumerator(m_entryIdentifierEnumerator).keyToValue(name.toLatin1()))); + const EntryIdentifier entryIdentifier(static_cast(metaObject()->enumerator(m_entryIdentifierEnumerator).keyToValue(name.toLatin1()))); - if (identifier > UnknownEntry && !layout.contains(identifier)) + if (entryIdentifier > UnknownEntry && !layout.contains(entryIdentifier)) { - layout.append(identifier); + layout.append(entryIdentifier); } } diff -Nru otter-browser-git-0.9.99~git20171117+r10~ubuntu17.04.1/src/ui/LineEditWidget.cpp otter-browser-git-0.9.99~git20171118+r10~ubuntu17.04.1/src/ui/LineEditWidget.cpp --- otter-browser-git-0.9.99~git20171117+r10~ubuntu17.04.1/src/ui/LineEditWidget.cpp 2017-11-17 08:31:45.000000000 +0000 +++ otter-browser-git-0.9.99~git20171118+r10~ubuntu17.04.1/src/ui/LineEditWidget.cpp 2017-11-18 08:32:09.000000000 +0000 @@ -327,8 +327,7 @@ } else if (m_dropMode == ReplaceDropMode || m_dropMode == ReplaceAndNotifyDropMode) { - selectAll(); - del(); + clear(); insert(event->mimeData()->text()); if (m_dropMode == ReplaceAndNotifyDropMode) diff -Nru otter-browser-git-0.9.99~git20171117+r10~ubuntu17.04.1/src/ui/preferences/PreferencesAdvancedPageWidget.cpp otter-browser-git-0.9.99~git20171118+r10~ubuntu17.04.1/src/ui/preferences/PreferencesAdvancedPageWidget.cpp --- otter-browser-git-0.9.99~git20171117+r10~ubuntu17.04.1/src/ui/preferences/PreferencesAdvancedPageWidget.cpp 2017-11-17 08:31:45.000000000 +0000 +++ otter-browser-git-0.9.99~git20171118+r10~ubuntu17.04.1/src/ui/preferences/PreferencesAdvancedPageWidget.cpp 2017-11-18 08:32:09.000000000 +0000 @@ -43,7 +43,6 @@ #include #include #include -#include #include #include #include @@ -462,7 +461,13 @@ } else { - QTimer::singleShot(10000, effect, &QSoundEffect::deleteLater); + connect(effect, &QSoundEffect::playingChanged, this, [=]() + { + if (!effect->isPlaying()) + { + effect->deleteLater(); + } + }); effect->play(); }