Hello community, here is the log from the commit of package tea for openSUSE:Factory checked in at 2018-03-24 16:16:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tea (Old) and /work/SRC/openSUSE:Factory/.tea.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tea" Sat Mar 24 16:16:15 2018 rev:4 rq:590577 version:44.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/tea/tea.changes 2017-11-19 11:12:29.840967472 +0100 +++ /work/SRC/openSUSE:Factory/.tea.new/tea.changes 2018-03-24 16:16:34.068928693 +0100 @@ -1,0 +2,13 @@ +Fri Mar 23 07:45:29 UTC 2018 - [email protected] + +- Update to version 44.1.1: + * Fix the desktop file and icon stuff. + * Add an ability to build tea without QML using the new option: + qmake "CONFIG+=noqml" + That slightly reduces the memory footprint and is useful for + some purposes. +- AppStream file standard updates. +- Rename the .desktop file to org.semiletov.tea.desktop to comply + with freedesktop.org standards. + +------------------------------------------------------------------- Old: ---- tea-44.1.0.tar.bz2 tea.appdata.xml tea.desktop New: ---- org.semiletov.tea.appdata.xml org.semiletov.tea.desktop tea-44.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tea.spec ++++++ --- /var/tmp/diff_new_pack.ZW4k0z/_old 2018-03-24 16:16:34.876899568 +0100 +++ /var/tmp/diff_new_pack.ZW4k0z/_new 2018-03-24 16:16:34.884899279 +0100 @@ -1,7 +1,7 @@ # # spec file for package tea # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,15 @@ Name: tea -Version: 44.1.0 +Version: 44.1.1 Release: 0 Summary: Qt-based text editor with image viewer -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Text/Editors Url: http://semiletov.org/tea Source: http://semiletov.org/%{name}/dloads/%{name}-%{version}.tar.bz2 -Source1: %{name}.desktop -Source2: %{name}.appdata.xml +Source1: org.semiletov.tea.desktop +Source2: org.semiletov.tea.appdata.xml BuildRequires: hicolor-icon-theme BuildRequires: pkgconfig BuildRequires: update-desktop-files @@ -48,8 +48,9 @@ %prep %setup -q -cp -f %{SOURCE1} %{name}.desktop -cp -f %{SOURCE2} %{name}.appdata.xml +cp -f %{SOURCE1} org.semiletov.tea.desktop +cp -f %{SOURCE2} org.semiletov.tea.appdata.xml +sed -i '/^INSTALLS += /s/ desktop//' src.pro %build %qmake5 PREFIX=%{_prefix} @@ -58,15 +59,15 @@ %install %qmake5_install -install -Dpm 0644 %{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop +install -Dpm 0644 org.semiletov.tea.desktop %{buildroot}%{_datadir}/applications/org.semiletov.tea.desktop install -Dpm 0644 icons/%{name}-icon-v3-01.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png -%if 0%{?suse_version} > 1320 -install -Dpm 0644 %{name}.appdata.xml %{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml +%if 0%{?suse_version} >= 1500 +install -Dpm 0644 org.semiletov.tea.appdata.xml %{buildroot}%{_datadir}/metainfo/org.semiletov.tea.appdata.xml %else -install -Dpm 0644 %{name}.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml +install -Dpm 0644 org.semiletov.tea.appdata.xml %{buildroot}%{_datadir}/appdata/org.semiletov.tea.appdata.xml %endif -%if 0%{?suse_version} <= 1320 +%if 0%{?suse_version} < 1500 %post %desktop_database_post %icon_theme_cache_post @@ -77,16 +78,21 @@ %endif %files -%doc AUTHORS ChangeLog COPYING NEWS* README TODO +%if 0%{?suse_version} >= 1500 +%license COPYING +%else +%doc COPYING +%endif +%doc AUTHORS ChangeLog NEWS* README TODO %{_bindir}/%{name} -%{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/*/apps/%{name}*.png -%if 0%{?suse_version} > 1320 +%{_datadir}/applications/org.semiletov.tea.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}*.* +%if 0%{?suse_version} >= 1500 %dir %{_datadir}/metainfo/ -%{_datadir}/metainfo/%{name}.appdata.xml +%{_datadir}/metainfo/org.semiletov.tea.appdata.xml %else %dir %{_datadir}/appdata/ -%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/appdata/org.semiletov.tea.appdata.xml %endif %changelog ++++++ org.semiletov.tea.appdata.xml ++++++ <?xml version="1.0" encoding="UTF-8"?> <!-- Copyright 2016 Sorokin Alexei <[email protected]> --> <component type="desktop"> <id>org.semiletov.tea</id> <metadata_license>CC0-1.0</metadata_license> <project_license>GPL-3.0-or-later</project_license> <name>TEA</name> <summary>Powerful text editor in Qt</summary> <description> <p> TEA is a Qt-based text editor for UNIX-like systems. With an ultimate small size TEA provides you hundreds of functions. </p> </description> <launchable type="desktop-id">org.semiletov.tea.desktop</launchable> <url type="homepage">http://semiletov.org/tea</url> <developer_name>Peter Semiletov</developer_name> <provides> <binary>tea</binary> </provides> </component> ++++++ org.semiletov.tea.desktop ++++++ [Desktop Entry] Version=1.0 Name=TEA Exec=tea %U Icon=tea Terminal=false Type=Application GenericName=TEA Text Editor Comment=Powerful text editor in Qt Comment[eo]=Funkcia tekstoredaktilo per Qt Comment[ru]=Функциональный текстовый редактор на Qt Comment[uk]=Функціональний текстовий редактор на Qt Categories=Qt;Utility;TextEditor; MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; ++++++ tea-44.1.0.tar.bz2 -> tea-44.1.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tea-44.1.0/ChangeLog new/tea-44.1.1/ChangeLog --- old/tea-44.1.0/ChangeLog 2017-07-11 18:17:20.000000000 +0200 +++ new/tea-44.1.1/ChangeLog 2017-11-20 13:14:59.000000000 +0100 @@ -1,5 +1,10 @@ +2017 nov +* desktop/icons stuff fixes + + 2017 july - User loaded external fonts //causes segfault on Qt 5.6 +* other fixes 2017 may diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tea-44.1.0/NEWS new/tea-44.1.1/NEWS --- old/tea-44.1.0/NEWS 2017-07-11 18:17:20.000000000 +0200 +++ new/tea-44.1.1/NEWS 2017-11-20 13:14:59.000000000 +0100 @@ -1,5 +1,5 @@ =====NEWS ABOUT TEA==== -TEA 44.1.0, July 2017 +TEA 44.1.1, November 2017 --------------------------------------- http://semiletov.org/tea - official size #1 http://tea.ourproject.org - official size #1 @@ -7,10 +7,11 @@ https://vk.com/teaeditor - VK-community --------------------------------------- - This release fixes many bugs. + This release fixes the desktop file and icons stuff (I hope it had not broke distros packages specs too much). Also you can build tea without QML using new option: +qmake "CONFIG+=noqml" - If you want to support TEA via donation, better support the Ukrainian dog shelter Lyubas House - http://www.ukraineanimalrescue.org/#!lyubas-house/cxfj/. There are lot of dogs with disabilities, and they need help more than TEA. + It slightly reduces the memory footprint and useful for some purposes. Stay tuned. Peter Semiletov \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tea-44.1.0/NEWS-RU new/tea-44.1.1/NEWS-RU --- old/tea-44.1.0/NEWS-RU 2017-07-11 18:17:20.000000000 +0200 +++ new/tea-44.1.1/NEWS-RU 2017-11-20 13:14:59.000000000 +0100 @@ -1,5 +1,5 @@ ====НОВОСТИ ПРО TEA==== -TEA 44.1.0, июль 2017 +TEA 44.1.1, ноябрь 2017 --------------------------------------- http://semiletov.org/tea - офсайт http://tea.ourproject.org - второй офсайт @@ -7,8 +7,11 @@ https://vk.com/teaeditor - сообщество TEA --------------------------------------- - В этой версии - ничего нового, только многочисленные исправления. + В этой версии исправлен desktop-файл и сопутствующие иконные дела, надеюсь я не шибко сильно поломал существующие spec-файлы сборщиков пакетов. + Также добавился ключик сборки - Ежели вы хотите как-то поддержать разработку TEA денежно, лучше поддержите киевский приют для собак Дом Любчика - http://lyubas.pp.ua. Любчик - это пёс на инвалидной коляске. У него много друзей, которым всегда нужна помощь. +qmake "CONFIG+=noqml" + + отключающий QML, что несколько снижает потребление памяти, да и полезно для кое-каких дел. С кирпичным пролетарским приветом, Петр Семилетов! \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tea-44.1.0/TODO new/tea-44.1.1/TODO --- old/tea-44.1.0/TODO 2017-07-11 18:17:20.000000000 +0200 +++ new/tea-44.1.1/TODO 2017-11-20 13:14:59.000000000 +0100 @@ -1,4 +1,4 @@ -при повторении последней функции, сендер-то становится от пункта меню "повторить" +при повторении последней функции, сендер-ту становится от пункта меню "повторить" избранное для ЗПВ @@ -26,7 +26,7 @@ Highlight all search results gradient colorization in palettes "entity to text" function -autoscroll //useful for musicians. define the speed in bpm? +autoscroll //useful for musicians or youtube bloggers. define the speed in bpm? numbers into words ctags support make max recent items user-modified diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tea-44.1.0/desktop/tea.desktop new/tea-44.1.1/desktop/tea.desktop --- old/tea-44.1.0/desktop/tea.desktop 2017-07-11 18:17:20.000000000 +0200 +++ new/tea-44.1.1/desktop/tea.desktop 2017-11-20 13:14:59.000000000 +0100 @@ -1,10 +1,10 @@ [Desktop Entry] -Encoding=UTF-8 Name=TEA Terminal=false Type=Application -Icon=application-x-executable -Categories=Application;Utility;TextEditor; +Icon=tea +Exec=tea %U +Categories=Utility;TextEditor; StartupNotify=false MimeType=text/plain; NoDisplay=false @@ -13,4 +13,3 @@ Keywords[de]=Texteditor;Text;Editor; Comment=Text editor with hundreds of functions Comment[de]=Texteditor mit hunderten Funktionen -Exec=tea %U \ No newline at end of file Binary files old/tea-44.1.0/icons/128/tea.png and new/tea-44.1.1/icons/128/tea.png differ Binary files old/tea-44.1.0/icons/32/tea.png and new/tea-44.1.1/icons/32/tea.png differ Binary files old/tea-44.1.0/icons/48/tea.png and new/tea-44.1.1/icons/48/tea.png differ Binary files old/tea-44.1.0/icons/64/tea.png and new/tea-44.1.1/icons/64/tea.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tea-44.1.0/icons/svg/tea.svg new/tea-44.1.1/icons/svg/tea.svg --- old/tea-44.1.0/icons/svg/tea.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/tea-44.1.1/icons/svg/tea.svg 2017-11-20 13:14:59.000000000 +0100 @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/"; + xmlns:cc="http://creativecommons.org/ns#"; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + xmlns:svg="http://www.w3.org/2000/svg"; + xmlns="http://www.w3.org/2000/svg"; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; + width="128" + height="128" + id="svg2" + version="1.1" + inkscape:version="0.48.4 r9939" + sodipodi:docname="tea-icon-v3.svg" + inkscape:export-filename="/home/rox/devel/4rlvn/icons/tea-icon-v3.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="2.15" + inkscape:cx="131.14" + inkscape:cy="84.942067" + inkscape:document-units="px" + inkscape:current-layer="layer2" + showgrid="false" + inkscape:window-width="1920" + inkscape:window-height="1133" + inkscape:window-x="-4" + inkscape:window-y="-4" + inkscape:window-maximized="1" /> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="bg"> + <path + sodipodi:type="arc" + style="fill:#669999;fill-opacity:1;stroke:#20d02e;stroke-width:3.86232209000000015;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="path3798" + sodipodi:cx="66.708229" + sodipodi:cy="62.538654" + sodipodi:rx="59.226933" + sodipodi:ry="59.725685" + d="m 125.93516,62.538654 a 59.226933,59.725685 0 1 1 -118.4538635,0 59.226933,59.725685 0 1 1 118.4538635,0 z" + transform="matrix(1.0421053,0,0,1.0292276,-5.3025331,-0.08221622)" /> + </g> + <g + inkscape:label="obj" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-924.36218)"> + <path + style="fill:#ccff33;fill-opacity:1;stroke:#20d02e;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + d="m 102.25563,961.59343 c -9.087221,0 -16.453872,9.92138 -16.453872,22.16131 0,12.23994 7.366651,22.16136 16.453872,22.16136 9.08722,0 16.45387,-9.92142 16.45387,-22.16136 0,-12.23993 -7.36665,-22.16131 -16.45387,-22.16131 z m 0.33789,10.07066 c 4.45089,0 8.05799,5.41433 8.05799,12.09065 0,6.67633 -3.6071,12.09066 -8.05799,12.09066 -4.450882,0 -8.057987,-5.41433 -8.057987,-12.09066 0,-6.67632 3.607105,-12.09065 8.057987,-12.09065 z" + id="path3012" + inkscape:connector-curvature="0" /> + <path + style="fill:#ccff33;fill-opacity:1;stroke:#20d02e;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + d="m 65.316265,954.87547 c -12.880185,0 -24.202831,6.52993 -30.726139,16.40245 l -15.271251,-7.00024 -9.4022127,10.74644 19.3700287,9.44628 c -0.373111,2.05767 -0.565602,4.1689 -0.565602,6.33181 0,19.84349 16.380742,35.93409 36.595176,35.93409 20.214434,0 36.602525,-16.0906 36.602525,-35.93409 0,-19.84353 -16.388091,-35.92674 -36.602525,-35.92674 z" + id="path2985" + inkscape:connector-curvature="0" /> + <path + sodipodi:type="arc" + style="fill:#ccff33;fill-opacity:1;stroke:#20d02e;stroke-width:28.53972596;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="path3010" + sodipodi:cx="525.71429" + sodipodi:cy="393.79074" + sodipodi:rx="100" + sodipodi:ry="101.42857" + d="m 625.71429,393.79074 c 0,56.01746 -44.77152,101.42857 -100,101.42857 -55.22847,0 -100,-45.41111 -100,-101.42857 0,-56.01745 44.77153,-101.42857 100,-101.42857 55.22848,0 100,45.41112 100,101.42857 z" + transform="matrix(0.19140219,0,0,0.1026298,-35.975041,916.1399)" /> + <path + sodipodi:type="arc" + style="fill:#ccff33;fill-opacity:1;stroke:#20d02e;stroke-width:17.01726993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="path3017" + sodipodi:cx="-987.14288" + sodipodi:cy="53.790752" + sodipodi:rx="27.142857" + sodipodi:ry="35.714287" + d="m -960.00003,53.790752 c 0,19.724456 -12.15227,35.714287 -27.14285,35.714287 -14.99062,0 -27.14282,-15.989831 -27.14282,-35.714287 0,-19.724456 12.1522,-35.714286 27.14282,-35.714286 14.99058,0 27.14285,15.98983 27.14285,35.714286 z" + transform="matrix(0.23505533,0,0,0.23505533,296.68101,936.52331)" /> + </g> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tea-44.1.0/logmemo.cpp new/tea-44.1.1/logmemo.cpp --- old/tea-44.1.0/logmemo.cpp 2017-07-11 18:17:20.000000000 +0200 +++ new/tea-44.1.1/logmemo.cpp 2017-11-20 13:14:59.000000000 +0100 @@ -25,7 +25,7 @@ #include <QTextCursor> -CLogMemo::CLogMemo ( QWidget * parent): QPlainTextEdit (parent) +CLogMemo::CLogMemo (QWidget * parent): QPlainTextEdit (parent) //CLogMemo::CLogMemo (QPlainTextEdit *m) { @@ -46,7 +46,6 @@ setTextInteractionFlags (Qt::LinksAccessibleByMouse | Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard); - } @@ -67,7 +66,7 @@ cr.movePosition (QTextCursor::Down, QTextCursor::MoveAnchor, 0); memo->setTextCursor (cr);*/ - QTextCursor cr = textCursor(); + QTextCursor cr = textCursor(); cr.movePosition (QTextCursor::Start); cr.movePosition (QTextCursor::Down, QTextCursor::MoveAnchor, 0); setTextCursor (cr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tea-44.1.0/main.cpp new/tea-44.1.1/main.cpp --- old/tea-44.1.0/main.cpp 2017-07-11 18:17:20.000000000 +0200 +++ new/tea-44.1.1/main.cpp 2017-11-20 13:14:59.000000000 +0100 @@ -87,7 +87,6 @@ mainWindow = new rvln(); - #if defined(Q_OS_WIN) QObject::connect(&app, SIGNAL(messageAvailable(QString)), mainWindow, SLOT(receiveMessage(QString))); #endif @@ -97,7 +96,6 @@ QObject::connect(&app, SIGNAL(messageAvailable(QStringList)), mainWindow, SLOT(receiveMessageShared(QStringList))); - // QObject::connect(&app, SIGNAL(signal_commit_data()), mainWindow, SLOT(app_commit_data())); // QObject::connect(&app, SIGNAL(commitDataRequest(QSessionManager & )), mainWindow, SLOT(slot_commitDataRequest(QSessionManager & ))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tea-44.1.0/rvln.cpp new/tea-44.1.1/rvln.cpp --- old/tea-44.1.0/rvln.cpp 2017-07-11 18:17:20.000000000 +0200 +++ new/tea-44.1.1/rvln.cpp 2017-11-20 13:14:59.000000000 +0100 @@ -77,12 +77,11 @@ //QML stuff -#if QT_VERSION >= 0x050000 +#ifdef USE_QML_STUFF #include <QQmlComponent> #include <QQmlContext> #include <QQuickItem> - #include <QQuickView> #endif @@ -109,8 +108,7 @@ #include "fontbox.h" -#if QT_VERSION >= 0x050000 - +#ifdef USE_QML_STUFF class CPluginListItem: public QObject { public: @@ -120,7 +118,6 @@ CPluginListItem (const QString &plid, CQQuickWindow *wnd); }; - #endif @@ -195,10 +192,8 @@ QVariantMap hs_path; -#if QT_VERSION >= 0x050000 - +#ifdef USE_QML_STUFF QList <CPluginListItem *> plugins_list; - #endif //QFontDatabase *font_database; @@ -696,7 +691,7 @@ update_sessions(); update_scripts(); -#if QT_VERSION >= 0x050000 +#ifdef USE_QML_STUFF update_plugins(); @@ -812,7 +807,7 @@ connect (clipboard , SIGNAL(dataChanged()), this, SLOT(clipboard_dataChanged())); -#if QT_VERSION >= 0x050000 +#ifdef USE_QML_STUFF plugins_init(); @@ -860,7 +855,7 @@ delete documents; delete img_viewer; -#if QT_VERSION >= 0x050000 +#ifdef USE_QML_STUFF plugins_done(); @@ -1483,7 +1478,7 @@ -#if QT_VERSION >= 0x050000 +#ifdef USE_QML_STUFF menu_fn_plugins = menu_functions->addMenu (tr ("Plugins")); @@ -5780,8 +5775,8 @@ { documents->hls.clear(); - QStringList l1 = read_dir_entries (":/hls"); - l1 << read_dir_entries (dir_hls); + QStringList l1 = read_dir_entries (":/hls"); //read built-in hls modiles + l1 << read_dir_entries (dir_hls); //read custom hls modules QString newlist = l1.join("\n").trimmed(); QString fname_hls_flist (dir_config); @@ -5790,7 +5785,7 @@ if (force) { QFile::remove (fname_hls_flist); - qDebug() << "new version, hls cache is updated"; + qDebug() << "new version, hls cache must be updated"; } if (! file_exists (fname_hls_flist)) @@ -5811,14 +5806,20 @@ if (! file_exists (fname_hls_cache)) { + //make and save hls_cache + for (int i = 0; i < l1.size(); i++) { QString fname = ":/hls/" + l1[i]; + + //check is fname built-in or not + if (! file_exists (fname)) fname = dir_hls + "/" + l1[i]; QString buffer = qstring_load (fname); QString exts = string_between (buffer, "exts=\"", "\""); + if (! exts.isEmpty()) { QStringList l = exts.split (";"); @@ -5830,7 +5831,7 @@ qstring_save (fname_hls_cache, hash_keyval_to_string (documents->hls)); } else - documents->hls = hash_load_keyval (fname_hls_cache); + documents->hls = hash_load_keyval (fname_hls_cache); } @@ -6087,10 +6088,8 @@ qDebug() << "! unzip"; -#if QT_VERSION >= 0x050000 - +#ifdef USE_QML_STUFF update_plugins(); - #endif } @@ -9070,8 +9069,7 @@ } -#if QT_VERSION >= 0x050000 - +#ifdef USE_QML_STUFF void rvln::fn_use_plugin() { @@ -9208,6 +9206,7 @@ void rvln::update_plugins() { +#ifdef USE_QML_STUFF menu_fn_plugins->clear(); create_menu_from_plugins (this, @@ -9215,12 +9214,13 @@ dir_plugins, SLOT (fn_use_plugin()) ); - +#endif } void rvln::plugins_init() { +#ifdef USE_QML_STUFF qDebug() << "rvln::plugins_init()"; qml_engine = new QQmlEngine; @@ -9238,11 +9238,13 @@ qml_engine->rootContext()->setContextProperty("tea", this); qml_engine->rootContext()->setContextProperty("settings", settings); qml_engine->rootContext()->setContextProperty("hs_path", hs_path); +#endif } void rvln::plugins_done() { +#ifdef USE_QML_STUFF qDebug() << "rvln::plugins_done()"; //закрыть все плагины из списка (при созд. плагина добавляем указатель в список) //и потом @@ -9254,6 +9256,7 @@ } delete qml_engine; +#endif } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tea-44.1.0/rvln.h new/tea-44.1.1/rvln.h --- old/tea-44.1.0/rvln.h 2017-07-11 18:17:20.000000000 +0200 +++ new/tea-44.1.1/rvln.h 2017-11-20 13:14:59.000000000 +0100 @@ -56,11 +56,10 @@ //QML stuff -#if QT_VERSION >= 0x050000 +#ifdef USE_QML_STUFF #include <QQmlEngine> #include <QQuickWindow> -//#include <QJSEngine> #endif @@ -166,10 +165,9 @@ rvln(); ~rvln(); -#if QT_VERSION >= 0x050000 +#ifdef USE_QML_STUFF QQmlEngine *qml_engine; - #endif QAction *last_action; @@ -783,10 +781,9 @@ void slot_style_currentIndexChanged (const QString &text); -#if QT_VERSION >= 0x050000 +#ifdef USE_QML_STUFF void fn_use_plugin(); - #endif public: @@ -833,11 +830,10 @@ QMenu *menu_fn_scripts; -#if QT_VERSION >= 0x050000 +#ifdef USE_QML_STUFF QMenu *menu_fn_plugins; - -#endif +#endif QMenu *menu_view_themes; @@ -1006,7 +1002,7 @@ void update_palettes(); void update_view_hls(); -#if QT_VERSION >= 0x050000 +#ifdef USE_QML_STUFF void update_plugins(); @@ -1087,7 +1083,8 @@ // void load_userfonts(); -#if QT_VERSION >= 0x050000 +//#if QT_VERSION >= 0x050000 +#ifdef USE_QML_STUFF void plugins_init(); void plugins_done(); @@ -1099,7 +1096,7 @@ }; -#if QT_VERSION >= 0x050000 +#ifdef USE_QML_STUFF class CQQuickWindow: public QQuickWindow { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tea-44.1.0/src.pro new/tea-44.1.1/src.pro --- old/tea-44.1.0/src.pro 2017-07-11 18:17:20.000000000 +0200 +++ new/tea-44.1.1/src.pro 2017-11-20 13:14:59.000000000 +0100 @@ -1,7 +1,7 @@ -VERSION = 44.1.0 +VERSION = 44.1.1 os2: { -DEFINES += 'VERSION_NUMBER=\'"44.1.0"\'' +DEFINES += 'VERSION_NUMBER=\'"44.1.1"\'' } else: { DEFINES += 'VERSION_NUMBER=\\\"$${VERSION}\\\"' } @@ -14,7 +14,6 @@ USE_HUNSPELL = true USE_PRINTER = true - win32:{ isEmpty(PREFIX) { @@ -53,11 +52,25 @@ TARGET = bin/tea target.path = $$PREFIX/bin -desktop.path=$$PREFIX/share/applications -desktop.files=desktop/tea.desktop + +desktop.path = $$PREFIX/share/applications +desktop.files = desktop/tea.desktop icon128.path = $$PREFIX/share/icons/hicolor/128x128/apps/ -icon128.files += icons/tea-icon-v3-03.png +icon128.files += icons/128/tea.png + +icon64.path = $$PREFIX/share/icons/hicolor/64x64/apps/ +icon64.files += icons/64/tea.png + +icon48.path = $$PREFIX/share/icons/hicolor/48x48/apps/ +icon48.files += icons/48/tea.png + +icon32.path = $$PREFIX/share/icons/hicolor/32x32/apps/ +icon32.files += icons/32/tea.png + +iconsvg.path = $$PREFIX/share/icons/hicolor/scalable/apps/ +iconsvg.files += icons/svg/tea.svg + } @@ -164,13 +177,22 @@ QT += printsupport QT += qml QT += quick - # QTPLUGIN += qtvirtualkeyboardplugin + DEFINES += USE_QML_STUFF } else { #QT += blah blah blah } -INSTALLS += target desktop icon128 +noqml{ + QT -= qml + QT -= quick + DEFINES -= USE_QML_STUFF + message ("QML stuff is off") +} + + + +INSTALLS += target desktop icon128 icon64 icon48 icon32 iconsvg RESOURCES += rlvn.qrc TRANSLATIONS = translations/tea_ru.ts \ @@ -187,11 +209,13 @@ TODO \ INSTALL \ hls/* \ - icons/* \ +# icons/* \ palettes/* \ encsign/* \ images/* \ desktop/* \ + text-data/* \ + translations/* \ manuals/en.html \ manuals/ru.html \ manuals/plugins/readme-en.txt \ @@ -199,8 +223,6 @@ manuals/plugins/examples/run-and-close/main.qml \ manuals/plugins/examples/settings-via-qmap/main.qml \ manuals/plugins/examples/use-fif/main.qml \ - text-data/* \ - translations/* \ themes/Cotton/stylesheet.css \ themes/Plum/stylesheet.css \ themes/Smaragd/stylesheet.css \ @@ -208,7 +230,39 @@ themes/Turbo/stylesheet.css \ themes/Turbo/icons/* \ themes/Vegan/stylesheet.css \ - themes/Yagodnaya/stylesheet.css + themes/Yagodnaya/stylesheet.css \ + icons/32/tea.png \ + icons/48/tea.png \ + icons/64/tea.png \ + icons/128/tea.png \ + icons/svg/tea.svg \ + icons/create-dir.png \ + icons/create-dir.png \ + icons/current-list.png \ + icons/edit-copy-active.png \ + icons/edit-copy.png \ + icons/edit-cut-active.png \ + icons/edit-cut.png \ + icons/edit-paste-active.png \ + icons/edit-paste.png \ +icons/file-new.png \ +icons/file-open-active.png \ +icons/file-open.png \ +icons/file-save-active.png \ +icons/file-save-as.png \ +icons/file-save.png \ +icons/fn-spell-check.png \ +icons/go.png \ +icons/home.png \ +icons/labels.png \ +icons/refresh.png \ +icons/search_find.png \ +icons/tea_icon_v2.png \ +icons/tea-icon-v3-01.png \ +icons/tea-icon-v3-02.png \ +icons/tea-icon-v3-03.png + + unix: { @@ -333,6 +387,7 @@ os2: { + usepoppler{ exists("C:/usr/include/poppler/qt4/poppler-qt4.h") { message ("DJVU enabled")
