Git commit 5599c1dd7b992d7ecf0279fce335168a683b8b10 by Aleix Pol. Committed on 11/01/2016 at 15:41. Pushed by apol into branch 'master'. Rename muon-discover to plasma-discover Changes the name of some .po file names, CC'ing l10n. REVIEW: 126680 CCMAIL: "Localization and Translation (l10n)" M +1 -1 CMakeLists.txt M +4 -4 Messages.sh M +7 -7 discover/CMakeLists.txt R +- -- discover/icons/128-apps-plasmadiscover.png [from: discover/i= cons/128-apps-muondiscover.png - 100% similarity] R +- -- discover/icons/16-apps-plasmadiscover.png [from: discover/ic= ons/16-apps-muondiscover.png - 100% similarity] R +- -- discover/icons/22-apps-plasmadiscover.png [from: discover/ic= ons/22-apps-muondiscover.png - 100% similarity] R +- -- discover/icons/32-apps-plasmadiscover.png [from: discover/ic= ons/32-apps-muondiscover.png - 100% similarity] R +- -- discover/icons/48-apps-plasmadiscover.png [from: discover/ic= ons/48-apps-muondiscover.png - 100% similarity] M +6 -6 discover/icons/CMakeLists.txt R +- -- discover/icons/sc-apps-plasmadiscover.svgz [from: discover/i= cons/sc-apps-muondiscover.svgz - 100% similarity] M +1 -1 discover/main.cpp M +1 -1 discover/org.kde.discover.desktop R +1 -1 discover/plasmadiscoverui.rc [from: discover/muondiscoverui.= rc - 093% similarity] M +3 -3 exporter/CMakeLists.txt M +1 -1 exporter/main.cpp M +1 -1 libdiscover/CMakeLists.txt M +1 -1 libdiscover/backends/ApplicationBackend/Application.cpp M +3 -3 libdiscover/backends/PackageKitBackend/CMakeLists.txt M +1 -1 libdiscover/backends/PackageKitBackend/PackageKitUpdater.h M +1 -1 libdiscover/resources/AbstractResourcesBackend.h R +1 -29 libdiscover/resources/discoverabstractnotifier.notifyrc [fro= m: libdiscover/resources/muonabstractnotifier.notifyrc - 081% similarity] M +1 -1 notifier/CMakeLists.txt M +2 -2 notifier/DiscoverNotifier.cpp M +8 -8 updater/CMakeLists.txt M +2 -2 updater/ChangelogWidget.cpp M +2 -2 updater/main.cpp R +1 -1 updater/plasma-discover-updater.desktop [from: updater/muon-= updater.desktop - 098% similarity] R +1 -1 updater/plasmadiscoverupdaterui.rc [from: updater/muonupdate= rui.rc - 097% similarity] http://commits.kde.org/discover/5599c1dd7b992d7ecf0279fce335168a683b8b10 diff --git a/CMakeLists.txt b/CMakeLists.txt index c5f29b9..74b3adc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ set(PROJECT_VERSION_MAJOR 5) = cmake_minimum_required(VERSION 2.8.12) = -option(INSTALL_EXPORTER "Install muon-exporter [development utility]" OFF) +option(INSTALL_EXPORTER "Install plasma-discover-exporter [development uti= lity]" OFF) = find_package(ECM REQUIRED NO_MODULE) = diff --git a/Messages.sh b/Messages.sh index a1fe946..9e6a799 100644 --- a/Messages.sh +++ b/Messages.sh @@ -3,10 +3,10 @@ $EXTRACTRC `find updater/ -name \*.rc -o -name \*.ui -o -name \*.kcfg` >> = updaterrc.cpp $EXTRACTRC --context=3D"Category" --tag-group=3Dnone --tag=3DName `find li= bdiscover -name "*-categories.xml"` >> categoriesxml.cpp $XGETTEXT categoriesxml.cpp `find libdiscover -name \*.cpp` -o $podir/libd= iscover.pot -$XGETTEXT rc.cpp updaterrc.cpp `find updater -name \*.cpp` -o $podir/muon-= updater.pot -$XGETTEXT `find discover -name \*.cpp -o -name \*.qml -o -name \*.js` -o $= podir/muon-discover.pot -$XGETTEXT `find exporter -name \*.cpp` -o $podir/muon-exporter.pot -$XGETTEXT `find notifier -name \*.cpp` -o $podir/muon-notifier.pot +$XGETTEXT rc.cpp updaterrc.cpp `find updater -name \*.cpp` -o $podir/plasm= a-discover-updater.pot +$XGETTEXT `find discover -name \*.cpp -o -name \*.qml -o -name \*.js` -o $= podir/plasma-discover.pot +$XGETTEXT `find exporter -name \*.cpp` -o $podir/plasma-discover-exporter.= pot +$XGETTEXT `find notifier -name \*.cpp` -o $podir/plasma-discover-notifier.= pot rm -f muonrc.cpp rm -f updaterrc.cpp rm -f categoriesxml.cpp diff --git a/discover/CMakeLists.txt b/discover/CMakeLists.txt index f4bdf53..a39a6aa 100644 --- a/discover/CMakeLists.txt +++ b/discover/CMakeLists.txt @@ -3,7 +3,7 @@ add_subdirectory(autotests) = include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/..) = -set(muon_discover_SRCS +set(plasma_discover_SRCS main.cpp MuonDiscoverMainWindow.cpp = @@ -12,11 +12,11 @@ set(muon_discover_SRCS IconColors.cpp ) = -qt5_add_resources(muon_discover_SRCS resources.qrc) +qt5_add_resources(plasma_discover_SRCS resources.qrc) = -add_executable(muon-discover ${muon_discover_SRCS}) +add_executable(plasma-discover ${plasma_discover_SRCS}) = -target_link_libraries(muon-discover LINK_PUBLIC KF5::KIOWidgets +target_link_libraries(plasma-discover LINK_PUBLIC KF5::KIOWidgets KF5::Declarative KF5::DBusAddons KF5::I18n @@ -26,8 +26,8 @@ target_link_libraries(muon-discover LINK_PUBLIC KF5::KIOW= idgets Discover::Common ) = -install(TARGETS muon-discover ${INSTALL_TARGETS_DEFAULT_ARGS} ) +install(TARGETS plasma-discover ${INSTALL_TARGETS_DEFAULT_ARGS} ) = install(PROGRAMS org.kde.discover.desktop DESTINATION ${XDG_APPS_INSTALL_D= IR} ) -install(FILES featured.json DESTINATION ${DATA_INSTALL_DIR}/muondiscover) -install(FILES muondiscoverui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/muond= iscover) +install(FILES featured.json DESTINATION ${DATA_INSTALL_DIR}/plasmadiscover) +install(FILES plasmadiscoverui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/pla= smadiscover) diff --git a/discover/icons/128-apps-muondiscover.png b/discover/icons/128-= apps-plasmadiscover.png similarity index 100% rename from discover/icons/128-apps-muondiscover.png rename to discover/icons/128-apps-plasmadiscover.png diff --git a/discover/icons/16-apps-muondiscover.png b/discover/icons/16-ap= ps-plasmadiscover.png similarity index 100% rename from discover/icons/16-apps-muondiscover.png rename to discover/icons/16-apps-plasmadiscover.png diff --git a/discover/icons/22-apps-muondiscover.png b/discover/icons/22-ap= ps-plasmadiscover.png similarity index 100% rename from discover/icons/22-apps-muondiscover.png rename to discover/icons/22-apps-plasmadiscover.png diff --git a/discover/icons/32-apps-muondiscover.png b/discover/icons/32-ap= ps-plasmadiscover.png similarity index 100% rename from discover/icons/32-apps-muondiscover.png rename to discover/icons/32-apps-plasmadiscover.png diff --git a/discover/icons/48-apps-muondiscover.png b/discover/icons/48-ap= ps-plasmadiscover.png similarity index 100% rename from discover/icons/48-apps-muondiscover.png rename to discover/icons/48-apps-plasmadiscover.png diff --git a/discover/icons/CMakeLists.txt b/discover/icons/CMakeLists.txt index ac883a6..aca7055 100644 --- a/discover/icons/CMakeLists.txt +++ b/discover/icons/CMakeLists.txt @@ -1,11 +1,11 @@ ecm_install_icons( ICONS - 128-apps-muondiscover.png - 16-apps-muondiscover.png - 22-apps-muondiscover.png - 32-apps-muondiscover.png - 48-apps-muondiscover.png - sc-apps-muondiscover.svgz + 128-apps-plasmadiscover.png + 16-apps-plasmadiscover.png + 22-apps-plasmadiscover.png + 32-apps-plasmadiscover.png + 48-apps-plasmadiscover.png + sc-apps-plasmadiscover.svgz DESTINATION ${ICON_INSTALL_DIR} THEME hicolor ) diff --git a/discover/icons/sc-apps-muondiscover.svgz b/discover/icons/sc-a= pps-plasmadiscover.svgz similarity index 100% rename from discover/icons/sc-apps-muondiscover.svgz rename to discover/icons/sc-apps-plasmadiscover.svgz diff --git a/discover/main.cpp b/discover/main.cpp index ce76436..7db7987 100644 --- a/discover/main.cpp +++ b/discover/main.cpp @@ -44,7 +44,7 @@ int main(int argc, char** argv) app.setWindowIcon(QIcon::fromTheme(QStringLiteral("muondiscover"))); app.setAttribute(Qt::AA_DontCreateNativeWidgetSiblings); app.setAttribute(Qt::AA_UseHighDpiPixmaps, true); - KLocalizedString::setApplicationDomain("muon-discover"); + KLocalizedString::setApplicationDomain("plasma-discover"); KAboutData about(QStringLiteral("muondiscover"), i18n("Discover"), ver= sion, i18n("An application explorer"), KAboutLicense::GPL, i18n("=C2=A9 2010-2014 Plasma Dev= elopment Team")); about.addAuthor(i18n("Aleix Pol Gonzalez"), QString(), QStringLiteral(= "aleixpol@blue-systems.com")); diff --git a/discover/org.kde.discover.desktop b/discover/org.kde.discover.= desktop index 57096b3..9aba5b0 100644 --- a/discover/org.kde.discover.desktop +++ b/discover/org.kde.discover.desktop @@ -24,7 +24,7 @@ Name[uk]=3DDiscover Name[x-test]=3DxxDiscoverxx Name[zh_CN]=3D=E5=8F=91=E7=8E=B0=E8=80=85 MimeType=3Dx-scheme-handler/appstream -Exec=3Dmuon-discover %U +Exec=3Dplasma-discover %U Icon=3Dmuondiscover Type=3DApplication X-DocPath=3Dmuon/index.html diff --git a/discover/muondiscoverui.rc b/discover/plasmadiscoverui.rc similarity index 93% rename from discover/muondiscoverui.rc rename to discover/plasmadiscoverui.rc index 375c6d8..cfd3837 100644 --- a/discover/muondiscoverui.rc +++ b/discover/plasmadiscoverui.rc @@ -1,5 +1,5 @@ - -