Hello community, here is the log from the commit of package kadu for openSUSE:Factory checked in at 2015-09-08 17:45:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kadu (Old) and /work/SRC/openSUSE:Factory/.kadu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kadu" Changes: -------- --- /work/SRC/openSUSE:Factory/kadu/kadu.changes 2015-02-11 16:44:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kadu.new/kadu.changes 2015-09-08 18:11:04.000000000 +0200 @@ -1,0 +2,17 @@ +Tue Aug 18 18:47:34 UTC 2015 - [email protected] + +- Update to 2.1: + * Esc closes chat windows + * Fix licence window on Linux + * Set status to offline after disconnected because of multilogin +- Update to 2.0: + * Port to Qt 5.2 + * Store content of input box in chat widgets + * Paste and send action added to chat widget + * Add option to open chat windows minimized on incoming message + * Hide description option also affects notifications + * Plugin categories are now translated + * Remove support for configuration files of Kadu 0.6.5 + * Many bugfixes and minor changes + +------------------------------------------------------------------- Old: ---- anonymous_check-1.0-3.tar.bz2 globalhotkeys-1.0-33.tar.bz2 import_history-1.0-4.tar.bz2 kadu-1.5.tar.bz2 kadu_completion-1.0-4.tar.bz2 lednotify-1.0-34.tar.bz2 messagessplitter-1.0-6.tar.bz2 mime_tex-1.0-3.tar.bz2 networkping-1.0-5.tar.bz2 nextinfo-1.0-10.tar.bz2 panelkadu-1.0-11.tar.bz2 senthistory-1.0-12.tar.bz2 New: ---- anonymous_check-2.0.1.tar.bz2 import_history-2.0.tar.bz2 kadu-2.1.tar.bz2 kadu_completion-2.0.tar.bz2 mime_tex-2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kadu.spec ++++++ --- /var/tmp/diff_new_pack.Mr6Pj2/_old 2015-09-08 18:11:32.000000000 +0200 +++ /var/tmp/diff_new_pack.Mr6Pj2/_new 2015-09-08 18:11:32.000000000 +0200 @@ -21,7 +21,7 @@ %define build_penguins 0 Name: kadu -Version: 1.5 +Version: 2.1 Release: 0 # Choosing GPL-3.0+ because of presence and usage of numerous GPL-3.0 files Summary: Gadu-Gadu and Jabber/XMPP protocol Instant Messenger @@ -34,17 +34,10 @@ # PATCH-FIX-UPSTREAM 0001-fix_SDK_DIR.patch [email protected] -- fixed CMake Buildfailure Patch1: 0001-fix_SDK_DIR.patch ### 1x - External Plugins ### -Source09: http://download.kadu.im/external-plugins/stable/anonymous_check-1.0-3.tar.bz2 -Source10: http://download.kadu.im/external-plugins/stable/kadu_completion-1.0-4.tar.bz2 -Source11: http://download.kadu.im/external-plugins/stable/globalhotkeys-1.0-33.tar.bz2 -Source12: http://download.kadu.im/external-plugins/stable/import_history-1.0-4.tar.bz2 -Source13: http://download.kadu.im/external-plugins/stable/lednotify-1.0-34.tar.bz2 -Source14: http://download.kadu.im/external-plugins/stable/messagessplitter-1.0-6.tar.bz2 -Source15: http://download.kadu.im/external-plugins/stable/mime_tex-1.0-3.tar.bz2 -Source16: http://download.kadu.im/external-plugins/stable/networkping-1.0-5.tar.bz2 -Source17: http://download.kadu.im/external-plugins/stable/nextinfo-1.0-10.tar.bz2 -Source18: http://download.kadu.im/external-plugins/stable/panelkadu-1.0-11.tar.bz2 -Source19: http://download.kadu.im/external-plugins/stable/senthistory-1.0-12.tar.bz2 +Source10: http://download.kadu.im/external-plugins/2.0/anonymous_check-2.0.1.tar.bz2 +Source11: http://download.kadu.im/external-plugins/2.0/import_history-2.0.tar.bz2 +Source12: http://download.kadu.im/external-plugins/2.0/kadu_completion-2.0.tar.bz2 +Source13: http://download.kadu.im/external-plugins/2.0/mime_tex-2.0.tar.bz2 ### 2x - Emoticons ### %if %{build_penguins} Source20: kompatybilne_z_GG6.tar.gz @@ -57,34 +50,52 @@ Source33: kadu-sound-michalsrodek.tar.bz2 Source34: kadu-sound-percussion.tar.bz2 Source35: kadu-sound-ultr.tar.bz2 -BuildRequires: cmake >= 2.8.10 +BuildRequires: cmake >= 2.8.11 BuildRequires: fdupes +BuildRequires: libqt5-linguist-devel >= 5.2 BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel -BuildRequires: pkgconfig(QtGui) >= 4.8.0 -BuildRequires: pkgconfig(QtWebKit) >= 4.8.0 +BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2 +BuildRequires: pkgconfig(Qt5Core) >= 5.2 +BuildRequires: pkgconfig(Qt5DBus) >= 5.2 +BuildRequires: pkgconfig(Qt5Declarative) >= 5.2 +BuildRequires: pkgconfig(Qt5Multimedia) >= 5.2 +BuildRequires: pkgconfig(Qt5Network) >= 5.2 +BuildRequires: pkgconfig(Qt5WebKit) >= 5.2 +BuildRequires: pkgconfig(Qt5WebKitWidgets) >= 5.2 +BuildRequires: pkgconfig(Qt5Widgets) >= 5.2 +BuildRequires: pkgconfig(Qt5X11Extras) >= 5.2 +BuildRequires: pkgconfig(Qt5Xml) >= 5.2 +BuildRequires: pkgconfig(Qt5XmlPatterns) >= 5.2 BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(enchant) +BuildRequires: pkgconfig(injeqt) >= 1.0 BuildRequires: pkgconfig(libarchive) >= 2.6.0 BuildRequires: pkgconfig(libgadu) >= 1.12.1 BuildRequires: pkgconfig(libidn) -%if %{?suse_version} < 1310 -BuildRequires: pkgconfig(libntrack-qt4) -%endif BuildRequires: pkgconfig(libotr) >= 4.0 -BuildRequires: pkgconfig(phonon) -BuildRequires: pkgconfig(qca2) +BuildRequires: pkgconfig(phonon4qt5) +BuildRequires: pkgconfig(qca2-qt5) BuildRequires: pkgconfig(sndfile) +BuildRequires: pkgconfig(sqlite3) # runtime requires -Requires: libgadu3 >= 1.12.0 -# sql_history plugin needs qt4-sqlite to operate -Requires: libqt4-sql-sqlite +Requires: libgadu3 >= 1.12.1 +# sql_history plugin needs qt5-sqlite to operate +Requires: libQt5Sql5-sqlite +# packages dropped in kadu-2.0 +Obsoletes: globalhotkeys +Obsoletes: lednotify +Obsoletes: messagessplitter +Obsoletes: networkping +Obsoletes: nextinfo +Obsoletes: panelkadu +Obsoletes: senthistory BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Kadu is an open source Gadu-Gadu and Jabber/XMPP protocol Instant Messenger client for Linux, BSD, Mac OS X and Windows. Kadu depends on Qt library -version 4.7. Kadu supports KDE, GNOME and Window Maker as well. +version 5.2. Kadu supports KDE, GNOME and Window Maker as well. The core of Kadu is the libgadu library (its role being handling the network layer). %package devel @@ -96,7 +107,7 @@ %description devel Kadu is an open source Gadu-Gadu and Jabber/XMPP protocol Instant Messenger client for Linux, BSD, Mac OS X and Windows. Kadu depends on Qt library -version 4.7. Kadu supports KDE, GNOME and Window Maker as well. +version 5.2. Kadu supports KDE, GNOME and Window Maker as well. The core of Kadu is the libgadu library (its role being handling the network layer). Files mandatory for development. @@ -121,15 +132,6 @@ %description completion Bash completion-like module for Kadu. -%package globalhotkeys -Summary: Global hotkeys support to Kadu -License: GPL-3.0+ -Group: Productivity/Networking/Instant Messenger -Requires: %{name} = %{version} - -%description globalhotkeys -Globalhotkeys is a plugin that adds support to global hotkeys in kadu. - %package import_history Summary: History import plugin License: GPL-3.0+ @@ -139,24 +141,6 @@ %description import_history History import plugins allows to import history from Gadu-Gadu 7, 8. -%package lednotify -Summary: Notification by Scroll Lock LED -License: GPL-3.0+ -Group: Productivity/Networking/Instant Messenger -Requires: %{name} = %{version} - -%description lednotify -Led_notify is a plugin to notify user of some events using Scroll Lock LED. - -%package messagessplitter -Summary: Automatically splits too long messages -License: GPL-3.0+ -Group: Productivity/Networking/Instant Messenger -Requires: %{name} = %{version} - -%description messagessplitter -Messagesplitter allows to split too long messages. - %package mimetex Summary: TeX formulas support License: GPL-3.0+ @@ -166,42 +150,6 @@ %description mimetex Mime_tex is a plugin to edit TeX mathematic formulas in chat window. -%package networkping -Summary: Periodically checks the network state -License: GPL-3.0+ -Group: Productivity/Networking/Instant Messenger -Requires: %{name} = %{version} - -%description networkping -Networkping plugin checks the network state using ntrack library. - -%package nextinfo -Summary: Extended contact information support -License: GPL-3.0+ -Group: Productivity/Networking/Instant Messenger -Requires: %{name} = %{version} - -%description nextinfo -New ext_info plugin providing extended contact information support. - -%package panelkadu -Summary: Makes a panel from Kadu main window -License: GPL-3.0+ -Group: Productivity/Networking/Instant Messenger -Requires: %{name} = %{version} - -%description panelkadu -Panelkadu is a plugin to make a panel from Kadu main window. - -%package senthistory -Summary: History of sent messages in chat windows -License: GPL-3.0+ -Group: Productivity/Networking/Instant Messenger -Requires: %{name} = %{version} - -%description senthistory -Senthistory is a plugin which adds history of sent messages to chat windows. - ### Emoticons ### %if %{build_penguins} @@ -296,7 +244,7 @@ %prep %setup -q -n %{real} # add external plugins -%setup -qTD -a09 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -n %{real}/plugins +%setup -qTD -a10 -a11 -a12 -a13 -n %{real}/plugins # add additionals emoticons %if %{build_penguins} %setup -qTD -a20 -a21 -n %{real}/varia/themes/emoticons @@ -307,15 +255,20 @@ %setup -qDTn %{real} # enable external plugins (patch0): # -# anonymous_check, completion, globalhotkeys, importhistory, lednotify, -# messagessplitter, mime_tex, networkping, nextinfo, panelkadu, senthistory +# anonymous_check, completion, importhistory, mime_tex # %patch0 %patch1 -p1 +# fix QtCrypto path +sed -e 's:QtCrypto/QtCrypto:Qca-qt5/QtCrypto/QtCrypto:' -i kadu-core/main.cpp + # switch state of internal plugins # don't enable mpd since it's not in oss repository sed -e 's:\t\tmpd_mediaplayer:\t\t# mpd_mediaplayer:' -i Plugins.cmake +# disable unity related plugin +sed -e 's:\t\tunity_integration:\t\t# unity_integration:' -i Plugins.cmake +sed -e 's:\t\tindicator_docking:\t\t# indicator_docking:' -i Plugins.cmake # enable additionals emoticons %if %{build_penguins} @@ -333,7 +286,8 @@ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DWITH_ENCHANT=ON \ - -DINSTALL_UNOFFICIAL_TRANSLATIONS=ON + -DINSTALL_UNOFFICIAL_TRANSLATIONS=ON \ + -DQCA_SUFFIX:STRING=qt5 make %{?_smp_mflags} %install @@ -392,7 +346,8 @@ %{_datadir}/kadu/AUTHORS.html %{_datadir}/kadu/ChangeLog %{_datadir}/kadu/ChangeLog.OLD-PL -%{_datadir}/kadu/COPYING +%{_datadir}/kadu/COPYING.GPL2 +%{_datadir}/kadu/COPYING.LGPL2.1 %{_datadir}/kadu/HISTORY %{_datadir}/kadu/README %{_datadir}/kadu/THANKS @@ -434,7 +389,6 @@ %{_datadir}/kadu/plugins/profiles_import.desc %{_datadir}/kadu/plugins/qt4_docking.desc %{_datadir}/kadu/plugins/qt4_docking_notify.desc -%{_datadir}/kadu/plugins/qt4_sound.desc %{_datadir}/kadu/plugins/screenshot.desc %{_datadir}/kadu/plugins/simpleview.desc %{_datadir}/kadu/plugins/single_window.desc @@ -519,7 +473,6 @@ %{_datadir}/kadu/plugins/translations/phonon_sound_*.qm %{_datadir}/kadu/plugins/translations/profiles_import_*.qm %{_datadir}/kadu/plugins/translations/qt4_docking_*.qm -%{_datadir}/kadu/plugins/translations/qt4_sound_*.qm %{_datadir}/kadu/plugins/translations/screenshot_*.qm %{_datadir}/kadu/plugins/translations/simpleview_*.qm %{_datadir}/kadu/plugins/translations/single_window_*.qm @@ -586,7 +539,6 @@ %{_libdir}/kadu/plugins/libprofiles_import.so %{_libdir}/kadu/plugins/libqt4_docking.so %{_libdir}/kadu/plugins/libqt4_docking_notify.so -%{_libdir}/kadu/plugins/libqt4_sound.so %{_libdir}/kadu/plugins/libscreenshot.so %{_libdir}/kadu/plugins/libsimpleview.so %{_libdir}/kadu/plugins/libsingle_window.so @@ -621,33 +573,12 @@ %{_datadir}/kadu/plugins/data/kadu_completion/list.txt %{_datadir}/kadu/plugins/kadu_completion.desc -%files globalhotkeys -%defattr(-,root,root) -%{_libdir}/kadu/plugins/libglobalhotkeys.so -%{_datadir}/kadu/plugins/globalhotkeys.desc -%{_datadir}/kadu/plugins/configuration/globalhotkeys.ui -%{_datadir}/kadu/plugins/translations/globalhotkeys*.qm - %files import_history %defattr(-,root,root) %{_libdir}/kadu/plugins/libimport_history.so %{_datadir}/kadu/plugins/import_history.desc %{_datadir}/kadu/plugins/translations/import_history*.qm -%files lednotify -%defattr(-,root,root) -%{_libdir}/kadu/plugins/liblednotify.so -%{_datadir}/kadu/plugins/lednotify.desc -%{_datadir}/kadu/plugins/configuration/lednotify.ui -%{_datadir}/kadu/plugins/translations/lednotify*.qm - -%files messagessplitter -%defattr(-,root,root) -%{_libdir}/kadu/plugins/libmessagessplitter.so -%{_datadir}/kadu/plugins/messagessplitter.desc -%{_datadir}/kadu/plugins/configuration/messagessplitter.ui -%{_datadir}/kadu/plugins/translations/messagessplitter*.qm - %files mimetex %defattr(-,root,root) %dir %{_datadir}/kadu/plugins/data/mime_tex @@ -664,34 +595,6 @@ %dir %{_datadir}/kadu/plugins/data/mime_tex/mime_tex_icons %{_datadir}/kadu/plugins/data/mime_tex/mime_tex_icons/*.png -%files networkping -%defattr(-,root,root) -%{_libdir}/kadu/plugins/libnetworkping.so -%{_datadir}/kadu/plugins/networkping.desc -%{_datadir}/kadu/plugins/configuration/networkping.ui -%{_datadir}/kadu/plugins/translations/networkping*.qm - -%files nextinfo -%defattr(-,root,root) -%{_libdir}/kadu/plugins/libnextinfo.so -%{_datadir}/kadu/plugins/nextinfo.desc -%{_datadir}/kadu/plugins/configuration/nextinfo.ui -%{_datadir}/kadu/plugins/translations/nextinfo*.qm - -%files panelkadu -%defattr(-,root,root) -%{_libdir}/kadu/plugins/libpanelkadu.so -%{_datadir}/kadu/plugins/panelkadu.desc -%{_datadir}/kadu/plugins/configuration/panelkadu.ui -%{_datadir}/kadu/plugins/translations/panelkadu*.qm - -%files senthistory -%defattr(-,root,root) -%{_libdir}/kadu/plugins/libsenthistory.so -%{_datadir}/kadu/plugins/senthistory.desc -%{_datadir}/kadu/plugins/configuration/senthistory.ui -%{_datadir}/kadu/plugins/translations/senthistory*.qm - ### Emoticons ### %if %{build_penguins} ++++++ anonymous_check-1.0-3.tar.bz2 -> anonymous_check-2.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/anonymous_check/anonymous_check.cpp new/anonymous_check/anonymous_check.cpp --- old/anonymous_check/anonymous_check.cpp 2014-07-30 23:48:02.000000000 +0200 +++ new/anonymous_check/anonymous_check.cpp 2015-01-25 00:51:46.000000000 +0100 @@ -37,8 +37,6 @@ } AnonCheck::AnonymousCheck::~AnonymousCheck() { - disconnect(Core::instance()->chatWidgetManager(), SIGNAL(chatWidgetCreated(ChatWidget *)), - this, SLOT(onChatWidgetCreated(ChatWidget *))); } void AnonCheck::AnonymousCheck::configurationUpdated() { ++++++ enable_external_plugins.patch ++++++ --- /var/tmp/diff_new_pack.Mr6Pj2/_old 2015-09-08 18:11:32.000000000 +0200 +++ /var/tmp/diff_new_pack.Mr6Pj2/_new 2015-09-08 18:11:32.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- Plugins.cmake.orig +++ Plugins.cmake -@@ -128,6 +128,29 @@ if (UNIX AND NOT APPLE) +@@ -134,6 +134,15 @@ if (UNIX AND NOT APPLE) falf_mediaplayer # MPD mediaplayer support mpd_mediaplayer @@ -11,24 +11,10 @@ + anonymous_check + # kadu completion + kadu_completion -+ # global hotkeys support -+ globalhotkeys + # support for importing history from gg 7 & 8 + import_history -+ # lednotify support -+ lednotify -+ # split too long messages -+ messagessplitter + # mimetex support + mime_tex -+ # network ping support -+ networkping -+ # nextinfo -+ nextinfo -+ # panelkadu -+ panelkadu -+ # history for sent sms -+ senthistory ) + endif (UNIX AND NOT APPLE) - if (KADU_WITH_LIBINDICATE_QT) ++++++ import_history-1.0-4.tar.bz2 -> import_history-2.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/import_history/CMakeLists.txt new/import_history/CMakeLists.txt --- old/import_history/CMakeLists.txt 2014-07-30 23:48:34.000000000 +0200 +++ new/import_history/CMakeLists.txt 2015-01-24 00:29:58.000000000 +0100 @@ -28,7 +28,7 @@ include_directories (${LIBGADU_INCLUDE_DIRS} ${SQLITE3_INCLUDE_DIRS}) link_directories (${LIBGADU_LIBRARY_DIRS} ${SQLITE3_LIBRARY_DIRS}) -qt4_wrap_ui(import_history_UIS gui/import_history.ui) +#qt5_wrap_ui(import_history_UIS gui/import_history.ui) include_directories (${CMAKE_CURRENT_BINARY_DIR}) kadu_plugin(import_history diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/import_history/gui/ui_import_history.h new/import_history/gui/ui_import_history.h --- old/import_history/gui/ui_import_history.h 1970-01-01 01:00:00.000000000 +0100 +++ new/import_history/gui/ui_import_history.h 2015-01-24 00:29:58.000000000 +0100 @@ -0,0 +1,243 @@ +/******************************************************************************** +** Form generated from reading UI file 'import_history.ui' +** +** Created by: Qt User Interface Compiler version 5.3.0 +** +** WARNING! All changes made in this file will be lost when recompiling UI file! +********************************************************************************/ + +#ifndef UI_IMPORT_HISTORY_H +#define UI_IMPORT_HISTORY_H + +#include <QtCore/QVariant> +#include <QtWidgets/QAction> +#include <QtWidgets/QApplication> +#include <QtWidgets/QButtonGroup> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QGridLayout> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QHeaderView> +#include <QtWidgets/QLabel> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QProgressBar> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QSpacerItem> +#include <QtWidgets/QTabWidget> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QWidget> + +QT_BEGIN_NAMESPACE + +class Ui_ImportHistory +{ +public: + QVBoxLayout *verticalLayout_2; + QTabWidget *tabWidget; + QWidget *oldGG; + QVBoxLayout *verticalLayout_4; + QLabel *label_2; + QLabel *hint_old; + QHBoxLayout *horizontalLayout_2; + QLabel *label; + QLineEdit *ggPath; + QPushButton *ggBrowseButton; + QSpacerItem *verticalSpacer; + QWidget *newGG; + QVBoxLayout *verticalLayout; + QLabel *label_3; + QLabel *hint_new; + QHBoxLayout *horizontalLayout_3; + QLabel *label_4; + QLineEdit *gg8Path; + QPushButton *gg8BrowseButton; + QSpacerItem *verticalSpacer_2; + QGridLayout *gridLayout; + QProgressBar *progressBar; + QLabel *label_5; + QPushButton *proceedButton; + QPushButton *cancelButton; + QSpacerItem *horizontalSpacer; + QSpacerItem *horizontalSpacer_2; + QComboBox *accountCBox; + + void setupUi(QWidget *ImportHistory) + { + if (ImportHistory->objectName().isEmpty()) + ImportHistory->setObjectName(QStringLiteral("ImportHistory")); + ImportHistory->resize(635, 201); + verticalLayout_2 = new QVBoxLayout(ImportHistory); + verticalLayout_2->setObjectName(QStringLiteral("verticalLayout_2")); + tabWidget = new QTabWidget(ImportHistory); + tabWidget->setObjectName(QStringLiteral("tabWidget")); + oldGG = new QWidget(); + oldGG->setObjectName(QStringLiteral("oldGG")); + verticalLayout_4 = new QVBoxLayout(oldGG); + verticalLayout_4->setObjectName(QStringLiteral("verticalLayout_4")); + label_2 = new QLabel(oldGG); + label_2->setObjectName(QStringLiteral("label_2")); + + verticalLayout_4->addWidget(label_2); + + hint_old = new QLabel(oldGG); + hint_old->setObjectName(QStringLiteral("hint_old")); + + verticalLayout_4->addWidget(hint_old); + + horizontalLayout_2 = new QHBoxLayout(); + horizontalLayout_2->setObjectName(QStringLiteral("horizontalLayout_2")); + label = new QLabel(oldGG); + label->setObjectName(QStringLiteral("label")); + + horizontalLayout_2->addWidget(label); + + ggPath = new QLineEdit(oldGG); + ggPath->setObjectName(QStringLiteral("ggPath")); + + horizontalLayout_2->addWidget(ggPath); + + ggBrowseButton = new QPushButton(oldGG); + ggBrowseButton->setObjectName(QStringLiteral("ggBrowseButton")); + + horizontalLayout_2->addWidget(ggBrowseButton); + + + verticalLayout_4->addLayout(horizontalLayout_2); + + verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding); + + verticalLayout_4->addItem(verticalSpacer); + + tabWidget->addTab(oldGG, QString()); + newGG = new QWidget(); + newGG->setObjectName(QStringLiteral("newGG")); + verticalLayout = new QVBoxLayout(newGG); + verticalLayout->setObjectName(QStringLiteral("verticalLayout")); + label_3 = new QLabel(newGG); + label_3->setObjectName(QStringLiteral("label_3")); + + verticalLayout->addWidget(label_3); + + hint_new = new QLabel(newGG); + hint_new->setObjectName(QStringLiteral("hint_new")); + + verticalLayout->addWidget(hint_new); + + horizontalLayout_3 = new QHBoxLayout(); + horizontalLayout_3->setObjectName(QStringLiteral("horizontalLayout_3")); + label_4 = new QLabel(newGG); + label_4->setObjectName(QStringLiteral("label_4")); + + horizontalLayout_3->addWidget(label_4); + + gg8Path = new QLineEdit(newGG); + gg8Path->setObjectName(QStringLiteral("gg8Path")); + + horizontalLayout_3->addWidget(gg8Path); + + gg8BrowseButton = new QPushButton(newGG); + gg8BrowseButton->setObjectName(QStringLiteral("gg8BrowseButton")); + + horizontalLayout_3->addWidget(gg8BrowseButton); + + + verticalLayout->addLayout(horizontalLayout_3); + + verticalSpacer_2 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding); + + verticalLayout->addItem(verticalSpacer_2); + + tabWidget->addTab(newGG, QString()); + + verticalLayout_2->addWidget(tabWidget); + + gridLayout = new QGridLayout(); + gridLayout->setObjectName(QStringLiteral("gridLayout")); + progressBar = new QProgressBar(ImportHistory); + progressBar->setObjectName(QStringLiteral("progressBar")); + progressBar->setValue(0); + + gridLayout->addWidget(progressBar, 0, 0, 1, 5); + + label_5 = new QLabel(ImportHistory); + label_5->setObjectName(QStringLiteral("label_5")); + + gridLayout->addWidget(label_5, 1, 0, 1, 2); + + proceedButton = new QPushButton(ImportHistory); + proceedButton->setObjectName(QStringLiteral("proceedButton")); + + gridLayout->addWidget(proceedButton, 2, 0, 1, 1); + + cancelButton = new QPushButton(ImportHistory); + cancelButton->setObjectName(QStringLiteral("cancelButton")); + + gridLayout->addWidget(cancelButton, 2, 4, 1, 1); + + horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + + gridLayout->addItem(horizontalSpacer, 1, 3, 1, 1); + + horizontalSpacer_2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + + gridLayout->addItem(horizontalSpacer_2, 2, 1, 1, 2); + + accountCBox = new QComboBox(ImportHistory); + accountCBox->setObjectName(QStringLiteral("accountCBox")); + + gridLayout->addWidget(accountCBox, 1, 2, 1, 1); + + + verticalLayout_2->addLayout(gridLayout); + + + retranslateUi(ImportHistory); + + tabWidget->setCurrentIndex(0); + + + QMetaObject::connectSlotsByName(ImportHistory); + } // setupUi + + void retranslateUi(QWidget *ImportHistory) + { + ImportHistory->setWindowTitle(QApplication::translate("ImportHistory", "Form", 0)); + label_2->setText(QApplication::translate("ImportHistory", "Gadu Gadu 7.0 and olders:", 0)); + hint_old->setText(QString()); + label->setText(QApplication::translate("ImportHistory", "Path to gadu-gadu archives file", 0)); +#ifndef QT_NO_TOOLTIP + ggPath->setToolTip(QApplication::translate("ImportHistory", "Exact path to archives.dat file.\n" +"File can be found in Gadu-Gadu's profile directory.", 0)); +#endif // QT_NO_TOOLTIP +#ifndef QT_NO_WHATSTHIS + ggPath->setWhatsThis(QApplication::translate("ImportHistory", "Exact path to archives.dat file.\n" +"File can be found in Gadu-Gadu's profile directory.", 0)); +#endif // QT_NO_WHATSTHIS + ggBrowseButton->setText(QApplication::translate("ImportHistory", "Browse", 0)); + tabWidget->setTabText(tabWidget->indexOf(oldGG), QApplication::translate("ImportHistory", "Old GG", 0)); + label_3->setText(QApplication::translate("ImportHistory", "Gadu Gadu version 8, 9 and 10:", 0)); + hint_new->setText(QString()); + label_4->setText(QApplication::translate("ImportHistory", "Path to gadu-gadu profile dir:", 0)); +#ifndef QT_NO_TOOLTIP + gg8Path->setToolTip(QApplication::translate("ImportHistory", "Path to Gadu-Gadu user's profile directory.\n" +"Given directory should contain Archive.db file and ImgCache subdirectory.", 0)); +#endif // QT_NO_TOOLTIP +#ifndef QT_NO_WHATSTHIS + gg8Path->setWhatsThis(QApplication::translate("ImportHistory", "Path to Gadu-Gadu user's profile directory.\n" +"Given directory should contain Archive.db file and ImgCache subdirectory.", 0)); +#endif // QT_NO_WHATSTHIS + gg8BrowseButton->setText(QApplication::translate("ImportHistory", "Browse", 0)); + tabWidget->setTabText(tabWidget->indexOf(newGG), QApplication::translate("ImportHistory", "New GG", 0)); + label_5->setText(QApplication::translate("ImportHistory", "Target account:", 0)); + proceedButton->setText(QApplication::translate("ImportHistory", "Import", 0)); + cancelButton->setText(QApplication::translate("ImportHistory", "Cancel", 0)); + } // retranslateUi + +}; + +namespace Ui { + class ImportHistory: public Ui_ImportHistory {}; +} // namespace Ui + +QT_END_NAMESPACE + +#endif // UI_IMPORT_HISTORY_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/import_history/importers/gg7/ggimporter.cpp new/import_history/importers/gg7/ggimporter.cpp --- old/import_history/importers/gg7/ggimporter.cpp 2014-07-30 23:48:34.000000000 +0200 +++ new/import_history/importers/gg7/ggimporter.cpp 2015-01-24 00:29:58.000000000 +0100 @@ -26,7 +26,7 @@ #include "accounts/account-manager.h" #include "message/message.h" -#include "configuration/configuration-file.h" +#include "configuration/configuration-api.h" #include "contacts/contact-set.h" #include "contacts/contact-manager.h" #include <core/core.h> @@ -88,7 +88,7 @@ void ImportFromGG::run() { //kodowanie historii - QTextCodec::setCodecForCStrings(QTextCodec::codecForName("cp1250")); + // auto codec = QTextCodec::codecForName("cp1250"); if (cancel) return; @@ -296,7 +296,7 @@ position++; //null position+=8; //8 bajtów na crc i rozmiar (juz jest w nagłówku (img) ) - QFile img_file(Core::instance()->imageStorageService()->storagePath() + QString("%1-%2-%3-%4").arg(user.id().toInt()).arg(img.size).arg(img.crc32).arg(file_name.data())); + QFile img_file(Core::instance()->imageStorageService()->storagePath() + QString{"%1-%2-%3-%4"}.arg(user.id().toInt()).arg(img.size).arg(img.crc32).arg(file_name.data())); img_file.open(QIODevice::WriteOnly); img_file.write(reinterpret_cast<char*>(array+position),img.size); img_file.close(); ++++++ kadu-1.5.tar.bz2 -> kadu-2.1.tar.bz2 ++++++ ++++ 292356 lines of diff (skipped) ++++++ kadu_completion-1.0-4.tar.bz2 -> kadu_completion-2.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kadu_completion/kadu_completion.cpp new/kadu_completion/kadu_completion.cpp --- old/kadu_completion/kadu_completion.cpp 2014-08-09 01:57:44.000000000 +0200 +++ new/kadu_completion/kadu_completion.cpp 2015-01-24 01:06:08.000000000 +0100 @@ -1,11 +1,12 @@ #include "completion_context.h" #include "kadu_completion.h" +#include "kadu-core/core/application.h" #include "kadu-core/core/core.h" #include "kadu-core/debug.h" #include "kadu-core/gui/widgets/chat-widget/chat-widget.h" #include "kadu-core/gui/widgets/chat-widget/chat-widget-repository.h" -#include "kadu-core/misc/kadu-paths.h" +#include "kadu-core/misc/paths-provider.h" #include <QFile> #include <QString> @@ -43,7 +44,7 @@ KaduCompletion::KaduCompletion::KaduCompletion() { kdebugf(); - QString listFileName(KaduPaths::instance()->dataPath() + "plugins/data/kadu_completion/list.txt"); + QString listFileName(Application::instance()->pathsProvider()->dataPath() + "plugins/data/kadu_completion/list.txt"); QFile file(listFileName); QTextCodec* codec = QTextCodec::codecForName("Windows-1250"); if(file.open(QIODevice::ReadOnly)) { ++++++ mime_tex-1.0-3.tar.bz2 -> mime_tex-2.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mime_tex/mime_tex.cpp new/mime_tex/mime_tex.cpp --- old/mime_tex/mime_tex.cpp 2014-07-30 23:48:25.000000000 +0200 +++ new/mime_tex/mime_tex.cpp 2015-01-24 01:06:13.000000000 +0100 @@ -18,14 +18,16 @@ #include "gui/actions/action-context.h" #include "kadu-core/chat/chat-manager.h" #include "kadu-core/contacts/contact-set.h" -#include "kadu-core/configuration/configuration-file.h" +#include "kadu-core/configuration/configuration-api.h" +#include "kadu-core/configuration/deprecated-configuration-api.h" #include "kadu-core/icons/icons-manager.h" #include "kadu-core/gui/widgets/chat-widget/chat-widget.h" #include "kadu-core/gui/widgets/chat-widget/chat-widget-repository.h" #include "kadu-core/gui/windows/main-window.h" -#include "kadu-core/misc/kadu-paths.h" +#include "kadu-core/misc/paths-provider.h" #include "kadu-core/debug.h" -#include <core/core.h> +#include "kadu-core/core/core.h" +#include "kadu-core/core/application.h" MimeTeX::MimeTeX * MimeTeX::MimeTeX::Instance = 0; @@ -51,7 +53,7 @@ { kdebugf(); - config_file.addVariable("MimeTeX", "mimetex_font_size", MimeTeX::defaultFontSize()); + Application::instance()->configuration()->deprecatedApi()->addVariable("MimeTeX", "mimetex_font_size", MimeTeX::defaultFontSize()); TeXActionDescription = new ActionDescription( this, @@ -59,7 +61,7 @@ "TeXformulaAction", this, SLOT(TeXActionActivated(QAction *, bool)), - KaduIcon(KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/tex_icon.png"), + KaduIcon(Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/tex_icon.png"), tr("Insert TeX formula")); kdebugf2(); @@ -70,7 +72,7 @@ kdebugf(); emit deleting(); - if(config_file.readBoolEntry("MimeTeX", "mimetex_remove_tmp_files", false)) + if(Application::instance()->configuration()->deprecatedApi()->readBoolEntry("MimeTeX", "mimetex_remove_tmp_files", false)) { kdebugm(KDEBUG_INFO, "Removing tmp GIFs\n"); QStringList::ConstIterator it; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mime_tex/mime_tex_plugin.cpp new/mime_tex/mime_tex_plugin.cpp --- old/mime_tex/mime_tex_plugin.cpp 2014-07-30 23:48:25.000000000 +0200 +++ new/mime_tex/mime_tex_plugin.cpp 2015-01-24 01:06:13.000000000 +0100 @@ -7,8 +7,9 @@ * * ***************************************************************************/ +#include "core/application.h" #include "gui/windows/main-configuration-window.h" -#include "misc/kadu-paths.h" +#include "misc/paths-provider.h" #include "mime_tex.h" @@ -22,7 +23,7 @@ { Q_UNUSED(firstLoad) - MainConfigurationWindow::registerUiFile(KaduPaths::instance()->dataPath() + "plugins/configuration/mime_tex.ui"); + MainConfigurationWindow::registerUiFile(Application::instance()->pathsProvider()->dataPath() + "plugins/configuration/mime_tex.ui"); MimeTeX::createInstance(); return true; @@ -31,7 +32,7 @@ void MimeTeX::MimeTeXPlugin::done() { MimeTeX::destroyInstance(); - MainConfigurationWindow::unregisterUiFile(KaduPaths::instance()->dataPath() + "plugins/configuration/mime_tex.ui"); + MainConfigurationWindow::unregisterUiFile(Application::instance()->pathsProvider()->dataPath() + "plugins/configuration/mime_tex.ui"); } Q_EXPORT_PLUGIN2(mime_tex, MimeTeX::MimeTeXPlugin) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mime_tex/tex_formula_dialog.cpp new/mime_tex/tex_formula_dialog.cpp --- old/mime_tex/tex_formula_dialog.cpp 2014-07-30 23:48:25.000000000 +0200 +++ new/mime_tex/tex_formula_dialog.cpp 2015-01-24 01:06:13.000000000 +0100 @@ -25,10 +25,12 @@ #include "mime_tex.h" #include "kadu-core/gui/widgets/chat-widget/chat-widget.h" -#include "kadu-core/configuration/configuration-file.h" +#include "kadu-core/configuration/configuration-api.h" +#include "kadu-core/configuration/deprecated-configuration-api.h" #include "kadu-core/gui/widgets/custom-input.h" -#include "kadu-core/misc/kadu-paths.h" +#include "kadu-core/misc/paths-provider.h" #include "kadu-core/debug.h" +#include "kadu-core/core/application.h" const int formulaMargin = 5; const int componentsViewMinWidht = 401; @@ -43,14 +45,14 @@ setAttribute(Qt::WA_DeleteOnClose); // Check if .kadu/tex directory exists. Create one if not. - QDir TeXDir(KaduPaths::instance()->profilePath() + "tex"); + QDir TeXDir(Application::instance()->pathsProvider()->profilePath() + "tex"); if(!TeXDir.exists()) - if(TeXDir.mkdir(KaduPaths::instance()->profilePath() + "tex")) { - kdebugm(KDEBUG_INFO, "Error creating directory %s\n", QString(KaduPaths::instance()->profilePath() + "tex").toLatin1().constData()); + if(TeXDir.mkdir(Application::instance()->pathsProvider()->profilePath() + "tex")) { + kdebugm(KDEBUG_INFO, "Error creating directory %s\n", QString(Application::instance()->pathsProvider()->profilePath() + "tex").toLatin1().constData()); } QDateTime curTime = QDateTime::currentDateTime(); - tmpFileName = KaduPaths::instance()->profilePath() + QString("tex/formula_%1.gif").arg(curTime.toString("yyyy-MM-dd_hh-mm")); + tmpFileName = Application::instance()->pathsProvider()->profilePath() + QString("tex/formula_%1.gif").arg(curTime.toString("yyyy-MM-dd_hh-mm")); if(QFile(tmpFileName).exists()) { kdebugm(KDEBUG_INFO, "File %s already exists!!\n", tmpFileName.toLatin1().constData()); @@ -58,7 +60,7 @@ QString tmpStr; do { - tmpStr = KaduPaths::instance()->profilePath() + QString("tex/formula_%1_%2.gif").arg(curTime.toString("yyyy-MM-dd_hh:mm")).arg(i++); + tmpStr = Application::instance()->pathsProvider()->profilePath() + QString("tex/formula_%1_%2.gif").arg(curTime.toString("yyyy-MM-dd_hh:mm")).arg(i++); kdebugm(KDEBUG_INFO, "tmpStr: %s\n", tmpStr.toLatin1().constData()); } while(QFile(tmpStr).exists()); @@ -101,19 +103,19 @@ symbolsView->setViewMode(QListWidget::IconMode); componentsView->addTab(relationsView, - QPixmap(KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_icon.png"), + QPixmap(Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_icon.png"), tr("&Relations")); componentsView->addTab(greekLettersView, - QPixmap(KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_icon.png"), + QPixmap(Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_icon.png"), tr("&Greek Letters")); componentsView->addTab(arrowsView, - QPixmap(KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_icon.png"), + QPixmap(Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_icon.png"), tr("&Arrows")); componentsView->addTab(delimitersView, - QPixmap(KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_icon.png"), + QPixmap(Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_icon.png"), tr("&Delimiters")); componentsView->addTab(symbolsView, - QPixmap(KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_icon.png"), + QPixmap(Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_icon.png"), tr("&Symbols")); connect(relationsView, SIGNAL(itemClicked(QListWidgetItem *)), this, SLOT(insertComponentSlot(QListWidgetItem *))); @@ -122,433 +124,433 @@ connect(delimitersView, SIGNAL(itemClicked(QListWidgetItem *)), this, SLOT(insertComponentSlot(QListWidgetItem *))); connect(symbolsView, SIGNAL(itemClicked(QListWidgetItem *)), this, SLOT(insertComponentSlot(QListWidgetItem *))); - kdebugm(KDEBUG_INFO, "%s\n", KaduPaths::instance()->dataPath().toLocal8Bit().constData()); - kdebugm(KDEBUG_INFO, "%s\n", QString(KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_frac.png").toLocal8Bit().constData()); + kdebugm(KDEBUG_INFO, "%s\n", Application::instance()->pathsProvider()->dataPath().toLocal8Bit().constData()); + kdebugm(KDEBUG_INFO, "%s\n", QString(Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_frac.png").toLocal8Bit().constData()); // Filling Relations tab (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_frac.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_frac.png")), "\\frac{}{}", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_index_upper.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_index_upper.png")), "^{}", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_index_lower.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_index_lower.png")), "_{}", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_sqrt.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_sqrt.png")), "\\sqrt{}", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_sqrt_n.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_sqrt_n.png")), "\\sqrt[]{}", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_geq.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_geq.png")), "\\geq", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_leq.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_leq.png")), "\\leq", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_sim.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_sim.png")), "\\sim", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_neq.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_neq.png")), "\\neq", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_equiv.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_equiv.png")), "\\equiv", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_approx.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_approx.png")), "\\approx", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_simeq.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_simeq.png")), "\\simeq", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_ll.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_ll.png")), "\\ll", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_gg.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_gg.png")), "\\gg", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_pm.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_pm.png")), "\\pm", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_in.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_in.png")), "\\in", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_ni.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_ni.png")), "\\ni", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_cap.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_cap.png")), "\\cap", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_cup.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_cup.png")), "\\cup", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_bigcap.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_bigcap.png")), "\\bigcap", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_bigcup.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_bigcup.png")), "\\bigcup", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_subset.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_subset.png")), "\\subset", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_supset.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_supset.png")), "\\supset", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_subseteq.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_subseteq.png")), "\\subseteq", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_supseteq.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_supseteq.png")), "\\supseteq", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_sum.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_sum.png")), "\\sum{}", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_sum_from.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_sum_from.png")), "\\sum\\limits_{}{}", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_sum_from_to.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_sum_from_to.png")), "\\sum\\limits_{}^{}{}", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_prod.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_prod.png")), "\\prod{}", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_prod_from.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_prod_from.png")), "\\prod\\limits_{}{}", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_prod_from_to.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_prod_from_to.png")), "\\prod\\limits_{}^{}{}", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_int.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_int.png")), "\\int{}", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_int_from.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_int_from.png")), "\\int\\limits_{}{}", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_int_from_to.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_int_from_to.png")), "\\int\\limits_{}^{}{}", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_oint.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_oint.png")), "\\oint{}", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_oint_from.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_oint_from.png")), "\\oint\\limits_{}{}", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_oint_from_to.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_oint_from_to.png")), "\\oint\\limits_{}^{}{}", relationsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_lim.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/relations_tab_lim.png")), "\\lim_{}{}", relationsView); // Filling Greek Letters tab (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_alpha.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_alpha.png")), "\\alpha", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_beta.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_beta.png")), "\\beta", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_gamma.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_gamma.png")), "\\gamma", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Gamma.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Gamma.png")), "\\Gamma", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_delta.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_delta.png")), "\\delta", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Delta.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Delta.png")), "\\Delta", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_epsilon.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_epsilon.png")), "\\epsilon", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_varepsilon.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_varepsilon.png")), "\\varepsilon", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_zeta.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_zeta.png")), "\\zeta", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_eta.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_eta.png")), "\\eta", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_theta.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_theta.png")), "\\theta", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_vartheta.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_vartheta.png")), "\\vartheta", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Theta.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Theta.png")), "\\Theta", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_iota.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_iota.png")), "\\iota", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_kappa.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_kappa.png")), "\\kappa", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_lambda.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_lambda.png")), "\\lambda", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Lambda.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Lambda.png")), "\\Lambda", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_mu.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_mu.png")), "\\mu", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_nu.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_nu.png")), "\\nu", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_xi.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_xi.png")), "\\xi", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Xi.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Xi.png")), "\\Xi", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_pi.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_pi.png")), "\\pi", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_varpi.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_varpi.png")), "\\varpi", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Pi.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Pi.png")), "\\Pi", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_rho.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_rho.png")), "\\rho", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_varrho.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_varrho.png")), "\\varrho", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_sigma.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_sigma.png")), "\\sigma", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_varsigma.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_varsigma.png")), "\\varsigma", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Sigma.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Sigma.png")), "\\Sigma", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_tau.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_tau.png")), "\\tau", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_upsilon.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_upsilon.png")), "\\upsilon", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_phi.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_phi.png")), "\\phi", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_varphi.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_varphi.png")), "\\varphi", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Phi.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Phi.png")), "\\Phi", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_chi.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_chi.png")), "\\chi", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_psi.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_psi.png")), "\\psi", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Psi.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Psi.png")), "\\Psi", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_omega.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_omega.png")), "\\omega", greekLettersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Omega.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Omega.png")), "\\Omega", greekLettersView); // Filling arrows tab (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_vec.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_vec.png")), "\\vec{}", arrowsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_swarrow.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_swarrow.png")), "\\swarrow", arrowsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_leftarrow.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_leftarrow.png")), "\\leftarrow", arrowsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_nwarrow.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_nwarrow.png")), "\\nwarrow", arrowsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_uparrow.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_uparrow.png")), "\\uparrow", arrowsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_nearrow.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_nearrow.png")), "\\nearrow", arrowsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_rightarrow.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_rightarrow.png")), "\\rightarrow", arrowsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_searrow.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_searrow.png")), "\\searrow", arrowsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_leftrightarrow.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_leftrightarrow.png")), "\\leftrightarrow", arrowsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_updownarrow.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_updownarrow.png")), "\\updownarrow", arrowsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_longleftarrow.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_longleftarrow.png")), "\\longleftarrow", arrowsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_longrightarrow.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_longrightarrow.png")), "\\longrightarrow", arrowsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_longleftrightarrow.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_longleftrightarrow.png")), "\\longleftrightarrow", arrowsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_Leftarrow.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_Leftarrow.png")), "\\Leftarrow", arrowsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_Rightarrow.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_Rightarrow.png")), "\\Rightarrow", arrowsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_Uparrow.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_Uparrow.png")), "\\Uparrow", arrowsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_Downarrow.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_Downarrow.png")), "\\Downarrow", arrowsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_Leftrightarrow.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_Leftrightarrow.png")), "\\Leftrightarrow", arrowsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_Longleftarrow.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_Longleftarrow.png")), "\\Longleftarrow", arrowsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_Longrightarrow.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_Longrightarrow.png")), "\\Longrightarrow", arrowsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_Longleftrightarrow.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_Longleftrightarrow.png")), "\\Longleftrightarrow", arrowsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_leftharpoonup.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_leftharpoonup.png")), "\\leftharpoonup", arrowsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_leftharpoondown.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_leftharpoondown.png")), "\\leftharpoondown", arrowsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_rightharpoonup.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_rightharpoonup.png")), "\\rightharpoonup", arrowsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_rightharpoondown.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_rightharpoondown.png")), "\\rightharpoondown", arrowsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_rightleftharpoons.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/arrows_tab_rightleftharpoons.png")), "\\rightleftharpoons", arrowsView); // Filling Delimiters tab (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_lbrace.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_lbrace.png")), "\\lbrace", delimitersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_rbrace.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_rbrace.png")), "\\rbrace", delimitersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_langle.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_langle.png")), "\\langle", delimitersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_rangle.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_rangle.png")), "\\rangle", delimitersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_hat.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_hat.png")), "\\hat", delimitersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_overbrace.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_overbrace.png")), "\\overbrace{}", delimitersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_overbrace_desc.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_overbrace_desc.png")), "\\overbrace{}^{}", delimitersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_underbrace.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_underbrace.png")), "\\underbrace{}", delimitersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_underbrace_desc.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_underbrace_desc.png")), "\\underbrace{}_{}", delimitersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_overline.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_overline.png")), "\\overline{}", delimitersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_underline.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_underline.png")), "\\underline{}", delimitersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_left_bracket.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_left_bracket.png")), "\\left(", delimitersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_right_bracket.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_right_bracket.png")), "\\right)", delimitersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_left_square_bracket.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_left_square_bracket.png")), "\\left[", delimitersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_right_square_bracket.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_right_square_bracket.png")), "\\right]", delimitersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_left_lbrace.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_left_lbrace.png")), "\\left{", delimitersView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_right_rbrace.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/delimiters_tab_right_rbrace.png")), "\\right}", delimitersView); // Filling Symbols tab (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_infty.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_infty.png")), "\\infty", symbolsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_cdot.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_cdot.png")), "\\cdot", symbolsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_cdots.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_cdots.png")), "\\cdots", symbolsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_ldots.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_ldots.png")), "\\ldots", symbolsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_ddots.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_ddots.png")), "\\ddots", symbolsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_hbar.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_hbar.png")), "\\hbar", symbolsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_nabla.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_nabla.png")), "\\nabla", symbolsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_partial.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_partial.png")), "\\partial", symbolsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_aleph.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_aleph.png")), "\\aleph", symbolsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_Re.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_Re.png")), "\\Re", symbolsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_Im.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_Im.png")), "\\Im", symbolsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_bot.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_bot.png")), "\\bot", symbolsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_emptyset.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_emptyset.png")), "\\emptyset", symbolsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_prime.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_prime.png")), "\\prime", symbolsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_surd.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_surd.png")), "\\surd", symbolsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_angle.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_angle.png")), "\\angle", symbolsView); (void) new QListWidgetItem(QIcon(QPixmap( - KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_forall.png")), + Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/mime_tex_icons/symbols_tab_forall.png")), "\\forall", symbolsView); - undoButton = new QPushButton(QIcon(QPixmap(KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/editor_icons/undo.png")), + undoButton = new QPushButton(QIcon(QPixmap(Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/editor_icons/undo.png")), tr("&Undo"), this); - redoButton = new QPushButton(QIcon(QPixmap(KaduPaths::instance()->dataPath() + "plugins/data/mime_tex/editor_icons/redo.png")), + redoButton = new QPushButton(QIcon(QPixmap(Application::instance()->pathsProvider()->dataPath() + "plugins/data/mime_tex/editor_icons/redo.png")), tr("&Redo"), this); QPushButton *okButton = new QPushButton(tr("&Ok"), this); QPushButton *cancelButton = new QPushButton(tr("&Cancel"), this); @@ -578,7 +580,7 @@ undoButton->setEnabled(false); redoButton->setEnabled(false); - timer.start(config_file.readNumEntry("MimeTeX", "mimetex_refreshment_interval", 2000)); + timer.start(Application::instance()->configuration()->deprecatedApi()->readNumEntry("MimeTeX", "mimetex_refreshment_interval", 2000)); formulaTextEdit->setFocus(); kdebugf2(); @@ -612,10 +614,10 @@ file.remove(); QString formulaStr = formulaTextEdit->toPlainText(); formulaStr.replace(QChar('\n'), QChar(' ')); - if(!config_file.readBoolEntry("MimeTeX", "mimetex_transparent_bg", false)) + if(!Application::instance()->configuration()->deprecatedApi()->readBoolEntry("MimeTeX", "mimetex_transparent_bg", false)) arguments << "-o"; arguments << "-s"; - arguments << QString::number(config_file.readNumEntry("MimeTeX", "mimetex_font_size", + arguments << QString::number(Application::instance()->configuration()->deprecatedApi()->readNumEntry("MimeTeX", "mimetex_font_size", MimeTeX::defaultFontSize())); arguments << "-e"; arguments << tmpFileName; @@ -628,7 +630,7 @@ kdebugm(KDEBUG_INFO, "Arg[%d]=%s\n", i++, (*it).toLocal8Bit().constData()); #endif //mimeTeXProcess.start(libPath("bin/mime_tex/mimetex"), - mimeTeXProcess.start(KaduPaths::instance()->pluginsLibPath() + "bin/mime_tex/mimetex", + mimeTeXProcess.start(Application::instance()->pathsProvider()->pluginsLibPath() + "bin/mime_tex/mimetex", arguments); mimeTeXProcess.waitForStarted(); }
