[-]
[+]
|
Changed |
khelpcenter.spec
|
|
[-]
[+]
|
Changed |
khelpcenter-5.1.90.tar.xz/CMakeLists.txt
^
|
@@ -1,5 +1,5 @@
project(KHelpCenter)
-set(PROJECT_VERSION "5.1.0")
+set(PROJECT_VERSION "5.1.90")
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
set(QT_MIN_VERSION "5.3.0")
@@ -92,6 +92,7 @@
install( PROGRAMS org.kde.Help.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install( FILES khelpcenter.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
install( FILES khelpcenter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES khelpcenter.desktop DESTINATION ${SHARE_INSTALL_PREFIX}/kde4/services )
install( FILES glossary.html.in table-of-contents.xslt glossary.xslt index.html.in DESTINATION ${DATA_INSTALL_DIR}/khelpcenter )
install( FILES khelpcenterui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/khelpcenter )
install( FILES org.kde.khelpcenter.kcmhelpcenter.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
|
[-]
[+]
|
Changed |
khelpcenter-5.1.90.tar.xz/history.cpp
^
|
@@ -22,7 +22,7 @@
#include <QMenu>
-#include <KAction>
+#include <QAction>
#include <KActionCollection>
#include <KApplication>
#include <KDebug>
|
[-]
[+]
|
Changed |
khelpcenter-5.1.90.tar.xz/htmlsearch/htmlsearch.cpp
^
|
@@ -7,6 +7,7 @@
#include "progressdialog.h"
#include <QTextStream>
#include <QStandardPaths>
+#include <QDebug>
@@ -71,7 +72,7 @@
// add KDE help dirs
if (scopeGroup.readEntry("KDE", true))
dirs = kapp->dirs()->findDirs("html", _lang + '/');
- kDebug() << "got " << dirs.count() << " dirs\n";
+ //qDebug() << "got " << dirs.count() << " dirs\n";
// TODO: Man and Info!!
@@ -184,7 +185,7 @@
f.setName(fname);
if (f.open(QIODevice::WriteOnly))
{
- kDebug() << "Writing config for " << _lang << " to " << fname;
+ //qDebug() << "Writing config for " << _lang << " to " << fname;
QTextStream ts(&f);
@@ -266,7 +267,7 @@
initial = false;
}
- kDebug() << "Running htdig";
+ //qDebug() << "Running htdig";
connect(_proc, &K3Process::receivedStdout, this, &HTMLSearch::htdigStdout);
@@ -291,7 +292,7 @@
}
else
{
- kDebug() << "Could not open `files` for writing";
+ //qDebug() << "Could not open `files` for writing";
return false;
}
@@ -325,7 +326,7 @@
_proc = new K3Process();
*_proc << exe << "-c" << dataPath(_lang)+"/htdig.conf";
- kDebug() << "Running htmerge";
+ //qDebug() << "Running htmerge";
connect(_proc, &K3Process::processExited, this, &HTMLSearch::htmergeExited);
@@ -375,7 +376,7 @@
void HTMLSearch::htdigExited(K3Process *p)
{
- kDebug() << "htdig terminated " << p->exitStatus();
+ //qDebug() << "htdig terminated " << p->exitStatus();
_htdigRunning = false;
kapp->exit_loop();
}
@@ -383,7 +384,7 @@
void HTMLSearch::htmergeExited(K3Process *)
{
- kDebug() << "htmerge terminated";
+ //qDebug() << "htmerge terminated";
_htmergeRunning = false;
kapp->exit_loop();
}
@@ -397,7 +398,7 @@
void HTMLSearch::htsearchExited(K3Process *)
{
- kDebug() << "htsearch terminated";
+ //qDebug() << "htsearch terminated";
_htsearchRunning = false;
kapp->exit_loop();
}
@@ -426,7 +427,7 @@
*_proc << exe << "-c" << dataPath(_lang)+"/htdig.conf" <<
QString("words=%1;method=%2;matchesperpage=%3;format=%4;sort=%5").arg(words).arg(method).arg(matches).arg(format).arg(sort);
- kDebug() << "Running htsearch";
+ //qDebug() << "Running htsearch";
connect(_proc, &K3Process::receivedStdout, this, &HTMLSearch::htsearchStdout);
connect(_proc, &K3Process::processExited, this, &HTMLSearch::htsearchExited);
@@ -440,7 +441,7 @@
if (!_proc->normalExit() || _proc->exitStatus() != 0)
{
- kDebug() << "Error running htsearch... returning now";
+ //qDebug() << "Error running htsearch... returning now";
delete _proc;
delete config;
return QString();
|
[-]
[+]
|
Changed |
khelpcenter-5.1.90.tar.xz/htmlsearch/htmlsearch.desktop
^
|
@@ -200,7 +200,7 @@
X-KDE-Keywords[bs]=Help,HTML,Search,Index,htdig,htsearch,htmerge,Scope,Language,pomoć,pretraga,indeks
X-KDE-Keywords[ca]=Ajuda,HTML,Cerca,Índex,htdig,htsearch,htmerge,Àmbit,Idioma
X-KDE-Keywords[ca@valencia]=Ajuda,HTML,Cerca,Índex,htdig,htsearch,htmerge,Àmbit,Idioma
-X-KDE-Keywords[cs]=Nápověda,HTML,Hledání,htdig,htsearch,htmerge,Scope,Jazyk
+X-KDE-Keywords[cs]=Nápověda,HTML,Hledání,htdig,htsearch,htmerge,Rozsah,Jazyk
X-KDE-Keywords[da]=Hjælp,HTML,Søgning,Indeks,htdig,htsearch,htmerge,Scope,sprog
X-KDE-Keywords[de]=Hilfe,HTML,Suche,Index,Stichwortverzeichnis,htdig,Sprachen
X-KDE-Keywords[el]=Βοήθεια,HTML,αναζήτηση,ευρετήριο,htdig,htsearch,htmerge,εμβέλεια,γλώσσα
@@ -225,6 +225,7 @@
X-KDE-Keywords[kk]=Help,HTML,Search,Index,htdig,htsearch,htmerge,Scope,Language
X-KDE-Keywords[km]=Help,HTML,Search,Index,htdig,htsearch,htmerge,Scope,Language
X-KDE-Keywords[ko]=Help,HTML,Search,Index,htdig,htsearch,htmerge,Scope,Language,도움말,검색,인덱스,언어
+X-KDE-Keywords[lt]=Pagalba,HTML,Paieška,Indeksas,htdig,htsearch,htmerge,Imtis,Kalba
X-KDE-Keywords[lv]=Palīdzība,HTML,meklēšana,indekss,htdig,htsearch,htmerge,Scope,valoda
X-KDE-Keywords[mr]=मदत, HTML, शोध, अनुक्रमणिका, htdig,htsearch,htmerge, सीमा, भाषा
X-KDE-Keywords[nb]=Hjelp,HTML,Søk,Index,htdig,htsearch,htmerge,omfang,språk
|
[-]
[+]
|
Changed |
khelpcenter-5.1.90.tar.xz/htmlsearch/ktagcombobox.cpp
^
|
@@ -26,7 +26,7 @@
#include <QPainter>
-#include <kdebug.h>
+#include <QDebug>
KTagComboBox::~KTagComboBox ()
{
@@ -209,7 +209,7 @@
{
if (i < 0 || i >= count())
{
- kDebug() << "KTagComboBox::tag(), unknown tag " << i;
+ //qDebug() << "KTagComboBox::tag(), unknown tag " << i;
return QString();
}
return *tags.at(i);
|
[-]
[+]
|
Changed |
khelpcenter-5.1.90.tar.xz/htmlsearch/progressdialog.cpp
^
|
@@ -1,23 +1,35 @@
#include <QLayout>
#include <QLabel>
#include <QProgressBar>
+#include <KConfigGroup>
+#include <QDialogButtonBox>
+#include <QPushButton>
+#include <QVBoxLayout>
ProgressDialog::ProgressDialog(QWidget *parent, const char *name)
- : KDialog( parent )
+ : QDialog( parent )
{
- setCaption( i18n("Generating Index") );
- setButtons( Cancel );
- setDefaultButton( Cancel );
+ setWindowTitle( i18n("Generating Index") );
+ QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel);
+ QWidget *mainWidget = new QWidget(this);
+ QVBoxLayout *mainLayout = new QVBoxLayout;
+ setLayout(mainLayout);
+ mainLayout->addWidget(mainWidget);
+ connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
+ connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+ //PORTING SCRIPT: WARNING mainLayout->addWidget(buttonBox) must be last item in layout. Please move it.
+ mainLayout->addWidget(buttonBox);
+ buttonBox->button(QDialogButtonBox::Cancel)->setDefault(true);
setObjectName( name );
setModal( false );
- QGridLayout *grid = new QGridLayout(plainPage());
- grid->setSpacing(spacingHint());
+ QGridLayout *grid = new QGridLayout(mainWidget);
+ //PORT QT5 grid->setSpacing(spacingHint());
- QLabel *l = new QLabel(i18n("Scanning for files"), plainPage());
+ QLabel *l = new QLabel(i18n("Scanning for files"), mainWidget);
grid->addWidget(l, 0, 1, 1,2);
filesScanned = new QLabel(plainPage());
@@ -27,7 +39,7 @@
check1 = new QLabel(plainPage());
grid->addWidget(check1, 0,0);
- l = new QLabel(i18n("Extracting search terms"), plainPage());
+ l = new QLabel(i18n("Extracting search terms"), mainWidget);
grid->addWidget(l, 2, 1, 1,2);
bar = new QProgressBar(plainPage());
@@ -36,7 +48,7 @@
check2 = new QLabel(plainPage());
grid->addWidget(check2, 2,0);
- l = new QLabel(i18n("Generating index..."), plainPage());
+ l = new QLabel(i18n("Generating index..."), mainWidget);
grid->addWidget(l, 4, 1, 1,2);
check3 = new QLabel(plainPage());
|
[-]
[+]
|
Changed |
khelpcenter-5.1.90.tar.xz/htmlsearch/progressdialog.h
^
|
@@ -1,12 +1,12 @@
#ifndef __PROGRESS_DIALOG_H__
#define __PROGRESS_DIALOG_H__
-#include <kdialog.h>
+#include <QDialog>
class QLabel;
class QProgressBar;
-class ProgressDialog : public KDialog
+class ProgressDialog : public QDialog
{
Q_OBJECT
|
[-]
[+]
|
Changed |
khelpcenter-5.1.90.tar.xz/kcmhelpcenter.desktop
^
|
@@ -221,6 +221,7 @@
X-KDE-Keywords[kk]=khelpcenter,help,index,search
X-KDE-Keywords[km]=khelpcenter,help,index,search
X-KDE-Keywords[ko]=khelpcenter,help,index,search,도움말,인덱스,검색
+X-KDE-Keywords[lt]=khKHelpcCenter,pagalba,indeksas,paieška
X-KDE-Keywords[lv]=khelpcenter,palīdzība,indekss,meklēšana
X-KDE-Keywords[mr]=khelpcenter, मदत, अनुक्रमणिका, शोध
X-KDE-Keywords[nb]=khelpcenter,hjelp,index,søk
|
[-]
[+]
|
Changed |
khelpcenter-5.1.90.tar.xz/plugins/Manpages/.directory
^
|
@@ -10,7 +10,7 @@
Name[bs]=Uputne stranice naredbi
Name[ca]=Pàgines de manual del UNIX
Name[ca@valencia]=Pàgines de manual del UNIX
-Name[cs]=Rejtřík UNIXových manuálů
+Name[cs]=Manuálové stránky pro UNIX
Name[csb]=Pòdrãczniczi dlô UNIXA
Name[da]=UNIX manualsider
Name[de]=UNIX-Hilfeseiten
|
[-]
[+]
|
Changed |
khelpcenter-5.1.90.tar.xz/plugins/browsercontrolmodules.desktop
^
|
@@ -18,6 +18,7 @@
Name[id]=Modul Pengaturan Peramban
Name[is]=Stillingaeiningar vafra
Name[ko]=브라우저 설정 모듈
+Name[lt]=Naršyklės nustatymų moduliai
Name[nb]=Moduler for nettleser-innstillinger
Name[nds]=Nettkieker-Instellenmodulen
Name[nl]=Modules voor instellingen van de browser
|
[-]
[+]
|
Changed |
khelpcenter-5.1.90.tar.xz/plugins/filemanagercontrolmodules.desktop
^
|
@@ -18,6 +18,7 @@
Name[id]=Modul Pengaturan Manajer Berkas
Name[is]=Stillingaeiningar skráastjóra
Name[ko]=파일 관리자 설정 모듈
+Name[lt]=Failų tvarkyklės nustatymų moduliai
Name[nb]=Moduler for filbehandler-innstillinger
Name[nds]=Dateipleger-Instellenmodulen
Name[nl]=Modules voor instellingen van de bestandsbeheerder
|
[-]
[+]
|
Changed |
khelpcenter-5.1.90.tar.xz/plugins/kcontrolmodules.desktop
^
|
@@ -18,6 +18,7 @@
Name[id]=Modul Pengaturan Sistem
Name[is]=Stillingaeiningar kerfis
Name[ko]=시스템 설정 모듈
+Name[lt]=Sistemos nustatymų moduliai
Name[nb]=Moduler for systeminnstillinger
Name[nds]=Systeem-Instellenmodulen
Name[nl]=Modules voor systeeminstellingen
|
[-]
[+]
|
Changed |
khelpcenter-5.1.90.tar.xz/plugins/konquerorcontrolmodules.desktop
^
|
@@ -19,6 +19,7 @@
Name[is]=Stillingaeiningar Konqueror
Name[ja]=Konqueror 設定モジュール
Name[ko]=Konqueror 설정 모듈
+Name[lt]=Konqueror nustatymų moduliai
Name[nb]=Modulen for Konqueror-innstillinger
Name[nds]=Konqueror-Instellenmodulen
Name[nl]=Modules voor instellingen van Konqueror
|
[-]
[+]
|
Changed |
khelpcenter-5.1.90.tar.xz/plugins/othercontrolmodules.desktop
^
|
@@ -18,6 +18,7 @@
Name[id]=Modul Pengaturan Lainnya
Name[is]=Aðrar stillingaeiningar
Name[ko]=기타 설정 모듈
+Name[lt]=Kitų nustatymų moduliai
Name[nb]=Moduler for andre innstillinger
Name[nds]=Anner Instellenmodulen
Name[nl]=Overige modules voor instellingen
|
[-]
[+]
|
Changed |
khelpcenter.yaml
^
|
@@ -1,5 +1,5 @@
Name : khelpcenter
-Version : 5.1.0
+Version : 5.1.90
Release : 1
Group : System/Base
License : GPLv2+
@@ -60,6 +60,7 @@
- "%{_kf5_libdir}/libexec/khc_docbookdig.pl"
- "%{_kf5_libdir}/libkdeinit5_khelpcenter.so"
- "%{_kf5_sharedir}/khelpcenter"
+ - "%{_kf5_sharedir}/kde4/services/*"
- "%{_kf5_sharedir}/kxmlgui5/khelpcenter/*"
- "%{_kf5_sharedir}/applications/*.desktop"
- "%{_kf5_sharedir}/config.kcfg/khelpcenter.kcfg"
|