Hello community, here is the log from the commit of package leechcraft for openSUSE:Factory checked in at 2013-07-16 15:34:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/leechcraft (Old) and /work/SRC/openSUSE:Factory/.leechcraft.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "leechcraft" Changes: -------- --- /work/SRC/openSUSE:Factory/leechcraft/leechcraft-doc.changes 2013-07-05 15:05:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.leechcraft.new/leechcraft-doc.changes 2013-07-16 15:34:55.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 12 21:10:02 UTC 2013 - dap.darkness@gmail.com + +- 0.5.99 bugfix release. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/leechcraft/leechcraft.changes 2013-07-05 15:05:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.leechcraft.new/leechcraft.changes 2013-07-16 15:34:55.000000000 +0200 @@ -1,0 +2,22 @@ +Fri Jul 12 21:10:46 UTC 2013 - dap.darkness@gmail.com + +- 0.5.99 bugfix release: + * AN: fixed a typo in user string. + * AN: updated English and Russian translations. + * Azoth: auto-request logs for MUC participants as well. + * Azoth: fixed font zooming in fixed-font MUCs. + * Azoth CH: don't test the entry type, leave that to core. + * LMP: fixed a segfault on removable device removal in sync widget. + * Lemon: added Qwt 6.1 compatibility. + * Liznoo: added Qwt 6.1 compatibility. + * Monocle Mu: depend on openjpeg and jbig2dec, required by mupdf. + * Poshuku CleanWeb: fixed a rare segfault. +- openSUSE 12.1 became EOL and unsupported by upstream: + * leechcraft-acetamide-qt47.patch was deleted; + * if-sections were deleted; + * gcc version required to build was incremented. +- Forgotten doc dependencies were deleted (doxygen, graphviz). +- Additional mupdf linking dependencies were added (jbig2dec, openjpeg). +- Conflict with Lcms 2.5+ was added as a workaround for bnc#828751. + +------------------------------------------------------------------- Old: ---- leechcraft-0.5.98.tar.xz leechcraft-acetamide-qt47.patch New: ---- leechcraft-0.5.99.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ leechcraft-doc.spec ++++++ --- /var/tmp/diff_new_pack.Tz0wcv/_old 2013-07-16 15:34:56.000000000 +0200 +++ /var/tmp/diff_new_pack.Tz0wcv/_new 2013-07-16 15:34:56.000000000 +0200 @@ -17,7 +17,7 @@ Name: leechcraft-doc -Version: 0.5.98 +Version: 0.5.99 Release: 0 Summary: Modular Internet Client Documentation License: BSL-1.0 ++++++ leechcraft.spec ++++++ ++++ 1022 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/leechcraft/leechcraft.spec ++++ and /work/SRC/openSUSE:Factory/.leechcraft.new/leechcraft.spec ++++++ leechcraft-0.5.98.tar.xz -> leechcraft-0.5.99.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.5.98/CHANGELOG new/leechcraft-0.5.99/CHANGELOG --- old/leechcraft-0.5.98/CHANGELOG 2013-07-02 10:52:46.000000000 +0200 +++ new/leechcraft-0.5.99/CHANGELOG 2013-07-13 11:04:11.000000000 +0200 @@ -1,6 +1,18 @@ This file lists only more or less major changes, refer to `git log` for the rest. +!!! 0.5.99 +* AN: fixed a typo in user string. +* AN: updated English and Russian translations. +* Azoth: auto-request logs for MUC participants as well. +* Azoth: fixed font zooming in fixed-font MUCs. +* Azoth CH: don't test the entry type, leave that to core. +* LMP: fixed a segfault on removable device removal in sync widget. +* Lemon: added Qwt 6.1 compatibility. +* Liznoo: added Qwt 6.1 compatibility. +* Monocle Mu: depend on openjpeg and jbig2dec, required by mupdf. +* Poshuku CleanWeb: fixed a rare segfault. + !!! 0.5.98 * Core: first show unassociated dock widgets. * Core: fixed some segfaults on tab closes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.5.98/src/core/application.cpp new/leechcraft-0.5.99/src/core/application.cpp --- old/leechcraft-0.5.98/src/core/application.cpp 2013-07-02 10:52:46.000000000 +0200 +++ new/leechcraft-0.5.99/src/core/application.cpp 2013-07-13 11:04:11.000000000 +0200 @@ -109,7 +109,7 @@ #endif std::exit (EVersionRequested); } - + QTextCodec::setCodecForCStrings (QTextCodec::codecForName ("UTF-8")); if (VarMap_.count ("no-app-catch")) @@ -200,7 +200,7 @@ this, SLOT (handleQuit ())); - Splash_ = new QSplashScreen (QPixmap (":/resources/images/apocalypse.png"), Qt::SplashScreen); + Splash_ = new QSplashScreen (QPixmap (":/resources/images/macaroni.jpg"), Qt::SplashScreen); Splash_->show (); Splash_->setUpdatesEnabled (true); Splash_->showMessage (tr ("Initializing LeechCraft..."), Qt::AlignLeft | Qt::AlignBottom, QColor ("#FF3000")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.5.98/src/core/mainresources.qrc new/leechcraft-0.5.99/src/core/mainresources.qrc --- old/leechcraft-0.5.98/src/core/mainresources.qrc 2013-07-02 10:52:46.000000000 +0200 +++ new/leechcraft-0.5.99/src/core/mainresources.qrc 2013-07-13 11:04:11.000000000 +0200 @@ -1,8 +1,8 @@ <RCC> - <qresource prefix="/" > + <qresource prefix="/"> <file>resources/images/leechcraft.svg</file> <file>resources/images/defaultpluginicon.svg</file> - <file>resources/images/splash.svg</file> - <file>resources/images/apocalypse.png</file> + <file>resources/images/splash.svg</file> + <file>resources/images/macaroni.jpg</file> </qresource> </RCC> Files old/leechcraft-0.5.98/src/core/resources/images/apocalypse.png and new/leechcraft-0.5.99/src/core/resources/images/apocalypse.png differ Files old/leechcraft-0.5.98/src/core/resources/images/macaroni.jpg and new/leechcraft-0.5.99/src/core/resources/images/macaroni.jpg differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.5.98/src/plugins/advancednotifications/leechcraft_advancednotifications_en.ts new/leechcraft-0.5.99/src/plugins/advancednotifications/leechcraft_advancednotifications_en.ts --- old/leechcraft-0.5.98/src/plugins/advancednotifications/leechcraft_advancednotifications_en.ts 2013-07-02 10:52:46.000000000 +0200 +++ new/leechcraft-0.5.99/src/plugins/advancednotifications/leechcraft_advancednotifications_en.ts 2013-07-13 11:04:11.000000000 +0200 @@ -35,9 +35,17 @@ </message> </context> <context> + <name>LeechCraft::AdvancedNotifications::EnableSoundActionManager</name> + <message> + <location filename="enablesoundactionmanager.cpp" line="40"/> + <source>Enable sound notifications</source> + <translation>Enable sound notifications</translation> + </message> +</context> +<context> <name>LeechCraft::AdvancedNotifications::MatchConfigDialog</name> <message> - <location filename="matchconfigdialog.cpp" line="131"/> + <location filename="matchconfigdialog.cpp" line="142"/> <source>Invalid matcher type %1.</source> <translation>Invalid matcher type %1.</translation> </message> @@ -45,173 +53,222 @@ <context> <name>LeechCraft::AdvancedNotifications::NotificationRulesWidget</name> <message> - <location filename="notificationruleswidget.cpp" line="59"/> + <location filename="notificationruleswidget.cpp" line="99"/> + <source>Field name</source> + <translation>Field name</translation> + </message> + <message> + <location filename="notificationruleswidget.cpp" line="100"/> + <source>Rule description</source> + <translation>Rule description</translation> + </message> + <message> + <location filename="notificationruleswidget.cpp" line="188"/> + <source><empty matcher></source> + <translation><empty matcher></translation> + </message> + <message> + <location filename="notificationruleswidget.cpp" line="201"/> + <source>The rule has been changed. Do you want to save it?</source> + <oldsource>The rule has been changed. Do you want to save it</oldsource> + <translation>The rule has been changed. Do you want to save it?</translation> + </message> + <message> + <location filename="notificationruleswidget.cpp" line="311"/> + <source>Are you sure you want to replace all rules with the default set?</source> + <translation>Are you sure you want to replace all rules with the default set?</translation> + </message> + <message> + <location filename="notificationruleswidget.cpp" line="395"/> + <source>Select audio file</source> + <translation>Select audio file</translation> + </message> + <message> + <location filename="notificationruleswidget.cpp" line="397"/> + <source>Audio files (*.ogg *.wav *.flac *.mp3);;All files (*.*)</source> + <translation>Audio files (*.ogg *.wav *.flac *.mp3);;All files (*.*)</translation> + </message> + <message> + <location filename="notificationruleswidget.cpp" line="432"/> + <source>Please enter the argument:</source> + <translation>Please enter the argument:</translation> + </message> + <message> + <location filename="notificationruleswidget.cpp" line="447"/> + <source>Please enter new argument text:</source> + <translation>Please enter new argument text:</translation> + </message> +</context> +<context> + <name>LeechCraft::AdvancedNotifications::Plugin</name> + <message> + <location filename="advancednotifications.cpp" line="75"/> + <source>Toggle Advanced Notifications rules...</source> + <translation>Toggle Advanced Notifications rules...</translation> + </message> + <message> + <location filename="advancednotifications.cpp" line="102"/> + <source>Module for the advanced notifications framework.</source> + <translation>Module for the advanced notifications framework.</translation> + </message> +</context> +<context> + <name>LeechCraft::AdvancedNotifications::RulesManager</name> + <message> + <location filename="rulesmanager.cpp" line="84"/> <source>Instant messaging</source> <translation>Instant messaging</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="61"/> + <location filename="rulesmanager.cpp" line="85"/> <source>Attention request</source> <translation>Attention request</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="62"/> + <location filename="rulesmanager.cpp" line="86"/> <source>Incoming file transfer request</source> <translation>Incoming file transfer request</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="63"/> + <location filename="rulesmanager.cpp" line="87"/> <source>Incoming chat message</source> <translation>Incoming chat message</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="64"/> + <location filename="rulesmanager.cpp" line="88"/> <source>MUC highlight</source> <translation>MUC highlight</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="65"/> + <location filename="rulesmanager.cpp" line="89"/> <source>MUC invitation</source> <translation>MUC invitation</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="66"/> + <location filename="rulesmanager.cpp" line="90"/> <source>General MUC message</source> <translation>General MUC message</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="67"/> + <location filename="rulesmanager.cpp" line="91"/> <source>Contact status change</source> <translation>Contact status change</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="68"/> + <location filename="rulesmanager.cpp" line="92"/> <source>Authorization granted</source> <translation>Authorization granted</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="69"/> + <location filename="rulesmanager.cpp" line="93"/> <source>Authorization revoked</source> <translation>Authorization revoked</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="70"/> + <location filename="rulesmanager.cpp" line="94"/> <source>Authorization requested</source> <translation>Authorization requested</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="71"/> + <location filename="rulesmanager.cpp" line="95"/> <source>Contact subscribed</source> <translation>Contact subscribed</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="72"/> + <location filename="rulesmanager.cpp" line="96"/> <source>Contact unsubscribed</source> <translation>Contact unsubscribed</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="131"/> + <location filename="rulesmanager.cpp" line="98"/> + <source>Organizer</source> + <translation>Organizer</translation> + </message> + <message> + <location filename="rulesmanager.cpp" line="99"/> + <location filename="rulesmanager.cpp" line="209"/> + <source>Event is due</source> + <translation>Event is due</translation> + </message> + <message> + <location filename="rulesmanager.cpp" line="101"/> + <source>Downloads</source> + <translation>Downloads</translation> + </message> + <message> + <location filename="rulesmanager.cpp" line="102"/> + <location filename="rulesmanager.cpp" line="223"/> + <source>Download error</source> + <translation>Download error</translation> + </message> + <message> + <location filename="rulesmanager.cpp" line="103"/> + <location filename="rulesmanager.cpp" line="218"/> + <source>Download finished</source> + <translation>Download finished</translation> + </message> + <message> + <location filename="rulesmanager.cpp" line="105"/> + <location filename="rulesmanager.cpp" line="106"/> + <location filename="rulesmanager.cpp" line="232"/> + <source>Generic</source> + <translation>Generic</translation> + </message> + <message> + <location filename="rulesmanager.cpp" line="163"/> <source>Incoming chat messages</source> <translation>Incoming chat messages</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="137"/> + <location filename="rulesmanager.cpp" line="169"/> <source>MUC highlights</source> <translation>MUC highlights</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="143"/> + <location filename="rulesmanager.cpp" line="175"/> <source>MUC invitations</source> <translation>MUC invitations</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="149"/> + <location filename="rulesmanager.cpp" line="181"/> <source>Incoming file transfers</source> <translation>Incoming file transfers</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="154"/> + <location filename="rulesmanager.cpp" line="186"/> <source>Subscription requests</source> <translation>Subscription requests</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="160"/> + <location filename="rulesmanager.cpp" line="192"/> <source>Subscription changes</source> <translation>Subscription changes</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="168"/> + <location filename="rulesmanager.cpp" line="200"/> <source>Attention requests</source> <translation>Attention requests</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="192"/> + <location filename="rulesmanager.cpp" line="266"/> <source>Name</source> <translation>Name</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="193"/> + <location filename="rulesmanager.cpp" line="267"/> <source>Category</source> <translation>Category</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="194"/> + <location filename="rulesmanager.cpp" line="268"/> <source>Type</source> <translation>Type</translation> </message> - <message> - <location filename="notificationruleswidget.cpp" line="203"/> - <source>Field name</source> - <translation>Field name</translation> - </message> - <message> - <location filename="notificationruleswidget.cpp" line="204"/> - <source>Rule description</source> - <translation>Rule description</translation> - </message> - <message> - <location filename="notificationruleswidget.cpp" line="331"/> - <source><empty matcher></source> - <translation><empty matcher></translation> - </message> - <message> - <location filename="notificationruleswidget.cpp" line="493"/> - <source>Are you sure you want to replace all rules with the default set?</source> - <translation>Are you sure you want to replace all rules with the default set?</translation> - </message> - <message> - <location filename="notificationruleswidget.cpp" line="582"/> - <source>Select audio file</source> - <translation>Select audio file</translation> - </message> - <message> - <location filename="notificationruleswidget.cpp" line="584"/> - <source>Audio files (*.ogg *.wav *.flac *.mp3);;All files (*.*)</source> - <translation>Audio files (*.ogg *.wav *.flac *.mp3);;All files (*.*)</translation> - </message> - <message> - <location filename="notificationruleswidget.cpp" line="619"/> - <source>Please enter the argument:</source> - <translation>Please enter the argument:</translation> - </message> - <message> - <location filename="notificationruleswidget.cpp" line="635"/> - <source>Please enter new argument text:</source> - <translation>Please enter new argument text:</translation> - </message> -</context> -<context> - <name>LeechCraft::AdvancedNotifications::Plugin</name> - <message> - <location filename="advancednotifications.cpp" line="77"/> - <source>Module for the advanced notifications framework.</source> - <translation>Module for the advanced notifications framework.</translation> - </message> </context> <context> <name>LeechCraft::AdvancedNotifications::SystemTrayHandler</name> <message> - <location filename="systemtrayhandler.cpp" line="182"/> + <location filename="systemtrayhandler.cpp" line="221"/> <source>Dismiss</source> <translation>Dismiss</translation> </message> @@ -252,80 +309,80 @@ <translation>Add</translation> </message> <message> - <location filename="notificationruleswidget.ui" line="72"/> + <location filename="notificationruleswidget.ui" line="65"/> <location filename="notificationruleswidget.ui" line="265"/> <location filename="notificationruleswidget.ui" line="379"/> <source>Remove</source> <translation>Remove</translation> </message> <message> - <location filename="notificationruleswidget.ui" line="37"/> - <source>Update</source> - <translation>Update</translation> - </message> - <message> - <location filename="notificationruleswidget.ui" line="51"/> + <location filename="notificationruleswidget.ui" line="44"/> <source>Move up</source> <translation>Move up</translation> </message> <message> - <location filename="notificationruleswidget.ui" line="58"/> + <location filename="notificationruleswidget.ui" line="51"/> <source>Move down</source> <translation>Move down</translation> </message> <message> - <location filename="notificationruleswidget.ui" line="79"/> + <location filename="notificationruleswidget.ui" line="72"/> <source>Default</source> <translation>Default</translation> </message> <message> - <location filename="notificationruleswidget.ui" line="110"/> + <location filename="notificationruleswidget.ui" line="103"/> <source>Rule</source> <translation>Rule</translation> </message> <message> - <location filename="notificationruleswidget.ui" line="126"/> + <location filename="notificationruleswidget.ui" line="119"/> <source>Name:</source> <translation>Name:</translation> </message> <message> - <location filename="notificationruleswidget.ui" line="136"/> + <location filename="notificationruleswidget.ui" line="129"/> <source>Event category:</source> <translation>Event category:</translation> </message> <message> - <location filename="notificationruleswidget.ui" line="146"/> + <location filename="notificationruleswidget.ui" line="139"/> <source>Event type:</source> <translation>Event type:</translation> </message> <message> - <location filename="notificationruleswidget.ui" line="174"/> + <location filename="notificationruleswidget.ui" line="167"/> <source>Notify via:</source> <translation>Notify via:</translation> </message> <message> - <location filename="notificationruleswidget.ui" line="194"/> + <location filename="notificationruleswidget.ui" line="187"/> <source>Visual</source> <translation>Visual</translation> </message> <message> - <location filename="notificationruleswidget.ui" line="187"/> + <location filename="notificationruleswidget.ui" line="180"/> <source>System tray</source> <translation>System tray</translation> </message> <message> - <location filename="notificationruleswidget.ui" line="201"/> + <location filename="notificationruleswidget.ui" line="194"/> <location filename="notificationruleswidget.ui" line="275"/> <source>Audio</source> <translation>Audio</translation> </message> <message> - <location filename="notificationruleswidget.ui" line="208"/> + <location filename="notificationruleswidget.ui" line="201"/> <location filename="notificationruleswidget.ui" line="326"/> <source>Command</source> <translation>Command</translation> </message> <message> + <location filename="notificationruleswidget.ui" line="208"/> + <source>Draw attention to the window</source> + <translation>Draw attention to the window</translation> + </message> + <message> <location filename="notificationruleswidget.ui" line="218"/> <source>Single shot</source> <translation>Single shot</translation> @@ -378,6 +435,11 @@ <translation>Argument</translation> </message> <message> + <location filename="notificationruleswidget.ui" line="407"/> + <source>Save rule</source> + <translation>Save rule</translation> + </message> + <message> <location filename="notificationruleswidget.ui" line="287"/> <source>File:</source> <translation>File:</translation> @@ -386,27 +448,27 @@ <context> <name>QObject</name> <message> - <location filename="typedmatchers.cpp" line="147"/> + <location filename="typedmatchers.cpp" line="158"/> <source>contains pattern `%1`</source> <translation>contains pattern `%1`</translation> </message> <message> - <location filename="typedmatchers.cpp" line="148"/> + <location filename="typedmatchers.cpp" line="159"/> <source>doesn't contain pattern `%1`</source> <translation>doesn't contain pattern `%1`</translation> </message> <message> - <location filename="typedmatchers.cpp" line="166"/> + <location filename="typedmatchers.cpp" line="177"/> <source>contains element matching %1</source> <translation>contains element matching %1</translation> </message> <message> - <location filename="typedmatchers.cpp" line="167"/> + <location filename="typedmatchers.cpp" line="178"/> <source>doesn't contain element matching %1</source> <translation>doesn't contain element matching %1</translation> </message> <message> - <location filename="typedmatchers.cpp" line="220"/> + <location filename="typedmatchers.cpp" line="232"/> <source>is %1 then %2</source> <translation>is %1 then %2</translation> </message> @@ -486,5 +548,25 @@ <source>Enable for IM events</source> <translation>Enable for IM events</translation> </message> + <message> + <location filename="dummy.cpp" line="11"/> + <source>Enable for Organizer events</source> + <translation>Enable for Organizer events</translation> + </message> + <message> + <location filename="dummy.cpp" line="12"/> + <source>Enable for Downloads events</source> + <translation>Enable for Downloads events</translation> + </message> + <message> + <location filename="dummy.cpp" line="13"/> + <source>Behavior</source> + <translation>Behavior</translation> + </message> + <message> + <location filename="dummy.cpp" line="14"/> + <source>Hide when mouse leaves the notifier</source> + <translation>Hide when mouse leaves the notifier</translation> + </message> </context> </TS> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.5.98/src/plugins/advancednotifications/leechcraft_advancednotifications_ru_RU.ts new/leechcraft-0.5.99/src/plugins/advancednotifications/leechcraft_advancednotifications_ru_RU.ts --- old/leechcraft-0.5.98/src/plugins/advancednotifications/leechcraft_advancednotifications_ru_RU.ts 2013-07-02 10:52:46.000000000 +0200 +++ new/leechcraft-0.5.99/src/plugins/advancednotifications/leechcraft_advancednotifications_ru_RU.ts 2013-07-13 11:04:11.000000000 +0200 @@ -35,9 +35,17 @@ </message> </context> <context> + <name>LeechCraft::AdvancedNotifications::EnableSoundActionManager</name> + <message> + <location filename="enablesoundactionmanager.cpp" line="40"/> + <source>Enable sound notifications</source> + <translation>Включить звуковые уведомления</translation> + </message> +</context> +<context> <name>LeechCraft::AdvancedNotifications::MatchConfigDialog</name> <message> - <location filename="matchconfigdialog.cpp" line="131"/> + <location filename="matchconfigdialog.cpp" line="142"/> <source>Invalid matcher type %1.</source> <translation>Неверный тип матчера %1.</translation> </message> @@ -45,173 +53,222 @@ <context> <name>LeechCraft::AdvancedNotifications::NotificationRulesWidget</name> <message> - <location filename="notificationruleswidget.cpp" line="59"/> + <location filename="notificationruleswidget.cpp" line="99"/> + <source>Field name</source> + <translation>Имя поля</translation> + </message> + <message> + <location filename="notificationruleswidget.cpp" line="100"/> + <source>Rule description</source> + <translation>Описание правила</translation> + </message> + <message> + <location filename="notificationruleswidget.cpp" line="188"/> + <source><empty matcher></source> + <translation><пустой матчер></translation> + </message> + <message> + <location filename="notificationruleswidget.cpp" line="201"/> + <source>The rule has been changed. Do you want to save it?</source> + <oldsource>The rule has been changed. Do you want to save it</oldsource> + <translation>Правило было изменено. Вы желаете его сохранить?</translation> + </message> + <message> + <location filename="notificationruleswidget.cpp" line="311"/> + <source>Are you sure you want to replace all rules with the default set?</source> + <translation>Вы уверены, что хотите заменить все правила набором по умолчанию?</translation> + </message> + <message> + <location filename="notificationruleswidget.cpp" line="395"/> + <source>Select audio file</source> + <translation>Выбор аудиофайла</translation> + </message> + <message> + <location filename="notificationruleswidget.cpp" line="397"/> + <source>Audio files (*.ogg *.wav *.flac *.mp3);;All files (*.*)</source> + <translation>Аудиофайлы (*.ogg *.wav *.flac *.mp3);;Все файлы (*.*)</translation> + </message> + <message> + <location filename="notificationruleswidget.cpp" line="432"/> + <source>Please enter the argument:</source> + <translation>Введите аргумент:</translation> + </message> + <message> + <location filename="notificationruleswidget.cpp" line="447"/> + <source>Please enter new argument text:</source> + <translation>Введите новый текст аргумента:</translation> + </message> +</context> +<context> + <name>LeechCraft::AdvancedNotifications::Plugin</name> + <message> + <location filename="advancednotifications.cpp" line="75"/> + <source>Toggle Advanced Notifications rules...</source> + <translation>Переключить правила Advanced Notifications...</translation> + </message> + <message> + <location filename="advancednotifications.cpp" line="102"/> + <source>Module for the advanced notifications framework.</source> + <translation>Модуль для фреймворка Advanced Notifications.</translation> + </message> +</context> +<context> + <name>LeechCraft::AdvancedNotifications::RulesManager</name> + <message> + <location filename="rulesmanager.cpp" line="84"/> <source>Instant messaging</source> <translation>Мгновенные сообщения</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="61"/> + <location filename="rulesmanager.cpp" line="85"/> <source>Attention request</source> <translation>Запрос внимания</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="62"/> + <location filename="rulesmanager.cpp" line="86"/> <source>Incoming file transfer request</source> <translation>Входящая передача файлов</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="63"/> + <location filename="rulesmanager.cpp" line="87"/> <source>Incoming chat message</source> <translation>Входящее сообщение в чате</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="64"/> + <location filename="rulesmanager.cpp" line="88"/> <source>MUC highlight</source> <translation>Подсветка в конференции</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="65"/> + <location filename="rulesmanager.cpp" line="89"/> <source>MUC invitation</source> <translation>Приглашение в конференцию</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="66"/> + <location filename="rulesmanager.cpp" line="90"/> <source>General MUC message</source> <translation>Обычное сообщение в конференции</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="67"/> + <location filename="rulesmanager.cpp" line="91"/> <source>Contact status change</source> <translation>Изменение статуса контакта</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="68"/> + <location filename="rulesmanager.cpp" line="92"/> <source>Authorization granted</source> <translation>Получение авторизации</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="69"/> + <location filename="rulesmanager.cpp" line="93"/> <source>Authorization revoked</source> <translation>Отзыв авторизации</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="70"/> + <location filename="rulesmanager.cpp" line="94"/> <source>Authorization requested</source> <translation>Запрос авторизации</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="71"/> + <location filename="rulesmanager.cpp" line="95"/> <source>Contact subscribed</source> <translation>Контакт подписался</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="72"/> + <location filename="rulesmanager.cpp" line="96"/> <source>Contact unsubscribed</source> <translation>Контакт отписался</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="131"/> + <location filename="rulesmanager.cpp" line="98"/> + <source>Organizer</source> + <translation>Органайзер</translation> + </message> + <message> + <location filename="rulesmanager.cpp" line="99"/> + <location filename="rulesmanager.cpp" line="209"/> + <source>Event is due</source> + <translation>Пришел срок события</translation> + </message> + <message> + <location filename="rulesmanager.cpp" line="101"/> + <source>Downloads</source> + <translation>Закачки</translation> + </message> + <message> + <location filename="rulesmanager.cpp" line="102"/> + <location filename="rulesmanager.cpp" line="223"/> + <source>Download error</source> + <translation>Ошибка скачивания</translation> + </message> + <message> + <location filename="rulesmanager.cpp" line="103"/> + <location filename="rulesmanager.cpp" line="218"/> + <source>Download finished</source> + <translation>Скачивание завершено</translation> + </message> + <message> + <location filename="rulesmanager.cpp" line="105"/> + <location filename="rulesmanager.cpp" line="106"/> + <location filename="rulesmanager.cpp" line="232"/> + <source>Generic</source> + <translation>Общее</translation> + </message> + <message> + <location filename="rulesmanager.cpp" line="163"/> <source>Incoming chat messages</source> <translation>Входящие сообщения в чате</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="137"/> + <location filename="rulesmanager.cpp" line="169"/> <source>MUC highlights</source> <translation>Подсветки в конференциях</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="143"/> + <location filename="rulesmanager.cpp" line="175"/> <source>MUC invitations</source> <translation>Приглашения в конференции</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="149"/> + <location filename="rulesmanager.cpp" line="181"/> <source>Incoming file transfers</source> <translation>Входящие передачи файлов</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="154"/> + <location filename="rulesmanager.cpp" line="186"/> <source>Subscription requests</source> <translation>Запросы авторизации</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="160"/> + <location filename="rulesmanager.cpp" line="192"/> <source>Subscription changes</source> <translation>Изменения авторизации</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="168"/> + <location filename="rulesmanager.cpp" line="200"/> <source>Attention requests</source> <translation>Запросы внимания</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="192"/> + <location filename="rulesmanager.cpp" line="266"/> <source>Name</source> <translation>Имя</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="193"/> + <location filename="rulesmanager.cpp" line="267"/> <source>Category</source> <translation>Категория</translation> </message> <message> - <location filename="notificationruleswidget.cpp" line="194"/> + <location filename="rulesmanager.cpp" line="268"/> <source>Type</source> <translation>Тип</translation> </message> - <message> - <location filename="notificationruleswidget.cpp" line="203"/> - <source>Field name</source> - <translation>Имя поля</translation> - </message> - <message> - <location filename="notificationruleswidget.cpp" line="204"/> - <source>Rule description</source> - <translation>Описание правила</translation> - </message> - <message> - <location filename="notificationruleswidget.cpp" line="331"/> - <source><empty matcher></source> - <translation><пустой матчер></translation> - </message> - <message> - <location filename="notificationruleswidget.cpp" line="493"/> - <source>Are you sure you want to replace all rules with the default set?</source> - <translation>Вы уверены, что хотите заменить все правила набором по умолчанию?</translation> - </message> - <message> - <location filename="notificationruleswidget.cpp" line="582"/> - <source>Select audio file</source> - <translation>Выбор аудиофайла</translation> - </message> - <message> - <location filename="notificationruleswidget.cpp" line="584"/> - <source>Audio files (*.ogg *.wav *.flac *.mp3);;All files (*.*)</source> - <translation>Аудиофайлы (*.ogg *.wav *.flac *.mp3);;Все файлы (*.*)</translation> - </message> - <message> - <location filename="notificationruleswidget.cpp" line="619"/> - <source>Please enter the argument:</source> - <translation>Введите аргумент:</translation> - </message> - <message> - <location filename="notificationruleswidget.cpp" line="635"/> - <source>Please enter new argument text:</source> - <translation>Введите новый текст аргумента:</translation> - </message> -</context> -<context> - <name>LeechCraft::AdvancedNotifications::Plugin</name> - <message> - <location filename="advancednotifications.cpp" line="77"/> - <source>Module for the advanced notifications framework.</source> - <translation>Модуль для фреймворка Advanced Notifications.</translation> - </message> </context> <context> <name>LeechCraft::AdvancedNotifications::SystemTrayHandler</name> <message> - <location filename="systemtrayhandler.cpp" line="182"/> + <location filename="systemtrayhandler.cpp" line="221"/> <source>Dismiss</source> <translation>Пропустить</translation> </message> @@ -252,80 +309,80 @@ <translation>Добавить</translation> </message> <message> - <location filename="notificationruleswidget.ui" line="72"/> + <location filename="notificationruleswidget.ui" line="65"/> <location filename="notificationruleswidget.ui" line="265"/> <location filename="notificationruleswidget.ui" line="379"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="notificationruleswidget.ui" line="37"/> - <source>Update</source> - <translation>Обновить</translation> - </message> - <message> - <location filename="notificationruleswidget.ui" line="51"/> + <location filename="notificationruleswidget.ui" line="44"/> <source>Move up</source> <translation>Вверх</translation> </message> <message> - <location filename="notificationruleswidget.ui" line="58"/> + <location filename="notificationruleswidget.ui" line="51"/> <source>Move down</source> <translation>Вниз</translation> </message> <message> - <location filename="notificationruleswidget.ui" line="79"/> + <location filename="notificationruleswidget.ui" line="72"/> <source>Default</source> <translation>По умолчанию</translation> </message> <message> - <location filename="notificationruleswidget.ui" line="110"/> + <location filename="notificationruleswidget.ui" line="103"/> <source>Rule</source> <translation>Правило</translation> </message> <message> - <location filename="notificationruleswidget.ui" line="126"/> + <location filename="notificationruleswidget.ui" line="119"/> <source>Name:</source> <translation>Имя:</translation> </message> <message> - <location filename="notificationruleswidget.ui" line="136"/> + <location filename="notificationruleswidget.ui" line="129"/> <source>Event category:</source> <translation>Категория события:</translation> </message> <message> - <location filename="notificationruleswidget.ui" line="146"/> + <location filename="notificationruleswidget.ui" line="139"/> <source>Event type:</source> <translation>Тип события:</translation> </message> <message> - <location filename="notificationruleswidget.ui" line="174"/> + <location filename="notificationruleswidget.ui" line="167"/> <source>Notify via:</source> <translation>Уведомлять при помощи:</translation> </message> <message> - <location filename="notificationruleswidget.ui" line="194"/> + <location filename="notificationruleswidget.ui" line="187"/> <source>Visual</source> <translation>Всплывающие уведомления</translation> </message> <message> - <location filename="notificationruleswidget.ui" line="187"/> + <location filename="notificationruleswidget.ui" line="180"/> <source>System tray</source> <translation>Системный трей</translation> </message> <message> - <location filename="notificationruleswidget.ui" line="201"/> + <location filename="notificationruleswidget.ui" line="194"/> <location filename="notificationruleswidget.ui" line="275"/> <source>Audio</source> <translation>Звуковые уведомления</translation> </message> <message> - <location filename="notificationruleswidget.ui" line="208"/> + <location filename="notificationruleswidget.ui" line="201"/> <location filename="notificationruleswidget.ui" line="326"/> <source>Command</source> <translation>Команда</translation> </message> <message> + <location filename="notificationruleswidget.ui" line="208"/> + <source>Draw attention to the window</source> + <translation>Привлечь внимание к окну</translation> + </message> + <message> <location filename="notificationruleswidget.ui" line="218"/> <source>Single shot</source> <translation>Единичное срабатывание</translation> @@ -378,6 +435,11 @@ <translation>Аргумент</translation> </message> <message> + <location filename="notificationruleswidget.ui" line="407"/> + <source>Save rule</source> + <translation>Сохранить правило</translation> + </message> + <message> <location filename="notificationruleswidget.ui" line="287"/> <source>File:</source> <translation>Файл:</translation> @@ -386,27 +448,27 @@ <context> <name>QObject</name> <message> - <location filename="typedmatchers.cpp" line="147"/> + <location filename="typedmatchers.cpp" line="158"/> <source>contains pattern `%1`</source> <translation>содержит шаблон `%1`</translation> </message> <message> - <location filename="typedmatchers.cpp" line="148"/> + <location filename="typedmatchers.cpp" line="159"/> <source>doesn't contain pattern `%1`</source> <translation>не содержит шаблон `%1`</translation> </message> <message> - <location filename="typedmatchers.cpp" line="166"/> + <location filename="typedmatchers.cpp" line="177"/> <source>contains element matching %1</source> <translation>содержит элемент, удовлетворяющий `%1`</translation> </message> <message> - <location filename="typedmatchers.cpp" line="167"/> + <location filename="typedmatchers.cpp" line="178"/> <source>doesn't contain element matching %1</source> <translation>не содержит элемент, удовлетворяющий `%1`</translation> </message> <message> - <location filename="typedmatchers.cpp" line="220"/> + <location filename="typedmatchers.cpp" line="232"/> <source>is %1 then %2</source> <translation>%1 чем %2</translation> </message> @@ -486,5 +548,25 @@ <source>Enable for IM events</source> <translation>Включить для событий IM</translation> </message> + <message> + <location filename="dummy.cpp" line="11"/> + <source>Enable for Organizer events</source> + <translation>Включить для событий Органайзера</translation> + </message> + <message> + <location filename="dummy.cpp" line="12"/> + <source>Enable for Downloads events</source> + <translation>Включить для событий Скачивания</translation> + </message> + <message> + <location filename="dummy.cpp" line="13"/> + <source>Behavior</source> + <translation>Поведение</translation> + </message> + <message> + <location filename="dummy.cpp" line="14"/> + <source>Hide when mouse leaves the notifier</source> + <translation>Скрывать, когда курсор мыши уходит с уведомления</translation> + </message> </context> </TS> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.5.98/src/plugins/advancednotifications/notificationruleswidget.cpp new/leechcraft-0.5.99/src/plugins/advancednotifications/notificationruleswidget.cpp --- old/leechcraft-0.5.98/src/plugins/advancednotifications/notificationruleswidget.cpp 2013-07-02 10:52:46.000000000 +0200 +++ new/leechcraft-0.5.99/src/plugins/advancednotifications/notificationruleswidget.cpp 2013-07-13 11:04:11.000000000 +0200 @@ -196,7 +196,7 @@ if (uiRule != prevRule && QMessageBox::question (this, "LeechCraft", - tr ("The rule has been changed. Do you want to save it"), + tr ("The rule has been changed. Do you want to save it?"), QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) RM_->UpdateRule (prevIndex, uiRule); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.5.98/src/plugins/azoth/azothsettings.xml new/leechcraft-0.5.99/src/plugins/azoth/azothsettings.xml --- old/leechcraft-0.5.98/src/plugins/azoth/azothsettings.xml 2013-07-02 10:52:46.000000000 +0200 +++ new/leechcraft-0.5.99/src/plugins/azoth/azothsettings.xml 2013-07-13 11:04:11.000000000 +0200 @@ -131,6 +131,11 @@ <item type="spinbox" property="FontSize" default="12"> <label value="Font size:" /> </item> + <item type="spinbox" property="FontZoom" default="100" minimum="10" maximum="1600"> + <label value="Font zoom:" /> + <suffix value=" %" /> + <tooltip>Some themes have fixed-size font and font size setting doesn't affect them. Use this option to change their font size.</tooltip> + </item> <item type="spinbox" property="ShortenURLLength" default="100" minimum="10" maximum="1000"> <label value="Shorten URLs less than: " /> <suffix value=" symbols" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.5.98/src/plugins/azoth/chattab.cpp new/leechcraft-0.5.99/src/plugins/azoth/chattab.cpp --- old/leechcraft-0.5.98/src/plugins/azoth/chattab.cpp 2013-07-02 10:52:46.000000000 +0200 +++ new/leechcraft-0.5.99/src/plugins/azoth/chattab.cpp 2013-07-13 11:04:11.000000000 +0200 @@ -222,7 +222,7 @@ const int autoNum = XmlSettingsManager::Instance () .property ("ShowLastNMessages").toInt (); if (entry->GetAllMessages ().size () <= 100 && - entry->GetEntryType () == ICLEntry::ETChat && + entry->GetEntryType () != ICLEntry::ETMUC && autoNum) RequestLogs (autoNum); @@ -1360,6 +1360,10 @@ const int size = XmlSettingsManager::Instance () .property ("FontSize").toInt (); Ui_.View_->settings ()->setFontSize (QWebSettings::DefaultFontSize, size); + + const int zoom = XmlSettingsManager::Instance () + .property ("FontZoom").toInt (); + Ui_.View_->setTextSizeMultiplier (zoom / 100.); } template<typename T> @@ -1672,7 +1676,7 @@ void ChatTab::RegisterSettings() { - XmlSettingsManager::Instance ().RegisterObject ("FontSize", + XmlSettingsManager::Instance ().RegisterObject ({ "FontSize", "FontZoom" }, this, "handleFontSizeChanged"); handleFontSizeChanged (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.5.98/src/plugins/azoth/plugins/chathistory/chathistory.cpp new/leechcraft-0.5.99/src/plugins/azoth/plugins/chathistory/chathistory.cpp --- old/leechcraft-0.5.98/src/plugins/azoth/plugins/chathistory/chathistory.cpp 2013-07-02 10:52:46.000000000 +0200 +++ new/leechcraft-0.5.99/src/plugins/azoth/plugins/chathistory/chathistory.cpp 2013-07-13 11:04:11.000000000 +0200 @@ -164,9 +164,6 @@ return; } - if (entry->GetEntryType () != ICLEntry::ETChat) - return; - IAccount *account = qobject_cast<IAccount*> (entry->GetParentAccount ()); if (!account) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.5.98/src/plugins/azoth/zoomeventfilter.cpp new/leechcraft-0.5.99/src/plugins/azoth/zoomeventfilter.cpp --- old/leechcraft-0.5.98/src/plugins/azoth/zoomeventfilter.cpp 2013-07-02 10:52:46.000000000 +0200 +++ new/leechcraft-0.5.99/src/plugins/azoth/zoomeventfilter.cpp 2013-07-13 11:04:11.000000000 +0200 @@ -52,11 +52,23 @@ int degrees = e->delta () / 8; int steps = static_cast<qreal> (degrees) / 15; + QWebView *view = qobject_cast<QWebView*> (viewObj); - QWebSettings *settings = view->settings (); - settings->setFontSize (QWebSettings::DefaultFontSize, - std::max (6, settings->fontSize (QWebSettings::DefaultFontSize) + steps)); - view->page ()->mainFrame ()->evaluateJavaScript ("setTimeout(ScrollToBottom,0);"); + if (e->modifiers () & Qt::ShiftModifier) + { + auto multiplier = view->textSizeMultiplier (); + multiplier += steps * 0.1; + view->setTextSizeMultiplier (multiplier); + } + else + { + QWebSettings *settings = view->settings (); + settings->setFontSize (QWebSettings::DefaultFontSize, + std::max (6, settings->fontSize (QWebSettings::DefaultFontSize) + steps)); + auto frame = view->page ()->mainFrame (); + frame->evaluateJavaScript ("setTimeout(ScrollToBottom,0);"); + } + return true; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.5.98/src/plugins/lemon/trafficdialog.cpp new/leechcraft-0.5.99/src/plugins/lemon/trafficdialog.cpp --- old/leechcraft-0.5.98/src/plugins/lemon/trafficdialog.cpp 2013-07-02 10:52:46.000000000 +0200 +++ new/leechcraft-0.5.99/src/plugins/lemon/trafficdialog.cpp 2013-07-13 11:04:11.000000000 +0200 @@ -33,6 +33,9 @@ #include <qwt_plot_grid.h> #include <qwt_legend.h> #include <qwt_dyngrid_layout.h> +#if QWT_VERSION >= 0x060100 +#include <qwt_plot_legenditem.h> +#endif #include <util/util.h> #include "trafficmanager.h" @@ -86,9 +89,25 @@ auto grid = new QwtPlotGrid; grid->enableYMin (true); grid->enableX (false); +#if QWT_VERSION >= 0x060100 + grid->setMinorPen (QPen (Qt::gray, 1, Qt::DashLine)); +#else grid->setMinPen (QPen (Qt::gray, 1, Qt::DashLine)); +#endif grid->attach (Ui_.TrafficPlot_); +#if QWT_VERSION >= 0x060100 + auto item = new QwtPlotLegendItem; + item->setMaxColumns (1); + item->setAlignment (Qt::AlignTop | Qt::AlignLeft); + item->attach (Ui_.TrafficPlot_); + + auto bgColor = palette ().color (QPalette::Button); + bgColor.setAlphaF (0.8); + item->setBackgroundBrush (bgColor); + item->setBorderRadius (3); + item->setBorderPen (QPen (palette ().color (QPalette::Dark), 1)); +#else QwtLegend *legend = new QwtLegend; legend->setItemMode (QwtLegend::CheckableItem); Ui_.TrafficPlot_->insertLegend (legend, QwtPlot::ExternalLegend); @@ -102,6 +121,7 @@ << legend->contentsWidget ()->layout (); Ui_.StatsFrame_->layout ()->addWidget (legend); +#endif connect (manager, SIGNAL (updated ()), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.5.98/src/plugins/liznoo/batteryhistorydialog.cpp new/leechcraft-0.5.99/src/plugins/liznoo/batteryhistorydialog.cpp --- old/leechcraft-0.5.98/src/plugins/liznoo/batteryhistorydialog.cpp 2013-07-02 10:52:46.000000000 +0200 +++ new/leechcraft-0.5.99/src/plugins/liznoo/batteryhistorydialog.cpp 2013-07-13 11:04:11.000000000 +0200 @@ -29,12 +29,18 @@ #include "batteryhistorydialog.h" #include <algorithm> +#include <qwt_global.h> #include <qwt_plot_curve.h> #include <qwt_curve_fitter.h> #include <qwt_legend.h> #include <qwt_dyngrid_layout.h> -#include "batteryinfo.h" + +#if QWT_VERSION >= 0x060100 +#include <qwt_plot_legenditem.h> +#endif + #include <util/util.h> +#include "batteryinfo.h" namespace LeechCraft { @@ -80,6 +86,18 @@ Temperature_->setRenderHint (QwtPlotItem::RenderAntialiased); +#if QWT_VERSION >= 0x060100 + auto item = new QwtPlotLegendItem; + item->setMaxColumns (1); + item->setAlignment (Qt::AlignTop | Qt::AlignLeft); + item->attach (Ui_.PercentPlot_); + + auto bgColor = palette ().color (QPalette::Button); + bgColor.setAlphaF (0.8); + item->setBackgroundBrush (bgColor); + item->setBorderRadius (3); + item->setBorderPen (QPen (palette ().color (QPalette::Dark), 1)); +#else QwtLegend *legend = new QwtLegend; legend->setItemMode (QwtLegend::ClickableItem); Ui_.PercentPlot_->insertLegend (legend, QwtPlot::ExternalLegend); @@ -93,6 +111,7 @@ << legend->contentsWidget ()->layout (); Ui_.InfoFrame_->layout ()->addWidget (legend); +#endif } void BatteryHistoryDialog::UpdateHistory (const QLinkedList<BatteryHistory>& hist, const BatteryInfo& info) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.5.98/src/plugins/lmp/plugins/mtpsync/mtpsync.cpp new/leechcraft-0.5.99/src/plugins/lmp/plugins/mtpsync/mtpsync.cpp --- old/leechcraft-0.5.98/src/plugins/lmp/plugins/mtpsync/mtpsync.cpp 2013-07-02 10:52:46.000000000 +0200 +++ new/leechcraft-0.5.99/src/plugins/lmp/plugins/mtpsync/mtpsync.cpp 2013-07-13 11:04:11.000000000 +0200 @@ -228,6 +228,7 @@ track->artist = getStr (info.Artist_); track->tracknumber = info.TrackNumber_; track->filetype = GetFileType (info.FileFormat_); + track->filesize = QFileInfo (localPath).size (); const auto res = LIBMTP_Send_Track_From_File (device, localPath.toUtf8 ().constData (), track, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.5.98/src/plugins/lmp/sync/unmountabledevmanager.cpp new/leechcraft-0.5.99/src/plugins/lmp/sync/unmountabledevmanager.cpp --- old/leechcraft-0.5.98/src/plugins/lmp/sync/unmountabledevmanager.cpp 2013-07-02 10:52:46.000000000 +0200 +++ new/leechcraft-0.5.99/src/plugins/lmp/sync/unmountabledevmanager.cpp 2013-07-13 11:04:11.000000000 +0200 @@ -82,7 +82,8 @@ void UnmountableDevManager::rebuildAvailableDevices () { - DevListModel_->clear (); + if (const auto rc = DevListModel_->rowCount ()) + DevListModel_->removeRows (0, rc); Q_FOREACH (auto mgrObj, Managers_) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.5.98/src/plugins/monocle/plugins/mu/CMakeLists.txt new/leechcraft-0.5.99/src/plugins/monocle/plugins/mu/CMakeLists.txt --- old/leechcraft-0.5.98/src/plugins/monocle/plugins/mu/CMakeLists.txt 2013-07-02 10:52:46.000000000 +0200 +++ new/leechcraft-0.5.99/src/plugins/monocle/plugins/mu/CMakeLists.txt 2013-07-13 11:04:11.000000000 +0200 @@ -27,7 +27,9 @@ ) TARGET_LINK_LIBRARIES (leechcraft_monocle_mu fitz + jbig2dec jpeg + openjpeg ${QT_LIBRARIES} ${LEECHCRAFT_LIBRARIES} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/leechcraft-0.5.98/src/plugins/poshuku/plugins/cleanweb/core.cpp new/leechcraft-0.5.99/src/plugins/poshuku/plugins/cleanweb/core.cpp --- old/leechcraft-0.5.98/src/plugins/poshuku/plugins/cleanweb/core.cpp 2013-07-02 10:52:46.000000000 +0200 +++ new/leechcraft-0.5.99/src/plugins/poshuku/plugins/cleanweb/core.cpp 2013-07-13 11:04:11.000000000 +0200 @@ -874,6 +874,9 @@ void Core::handleFrameLayout (QPointer<QWebFrame> frame) { + if (!frame) + return; + const QUrl& frameUrl = frame->url (); const QString& urlStr = frameUrl.toString (); const auto& urlUtf8 = urlStr.toUtf8 (); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org