Hello community, here is the log from the commit of package kcharselect for openSUSE:Factory checked in at 2015-05-11 18:51:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcharselect (Old) and /work/SRC/openSUSE:Factory/.kcharselect.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcharselect" Changes: -------- --- /work/SRC/openSUSE:Factory/kcharselect/kcharselect.changes 2015-03-11 09:46:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kcharselect.new/kcharselect.changes 2015-05-11 18:51:59.000000000 +0200 @@ -1,0 +2,22 @@ +Sat Apr 11 12:45:29 UTC 2015 - [email protected] + +- Update to KDE Applications 15.04.0 + * KDE Applications 15.04.0 + * https://www.kde.org/announcements/announce-applications-15.04.0.php + + +------------------------------------------------------------------- +Sat Mar 21 17:22:04 UTC 2015 - [email protected] + +- Update to KDE Applications 15.03.95 + * KDE Applications 15.04 RC + + +------------------------------------------------------------------- +Sun Mar 8 12:36:40 UTC 2015 - [email protected] + +- Update to KDE Applications 15.03.80 + * KDE Applications 15.04 Beta + + +------------------------------------------------------------------- Old: ---- kcharselect-14.12.3.tar.xz New: ---- kcharselect-15.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcharselect.spec ++++++ --- /var/tmp/diff_new_pack.bUqQIk/_old 2015-05-11 18:52:00.000000000 +0200 +++ /var/tmp/diff_new_pack.bUqQIk/_new 2015-05-11 18:52:00.000000000 +0200 @@ -17,18 +17,25 @@ Name: kcharselect -BuildRequires: libkde4-devel +BuildRequires: extra-cmake-modules +BuildRequires: kdoctools-devel +BuildRequires: kf5-filesystem +BuildRequires: ki18n-devel +BuildRequires: kwidgetsaddons-devel +BuildRequires: kxmlgui-devel +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 Url: http://www.kde.org Summary: KDE Character Selector License: GPL-2.0+ Group: Productivity/Other -Version: 14.12.3 +Version: 15.04.0 Release: 0 Source0: %{name}-%{version}.tar.xz +Obsoletes: %{name}5 < %{version} +Provides: %{name}5 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -Provides: kde4-kcharselect = 4.3.0 -Obsoletes: kde4-kcharselect < 4.3.0 -%kde4_runtime_requires %description KCharSelect is the KDE character selector tool. @@ -38,14 +45,12 @@ %setup -q -n kcharselect-%version %build - %cmake_kde4 -d build + %cmake_kf5 -d build %make_jobs %install - cd build - %kde4_makeinstall - %suse_update_desktop_file KCharSelect Utility Accessibility - %kde_post_install + %kf5_makeinstall -C build + %suse_update_desktop_file org.kde.KCharSelect Utility Accessibility %post -p /sbin/ldconfig @@ -53,9 +58,12 @@ %files %defattr(-,root,root) -%_kde4_bindir/kcharselect -%_kde4_applicationsdir/*.desktop -%_kde4_htmldir/en/kcharselect/ -%_kde4_appsdir/kcharselect/ +%{_kf5_bindir}/kcharselect +%{_kf5_applicationsdir}/*.desktop +%dir %{_kf5_htmldir}/en +%dir %{_kf5_htmldir} +%doc %lang(en) %{_kf5_htmldir}/en/*/ +%{_kf5_kxmlguidir}/ + %changelog ++++++ kcharselect-14.12.3.tar.xz -> kcharselect-15.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcharselect-14.12.3/CMakeLists.txt new/kcharselect-15.04.0/CMakeLists.txt --- old/kcharselect-14.12.3/CMakeLists.txt 2014-11-16 08:12:20.000000000 +0100 +++ new/kcharselect-15.04.0/CMakeLists.txt 2015-03-27 07:58:25.000000000 +0100 @@ -1,37 +1,45 @@ project(kcharselect) -########### next target ############### +cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) +set (QT_MIN_VERSION "5.2.0") -if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) - find_package(KDE4) - include( KDE4Defaults ) - include_directories(${KDE4_INCLUDES}) - - add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) - add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) - - # If definitions like -D_GNU_SOURCE are needed for these checks they - # should be added to _KDE4_PLATFORM_DEFINITIONS when it is originally - # defined outside this file. Here we include these definitions in - # CMAKE_REQUIRED_DEFINITIONS so they will be included in the build of - # checks below. - set( CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS} ) -endif() +find_package (ECM 1.3.0 REQUIRED NO_MODULE) +set (CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) + +add_definitions(-DTRANSLATION_DOMAIN="kcharselect") + +include(KDEInstallDirs) +include(KDECompilerSettings) +include(KDECMakeSettings) + +find_package (Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS + Core + Widgets +) + +find_package(KF5 REQUIRED COMPONENTS + DocTools + I18n + WidgetsAddons + XmlGui +) + +add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) set(kcharselect_SRCS kcharselectdia.cc main.cc ) -kde4_add_app_icon(kcharselect_SRCS "${KDE4_INSTALL_DIR}/share/icons/oxygen/*/apps/accessories-character-map.png") +#kde4_add_app_icon(kcharselect_SRCS "${KDE4_INSTALL_DIR}/share/icons/oxygen/*/apps/accessories-character-map.png") -kde4_add_executable(kcharselect ${kcharselect_SRCS}) +add_executable(kcharselect ${kcharselect_SRCS}) -target_link_libraries(kcharselect ${KDE4_KDEUI_LIBS} ) +target_link_libraries(kcharselect KF5::I18n KF5::WidgetsAddons KF5::XmlGui ) install(TARGETS kcharselect ${INSTALL_TARGETS_DEFAULT_ARGS} ) ########### install files ############### -install( PROGRAMS KCharSelect.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) -install( FILES kcharselectui.rc DESTINATION ${DATA_INSTALL_DIR}/kcharselect) +install( PROGRAMS org.kde.KCharSelect.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install( FILES kcharselectui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kcharselect) -kde4_install_icons( ${ICON_INSTALL_DIR} ) add_subdirectory(doc) +feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcharselect-14.12.3/KCharSelect.desktop new/kcharselect-15.04.0/KCharSelect.desktop --- old/kcharselect-14.12.3/KCharSelect.desktop 2014-11-16 08:12:20.000000000 +0100 +++ new/kcharselect-15.04.0/KCharSelect.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,156 +0,0 @@ -[Desktop Entry] -GenericName=Character Selector -GenericName[af]=Karakter Kiesser -GenericName[ar]=أداة اختيار الرموز -GenericName[ast]=Seleutor de carauter -GenericName[bg]=Избор на знаци -GenericName[br]=Dibaber arouezenn -GenericName[bs]=Birač znakova -GenericName[ca]=Selector de caràcters -GenericName[ca@valencia]=Selector de caràcters -GenericName[cs]=Výběr znaků -GenericName[cy]=Dewisydd Nod -GenericName[da]=Tegnvælger -GenericName[de]=Tabelle zur Zeichenauswahl -GenericName[el]=Επιλογέας χαρακτήρων -GenericName[en_GB]=Character Selector -GenericName[eo]=Elektilo por signoj -GenericName[es]=Selector de caracteres -GenericName[et]=Sümbolite valija -GenericName[eu]=Karaktere-hautatzailea -GenericName[fa]=گزیننده نویسه -GenericName[fi]=Merkkivalitsin -GenericName[fr]=Sélecteur de caractères -GenericName[ga]=Roghnóir Carachtar -GenericName[gl]=Selector de caracteres -GenericName[he]=בוחר תווים -GenericName[hne]=अक्छर चुनइया -GenericName[hr]=Izbor znakova -GenericName[hu]=Karakterválasztó -GenericName[ia]=Selector de character -GenericName[id]=Selektor Karakter -GenericName[is]=Stafaval -GenericName[it]=Selettore di caratteri -GenericName[ja]=文字の選択 -GenericName[kk]=Таңба тергіш -GenericName[km]=កម្មវិធីជ្រើសតួអក្សរ -GenericName[ko]=문자 선택기 -GenericName[lt]=Simbolių parinkimas -GenericName[lv]=Rakstzīmju atlasītājs -GenericName[mk]=Избирач на знаци -GenericName[mr]=अक्षर निवड -GenericName[ms]=Character Selector -GenericName[nb]=Tegnvelger -GenericName[nds]=Tekenköör -GenericName[ne]=क्यारेक्टर चयनकर्ता -GenericName[nl]=Speciale tekens -GenericName[nn]=Teiknveljar -GenericName[pa]=ਅੱਖਰ ਚੋਣਕਾਰ -GenericName[pl]=Tablica znaków -GenericName[pt]=Selector de Caracteres -GenericName[pt_BR]=Seletor de caracteres -GenericName[ro]=Selector de caractere -GenericName[ru]=Выбор символа -GenericName[sk]=Výber znakov -GenericName[sl]=Izbirnik znakov -GenericName[sq]=Zgjedhës i Gërmave -GenericName[sr]=Бирач знакова -GenericName[sr@ijekavian]=Бирач знакова -GenericName[sr@ijekavianlatin]=Birač znakova -GenericName[sr@latin]=Birač znakova -GenericName[sv]=Teckenväljare -GenericName[ta]= எழுத்து தேர்ந்தெடுப்பான் -GenericName[tg]=Интихобгари Аломатҳо -GenericName[th]=เครื่องมือเลือกอักขระ -GenericName[tr]=Karakter Seçici -GenericName[ug]=ھەرپ تاللىغۇچ -GenericName[uk]=Таблиця символів -GenericName[uz]=Harf tanlagich -GenericName[uz@cyrillic]=Ҳарф танлагич -GenericName[vi]=Trình Chọn Kí Tự -GenericName[wa]=Tchoezixheu di caracteres -GenericName[xh]=Umkhethi womsebenzi -GenericName[x-test]=xxCharacter Selectorxx -GenericName[zh_CN]=字符选择器 -GenericName[zh_TW]=字元選擇器 -Exec=kcharselect -caption %c -Icon=accessories-character-map -Type=Application -Terminal=false -X-DocPath=kcharselect/index.html -Name=KCharSelect -Name[af]=Kcharselect -Name[ar]=منتقي الحروف ك -Name[ast]=KCharSelect -Name[bg]=CharSelect -Name[br]=KCharSelect -Name[bs]=KCharSelect -Name[ca]=KCharSelect -Name[ca@valencia]=KCharSelect -Name[cs]=KCharSelect -Name[cy]=KDewisNod -Name[da]=KCharSelect -Name[de]=KCharSelect -Name[el]=KCharSelect -Name[en_GB]=KCharSelect -Name[eo]=KCharSelect -Name[es]=KCharSelect -Name[et]=KCharSelect -Name[eu]=KCharSelect -Name[fi]=KCharSelect -Name[fr]=KCharSelect -Name[ga]=KCharSelect -Name[gl]=KCharSelect -Name[he]=KCharSelect -Name[hne]=के-चर-सलेक्ट -Name[hr]=KCharSelect -Name[hu]=KCharSelect -Name[ia]=KCharSelect -Name[id]=KCharSelect -Name[is]=KCharSelect -Name[it]=KCharSelect -Name[ja]=KCharSelect -Name[kk]=KCharSelect -Name[km]=KCharSelect -Name[ko]=KCharSelect -Name[lt]=KCharSelect -Name[lv]=KCharSelect -Name[mk]=KCharSelect -Name[mr]=के-कॅर-सिलेक्ट -Name[ms]=KCharSelect -Name[nb]=KCharSelect -Name[nds]=KCharSelect -Name[ne]=केडीई क्यारेक्टर चयन -Name[nl]=Speciale tekens -Name[nn]=KCharSelect -Name[pa]=ਕੇ-ਅੱਖਰ ਚੁਣੋ -Name[pl]=KCharSelect -Name[pt]=KCharSelect -Name[pt_BR]=KCharSelect -Name[ro]=KCharSelect -Name[ru]=KCharSelect -Name[sk]=KCharSelect -Name[sl]=KCharSelect -Name[sq]=KCharSelect -Name[sr]=К‑бирач-знакова -Name[sr@ijekavian]=К‑бирач-знакова -Name[sr@ijekavianlatin]=K‑birač-znakova -Name[sr@latin]=K‑birač-znakova -Name[sv]=Kcharselect -Name[ta]= கேஎழுத்துதேர்வு -Name[tg]=KИнтихобгари Аломатҳо -Name[th]=เลือกอักขระ-K -Name[tr]=KCharSelect -Name[ug]=KCharSelect -Name[uk]=KCharSelect -Name[uz]=KCharSelect -Name[uz@cyrillic]=KCharSelect -Name[vi]=KCharSelect -Name[wa]=KCharSelect -Name[xh]=Itshati yokukheta i K -Name[x-test]=xxKCharSelectxx -Name[zh_CN]=KCharSelect -Name[zh_TW]=KDE 字元選擇 -X-KDE-StartupNotify=true -X-DBUS-StartupType=Multi -Categories=Qt;KDE;Utility; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcharselect-14.12.3/doc/CMakeLists.txt new/kcharselect-15.04.0/doc/CMakeLists.txt --- old/kcharselect-14.12.3/doc/CMakeLists.txt 2014-11-16 08:12:20.000000000 +0100 +++ new/kcharselect-15.04.0/doc/CMakeLists.txt 2015-03-27 07:58:25.000000000 +0100 @@ -1,4 +1,4 @@ ########### install files ############### # # -kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcharselect) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcharselect) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcharselect-14.12.3/doc/index.docbook new/kcharselect-15.04.0/doc/index.docbook --- old/kcharselect-14.12.3/doc/index.docbook 2014-11-16 08:12:20.000000000 +0100 +++ new/kcharselect-15.04.0/doc/index.docbook 2015-03-27 07:58:25.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY kappname "&kcharselect;"> <!ENTITY package "kdeutils"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcharselect-14.12.3/kcharselectdia.cc new/kcharselect-15.04.0/kcharselectdia.cc --- old/kcharselect-14.12.3/kcharselectdia.cc 2014-11-16 08:12:20.000000000 +0100 +++ new/kcharselect-15.04.0/kcharselectdia.cc 2015-03-27 07:58:25.000000000 +0100 @@ -17,17 +17,19 @@ #include "kcharselectdia.h" -#include <KAction> +#include <QAction> +#include <QApplication> +#include <QFontDatabase> +#include <QIcon> +#include <QClipboard> +#include <QGridLayout> + #include <KActionCollection> -#include <KApplication> -#include <KConfig> -#include <KDebug> -#include <KDialog> -#include <KGlobal> -#include <KIcon> -#include <KLocale> +#include <KConfigGroup> +#include <KLocalizedString> #include <KStandardAction> #include <KStandardShortcut> +#include <KSharedConfig> #include <KToggleAction> /******************************************************************/ @@ -38,10 +40,10 @@ KCharSelectDia::KCharSelectDia() : KXmlGuiWindow() { - KSharedConfig::Ptr config = KGlobal::config(); + KSharedConfig::Ptr config = KSharedConfig::openConfig(); KConfigGroup gr = config->group("General"); - vFont = gr.readEntry("selectedFont", KGlobalSettings::generalFont()); + vFont = gr.readEntry("selectedFont", QFontDatabase::systemFont(QFontDatabase::GeneralFont)); vChr = QChar(static_cast<unsigned short>(gr.readEntry("char", 33))); _rtl = gr.readEntry("rtl", false); @@ -49,74 +51,70 @@ setCentralWidget(mainWidget); grid = new QGridLayout( mainWidget ); - grid->setMargin( KDialog::marginHint() ); - grid->setSpacing( KDialog::spacingHint() ); // Add character selection widget from library kdeui charSelect = new KCharSelect(mainWidget, actionCollection()); charSelect->setCurrentChar(vChr); charSelect->setCurrentFont(vFont); charSelect->resize(charSelect->sizeHint()); - connect(charSelect,SIGNAL(currentCharChanged(const QChar &)), - SLOT(charChanged(const QChar &))); - connect(charSelect,SIGNAL(charSelected(const QChar &)), - SLOT(add(const QChar &))); - connect(charSelect,SIGNAL(currentFontChanged(const QFont &)), - SLOT(fontSelected(const QFont &))); + connect(charSelect, &KCharSelect::currentCharChanged, this, &KCharSelectDia::charChanged); + connect(charSelect,SIGNAL(charSelected(QChar)), + SLOT(add(QChar))); + + connect(charSelect, &KCharSelect::currentFontChanged, this, &KCharSelectDia::fontSelected); grid->addWidget(charSelect, 0, 0, 1, 4); // Build line editor - lined = new KLineEdit(mainWidget); + lined = new QLineEdit(mainWidget); lined->resize(lined->sizeHint()); - lined->setClearButtonShown(true); + lined->setClearButtonEnabled(true); lined->setFont( vFont ); - connect(lined,SIGNAL(textChanged(const QString &)), - SLOT(lineEditChanged())); + connect(lined, &QLineEdit::textChanged, this, &KCharSelectDia::lineEditChanged); grid->addWidget(lined, 1, 0, 1, 3); - bClip = new KPushButton( KGuiItem( i18n( "&To Clipboard" ), - QLatin1String( "edit-copy" ) ), mainWidget ); + bClip = new QPushButton( i18n( "&To Clipboard" ), mainWidget ); + bClip->setIcon( QIcon::fromTheme( QLatin1String( "edit-copy" ) )); bClip->setFixedSize( bClip->sizeHint() ); - connect(bClip,SIGNAL(clicked()),this,SLOT(toClip())); + connect(bClip, &QPushButton::clicked, this, &KCharSelectDia::toClip); grid->addWidget(bClip, 1, 3); // Build menu KStandardAction::quit( this, SLOT(close()), actionCollection() ); - KAction *action = actionCollection()->addAction( QLatin1String( "copy_clip" ) ); + QAction *action = actionCollection()->addAction( QLatin1String( "copy_clip" ) ); action->setText( i18n("&To Clipboard") ); - action->setIcon( KIcon( QLatin1String( "edit-copy" )) ); - connect(action, SIGNAL(triggered(bool)), SLOT(toClip())); - action->setShortcuts(KStandardShortcut::shortcut(KStandardShortcut::Copy)); + action->setIcon( QIcon::fromTheme( QLatin1String( "edit-copy" )) ); + connect(action, &QAction::triggered, this, &KCharSelectDia::toClip); + actionCollection()->setDefaultShortcuts(action, KStandardShortcut::shortcut(KStandardShortcut::Copy)); action = actionCollection()->addAction( QLatin1String( "copy_utf_8" ) ); action->setText( i18n("To Clipboard &UTF-8") ); - connect(action, SIGNAL(triggered(bool) ), SLOT(toClipUTF8())); + connect(action, &QAction::triggered, this, &KCharSelectDia::toClipUTF8); action = actionCollection()->addAction( QLatin1String( "copy_html" ) ); action->setText( i18n("To Clipboard &HTML") ); - connect(action, SIGNAL(triggered(bool) ), SLOT(toClipHTML())); + connect(action, &QAction::triggered, this, &KCharSelectDia::toClipHTML); action = actionCollection()->addAction( QLatin1String( "from_clip" ) ); action->setText( i18n("&From Clipboard") ); - action->setIcon( KIcon( QLatin1String( "edit-paste" )) ); - connect(action, SIGNAL(triggered(bool)), SLOT(fromClip())); - action->setShortcuts(KStandardShortcut::shortcut(KStandardShortcut::Paste)); + action->setIcon( QIcon::fromTheme( QLatin1String( "edit-paste" )) ); + connect(action, &QAction::triggered, this, &KCharSelectDia::fromClip); + actionCollection()->setDefaultShortcuts(action, KStandardShortcut::shortcut(KStandardShortcut::Paste)); action = actionCollection()->addAction( QLatin1String( "from_clip_utf8" ) ); action->setText( i18n( "From Clipboard UTF-8") ); - connect(action, SIGNAL(triggered(bool) ), SLOT(fromClipUTF8())); + connect(action, &QAction::triggered, this, &KCharSelectDia::fromClipUTF8); i18n("From Clipboard HTML"); // Intended for future use action = actionCollection()->addAction( QLatin1String( "flip" ) ); action->setText( i18n("&Flip Text") ); - connect(action, SIGNAL(triggered(bool) ), SLOT(flipText())); + connect(action, &QAction::triggered, this, &KCharSelectDia::flipText); action = new KToggleAction( i18n("&Reverse Direction"), this ); action->setChecked(_rtl); actionCollection()->addAction( QLatin1String( "rtl" ), action ); - connect(action, SIGNAL(toggled(bool) ), SLOT(setRtl(bool))); + connect(action, &QAction::toggled, this, &KCharSelectDia::setRtl); charSelect->setFocus(); @@ -131,7 +129,7 @@ //================================================================== void KCharSelectDia::closeEvent(QCloseEvent *event) { - KSharedConfig::Ptr config = KGlobal::config(); + KSharedConfig::Ptr config = KSharedConfig::openConfig(); KConfigGroup gr = config->group("General"); gr.writeEntry("selectedFont", vFont); @@ -287,5 +285,3 @@ lined->setCursorPosition( lined->cursorPosition() - 1 ); } } - -#include "kcharselectdia.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcharselect-14.12.3/kcharselectdia.h new/kcharselect-15.04.0/kcharselectdia.h --- old/kcharselect-14.12.3/kcharselectdia.h 2014-11-16 08:12:20.000000000 +0100 +++ new/kcharselect-15.04.0/kcharselectdia.h 2015-03-27 07:58:25.000000000 +0100 @@ -18,18 +18,16 @@ #ifndef KCHARSELECTDIA_H #define KCHARSELECTDIA_H -#include <QClipboard> -#include <QLayout> +#include <QLineEdit> +#include <QPushButton> #include <KCharSelect> -#include <KLineEdit> -#include <KPushButton> #include <KXmlGuiWindow> /******************************************************************/ /* class KCharSelectDia */ /******************************************************************/ - +class QGridLayout; class KCharSelectDia : public KXmlGuiWindow { Q_OBJECT @@ -42,8 +40,8 @@ QGridLayout *grid; KCharSelect *charSelect; - KLineEdit *lined; - KPushButton *bClip; + QLineEdit *lined; + QPushButton *bClip; QChar vChr; QFont vFont; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcharselect-14.12.3/main.cc new/kcharselect-15.04.0/main.cc --- old/kcharselect-14.12.3/main.cc 2014-11-16 08:12:20.000000000 +0100 +++ new/kcharselect-15.04.0/main.cc 2015-03-27 07:58:25.000000000 +0100 @@ -15,42 +15,50 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "kcharselectdia.h" +#include <QApplication> +#include <QCommandLineParser> #include <KAboutData> -#include <KApplication> -#include <KCmdLineArgs> - -static const char version[] = "v1.11"; -static const char description[] = I18N_NOOP("KDE character selection utility"); -static const char text[] = I18N_NOOP("A wrapper around the KCharSelect widget."); -static const char homepageUrl[] = "http://utils.kde.org/projects/kcharselect";; +#include <KLocalizedString> +#include <Kdelibs4ConfigMigrator> +#include "kcharselectdia.h" -/*================================================================*/ int main(int argc, char **argv) { - KAboutData aboutData( "kcharselect", 0, ki18n("KCharSelect"), - version, ki18n(description), KAboutData::License_GPL, - KLocalizedString(), ki18n(text), homepageUrl ); + Kdelibs4ConfigMigrator migrate(QLatin1String("kcharselect")); + migrate.setConfigFiles(QStringList() << QLatin1String("kcharselectrc")); + migrate.setUiFiles(QStringList() << QLatin1String("kcharselectui.rc")); + migrate.migrate(); + + KAboutData aboutData( "kcharselect", i18n("KCharSelect"), + "1.12", i18n("KDE character selection utility"), KAboutLicense::GPL, + QString(), i18n("A wrapper around the KCharSelect widget."), "http://utils.kde.org/projects/kcharselect"; ); - aboutData.addAuthor(ki18n("Daniel Laidig"), ki18n("Author and maintainer"), "[email protected]" ); - aboutData.addAuthor(ki18n("Reginald Stadlbauer"), ki18n("Author"), "[email protected]"); + aboutData.addAuthor(i18n("Daniel Laidig"), i18n("Author and maintainer"), "[email protected]" ); + aboutData.addAuthor(i18n("Reginald Stadlbauer"), i18n("Author"), "[email protected]"); - aboutData.addCredit( ki18n("Daniel Laidig"), ki18n("New GUI, Unicode information, incremental search," + aboutData.addCredit( i18n("Daniel Laidig"), i18n("New GUI, Unicode information, incremental search," " and general improvements"), "[email protected]" ); - aboutData.addCredit( ki18n("Constantin Berzan"), ki18n("Previous maintainer"), "[email protected]" ); - aboutData.addCredit( ki18n("Nadeem Hasan"), ki18n( "GUI cleanup and fixes" ), + aboutData.addCredit( i18n("Constantin Berzan"), i18n("Previous maintainer"), "[email protected]" ); + aboutData.addCredit( i18n("Nadeem Hasan"), i18n( "GUI cleanup and fixes" ), "[email protected]" ); - aboutData.addCredit( ki18n("Ryan Cumming"), ki18n( "GUI cleanup and fixes" ), + aboutData.addCredit( i18n("Ryan Cumming"), i18n( "GUI cleanup and fixes" ), "[email protected]" ); - aboutData.addCredit( ki18n("Benjamin C. Meyer"), ki18n("XMLUI conversion"), + aboutData.addCredit( i18n("Benjamin C. Meyer"), i18n("XMLUI conversion"), "[email protected]" ); - aboutData.addCredit( ki18n("Bryce Nesbitt"), ki18n("RTL support") ); + aboutData.addCredit( i18n("Bryce Nesbitt"), i18n("RTL support") ); + + QApplication app( argc, argv ); + KAboutData::setApplicationData( aboutData ); + app.setWindowIcon( QIcon::fromTheme( QLatin1String( "accessories-character-map" ))); - aboutData.setProgramIconName(QLatin1String( "accessories-character-map" )); - KCmdLineArgs::init( argc, argv, &aboutData ); - KApplication app; + QCommandLineParser parser; + parser.addHelpOption(); + parser.addVersionOption(); + aboutData.setupCommandLine(&parser); + parser.process(app); + aboutData.processCommandLine(&parser); KCharSelectDia *dia = new KCharSelectDia; dia->show(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcharselect-14.12.3/org.kde.KCharSelect.desktop new/kcharselect-15.04.0/org.kde.KCharSelect.desktop --- old/kcharselect-14.12.3/org.kde.KCharSelect.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/kcharselect-15.04.0/org.kde.KCharSelect.desktop 2015-03-27 07:58:25.000000000 +0100 @@ -0,0 +1,155 @@ +[Desktop Entry] +GenericName=Character Selector +GenericName[af]=Karakter Kiesser +GenericName[ar]=أداة اختيار الرموز +GenericName[ast]=Seleutor de carauter +GenericName[bg]=Избор на знаци +GenericName[br]=Dibaber arouezenn +GenericName[bs]=Birač znakova +GenericName[ca]=Selector de caràcters +GenericName[ca@valencia]=Selector de caràcters +GenericName[cs]=Výběr znaků +GenericName[cy]=Dewisydd Nod +GenericName[da]=Tegnvælger +GenericName[de]=Tabelle zur Zeichenauswahl +GenericName[el]=Επιλογέας χαρακτήρων +GenericName[en_GB]=Character Selector +GenericName[eo]=Elektilo por signoj +GenericName[es]=Selector de caracteres +GenericName[et]=Sümbolite valija +GenericName[eu]=Karaktere-hautatzailea +GenericName[fa]=گزیننده نویسه +GenericName[fi]=Merkkivalitsin +GenericName[fr]=Sélecteur de caractères +GenericName[ga]=Roghnóir Carachtar +GenericName[gl]=Selector de caracteres +GenericName[he]=בוחר תווים +GenericName[hne]=अक्छर चुनइया +GenericName[hr]=Izbor znakova +GenericName[hu]=Karakterválasztó +GenericName[ia]=Selector de character +GenericName[id]=Selektor Karakter +GenericName[is]=Stafaval +GenericName[it]=Selettore di caratteri +GenericName[ja]=文字の選択 +GenericName[kk]=Таңба тергіш +GenericName[km]=កម្មវិធីជ្រើសតួអក្សរ +GenericName[ko]=문자 선택기 +GenericName[lt]=Simbolių parinkimas +GenericName[lv]=Rakstzīmju atlasītājs +GenericName[mk]=Избирач на знаци +GenericName[mr]=अक्षर निवड +GenericName[ms]=Character Selector +GenericName[nb]=Tegnvelger +GenericName[nds]=Tekenköör +GenericName[ne]=क्यारेक्टर चयनकर्ता +GenericName[nl]=Speciale tekens +GenericName[nn]=Teiknveljar +GenericName[pa]=ਅੱਖਰ ਚੋਣਕਾਰ +GenericName[pl]=Tablica znaków +GenericName[pt]=Selector de Caracteres +GenericName[pt_BR]=Seletor de caracteres +GenericName[ro]=Selector de caractere +GenericName[ru]=Выбор символа +GenericName[sk]=Výber znakov +GenericName[sl]=Izbirnik znakov +GenericName[sq]=Zgjedhës i Gërmave +GenericName[sr]=Бирач знакова +GenericName[sr@ijekavian]=Бирач знакова +GenericName[sr@ijekavianlatin]=Birač znakova +GenericName[sr@latin]=Birač znakova +GenericName[sv]=Teckenväljare +GenericName[ta]= எழுத்து தேர்ந்தெடுப்பான் +GenericName[tg]=Интихобгари Аломатҳо +GenericName[th]=เครื่องมือเลือกอักขระ +GenericName[tr]=Karakter Seçici +GenericName[ug]=ھەرپ تاللىغۇچ +GenericName[uk]=Таблиця символів +GenericName[uz]=Harf tanlagich +GenericName[uz@cyrillic]=Ҳарф танлагич +GenericName[vi]=Trình Chọn Kí Tự +GenericName[wa]=Tchoezixheu di caracteres +GenericName[xh]=Umkhethi womsebenzi +GenericName[x-test]=xxCharacter Selectorxx +GenericName[zh_CN]=字符选择器 +GenericName[zh_TW]=字元選擇器 +Exec=kcharselect --qwindowtitle %c +Icon=accessories-character-map +Type=Application +Terminal=false +X-DocPath=kcharselect/index.html +Name=KCharSelect +Name[af]=Kcharselect +Name[ar]=منتقي الحروف ك +Name[ast]=KCharSelect +Name[bg]=CharSelect +Name[br]=KCharSelect +Name[bs]=KCharSelect +Name[ca]=KCharSelect +Name[ca@valencia]=KCharSelect +Name[cs]=KCharSelect +Name[cy]=KDewisNod +Name[da]=KCharSelect +Name[de]=KCharSelect +Name[el]=KCharSelect +Name[en_GB]=KCharSelect +Name[eo]=KCharSelect +Name[es]=KCharSelect +Name[et]=KCharSelect +Name[eu]=KCharSelect +Name[fi]=KCharSelect +Name[fr]=KCharSelect +Name[ga]=KCharSelect +Name[gl]=KCharSelect +Name[he]=KCharSelect +Name[hne]=के-चर-सलेक्ट +Name[hr]=KCharSelect +Name[hu]=KCharSelect +Name[ia]=KCharSelect +Name[id]=KCharSelect +Name[is]=KCharSelect +Name[it]=KCharSelect +Name[ja]=KCharSelect +Name[kk]=KCharSelect +Name[km]=KCharSelect +Name[ko]=KCharSelect +Name[lt]=KCharSelect +Name[lv]=KCharSelect +Name[mk]=KCharSelect +Name[mr]=के-कॅर-सिलेक्ट +Name[ms]=KCharSelect +Name[nb]=KCharSelect +Name[nds]=KCharSelect +Name[ne]=केडीई क्यारेक्टर चयन +Name[nl]=Speciale tekens +Name[nn]=KCharSelect +Name[pa]=ਕੇ-ਅੱਖਰ ਚੁਣੋ +Name[pl]=KCharSelect +Name[pt]=KCharSelect +Name[pt_BR]=KCharSelect +Name[ro]=KCharSelect +Name[ru]=KCharSelect +Name[sk]=KCharSelect +Name[sl]=KCharSelect +Name[sq]=KCharSelect +Name[sr]=К‑бирач-знакова +Name[sr@ijekavian]=К‑бирач-знакова +Name[sr@ijekavianlatin]=K‑birač-znakova +Name[sr@latin]=K‑birač-znakova +Name[sv]=Kcharselect +Name[ta]= கேஎழுத்துதேர்வு +Name[tg]=KИнтихобгари Аломатҳо +Name[th]=เลือกอักขระ-K +Name[tr]=KCharSelect +Name[ug]=KCharSelect +Name[uk]=KCharSelect +Name[uz]=KCharSelect +Name[uz@cyrillic]=KCharSelect +Name[vi]=KCharSelect +Name[wa]=KCharSelect +Name[xh]=Itshati yokukheta i K +Name[x-test]=xxKCharSelectxx +Name[zh_CN]=KCharSelect +Name[zh_TW]=KDE 字元選擇 +StartupNotify=true +Categories=Qt;KDE;Utility;
