release 1.4.5

+ add translation support to plugin part * more correct interface painting * more correct configuration interface painting (fix #42) * move plugin from private
2025-04-24 15:37:23 +00:00 · 2015-05-13 00:02:48 +03:00 · 2015-05-13 00:02:48 +03:00 · e26da85b5f
commit e26da85b5f
parent f665a46346
13 changed files with 31 additions and 30 deletions
--- a/8
+++ b/8
@ -1,3 +1,11 @@
+Ver.1.4.5
+---------
+* plasmoid
+    + add translation support to plugin part
+    * more correct interface painting
+    * more correct configuration interface painting
+    * move plugin from private
+
 Ver.1.4.4
 ---------
 * dataengine
--- a/arch/PKGBUILD
+++ b/arch/PKGBUILD
@ -3,7 +3,7 @@
 pkgbase=netctl-gui
 pkgname=('libnetctlgui' 'netctlgui-helper' 'netctl-gui'
         'plasma5-applet-netctl-gui')
-pkgver=1.4.4
+pkgver=1.4.5
 pkgrel=1
 pkgdesc="Qt4/Qt5 GUI for netctl. Also provides a widget for KDE"
 arch=('i686' 'x86_64')
@ -11,7 +11,7 @@ url="http://arcanis.name/projects/netctl-gui"
 license=('GPL3')
 makedepends=('cmake' 'extra-cmake-modules' 'plasma-framework' 'qt5-tools')
 source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${pkgbase}-${pkgver}-src.tar.xz")
-md5sums=('ea5eb54bf0ad29f392c8fe6e5ea2585e')
+md5sums=('9c1ddad6163290ed3fb52c3d233e1ee3')

 prepare() {
  rm -rf "${srcdir}/build-"{plasmoid,qt5}
--- a/arch/PKGBUILD-qt4
+++ b/arch/PKGBUILD-qt4
@ -4,7 +4,7 @@ pkgbase=netctl-gui-qt4
 _pkgbase=netctl-gui
 pkgname=('libnetctlgui-qt4' 'netctlgui-helper-qt4' 'netctl-gui-qt4'
         'kdeplasma-applets-netctl-gui')
-pkgver=1.4.4
+pkgver=1.4.5
 pkgrel=1
 pkgdesc="Qt4 GUI for netctl. Also provides a widget for KDE4"
 arch=('i686' 'x86_64')
@ -12,7 +12,7 @@ url="http://arcanis.name/projects/netctl-gui"
 license=('GPL3')
 makedepends=('automoc4' 'cmake' 'kdelibs')
 source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${_pkgbase}-${pkgver}-src.tar.xz")
-md5sums=('ea5eb54bf0ad29f392c8fe6e5ea2585e')
+md5sums=('9c1ddad6163290ed3fb52c3d233e1ee3')


 prepare() {
--- a/sources/CMakeLists.txt
+++ b/sources/CMakeLists.txt
@ -11,7 +11,7 @@ set (PROJECT_CONTACT "esalexeev@gmail.com")
 set (PROJECT_LICENSE "GPLv3")
 set (PROJECT_VERSION_MAJOR 1)
 set (PROJECT_VERSION_MINOR 4)
-set (PROJECT_VERSION_PATCH 4)
+set (PROJECT_VERSION_PATCH 5)
 set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
 string (TIMESTAMP CURRENT_DATE "%Y-%m-%d %H:%M" UTC)
 string (TIMESTAMP CURRENT_YEAR "%Y")
--- a/sources/plasmoid-kf5/package/contents/ui/about.qml
+++ b/sources/plasmoid-kf5/package/contents/ui/about.qml
@ -19,7 +19,7 @@ import QtQuick 2.0
 import QtQuick.Controls 1.3 as QtControls
 import QtQuick.Layouts 1.0 as QtLayouts

-import org.kde.plasma.private.netctl 1.0
+import org.kde.plasma.netctl 1.0


 Item {
@ -33,7 +33,7 @@ Item {

    Column {
        id: pageColumn
-        width: units.gridUnit * 25
+        anchors.fill: parent
        QtControls.TabView {
            height: parent.height
            width: parent.width
--- a/sources/plasmoid-kf5/package/contents/ui/appearance.qml
+++ b/sources/plasmoid-kf5/package/contents/ui/appearance.qml
@ -21,7 +21,7 @@ import QtQuick.Controls.Styles 1.3 as QtStyles
 import QtQuick.Dialogs 1.1 as QtDialogs
 import QtQuick.Layouts 1.0 as QtLayouts

-import org.kde.plasma.private.netctl 1.0
+import org.kde.plasma.netctl 1.0


 Item {
@ -52,7 +52,7 @@ Item {

    Column {
        id: pageColumn
-        width: units.gridUnit * 25
+        anchors.fill: parent
        Row {
            height: implicitHeight
            width: parent.width
--- a/sources/plasmoid-kf5/package/contents/ui/dataengine.qml
+++ b/sources/plasmoid-kf5/package/contents/ui/dataengine.qml
@ -21,7 +21,7 @@ import QtQuick.Dialogs 1.1 as QtDialogs
 import QtQuick.Layouts 1.0 as QtLayouts
 import QtQuick.Controls.Styles 1.3 as QtStyles

-import org.kde.plasma.private.netctl 1.0
+import org.kde.plasma.netctl 1.0


 Item {
@ -37,7 +37,7 @@ Item {

    Column {
        id: pageColumn
-        width: units.gridUnit * 25
+        anchors.fill: parent
        Row {
            height: implicitHeight
            width: parent.width
--- a/sources/plasmoid-kf5/package/contents/ui/main.qml
+++ b/sources/plasmoid-kf5/package/contents/ui/main.qml
@ -17,11 +17,12 @@

 import QtQuick 2.4
 import QtQuick.Controls 1.3 as QtControls
+import QtQuick.Layouts 1.1
 import org.kde.plasma.plasmoid 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents

-import org.kde.plasma.private.netctl 1.0
+import org.kde.plasma.netctl 1.0


 Item {
@ -75,8 +76,8 @@ Item {
    }

    // ui
-    Grid {
-        id: mainGrid
+    GridLayout {
+        anchors.fill: parent
        columns: 2

        Image {
@ -126,15 +127,6 @@ Item {
        text.text = NetctlAdds.parsePattern(plasmoid.configuration.textPattern)
        Plasmoid.toolTipSubText = NetctlAdds.valueByKey("info")
        needMenuUpdate()
-        // updae geometry
-        text.update()
-        icon.height = text.contentHeight
-        icon.width = text.contentHeight
-        icon.update()
-        height = text.contentHeight
-        width = icon.paintedWidth + text.contentWidth
-        update()
-
    }

    onNeedMenuUpdate: {
--- a/sources/plasmoid-kf5/package/contents/ui/widget.qml
+++ b/sources/plasmoid-kf5/package/contents/ui/widget.qml
@ -21,7 +21,7 @@ import QtQuick.Dialogs 1.1 as QtDialogs
 import QtQuick.Layouts 1.0 as QtLayouts
 import QtQuick.Controls.Styles 1.3 as QtStyles

-import org.kde.plasma.private.netctl 1.0
+import org.kde.plasma.netctl 1.0


 Item {
@ -48,7 +48,7 @@ Item {

    Column {
        id: pageColumn
-        width: units.gridUnit * 25
+        anchors.fill: parent
        Row {
            height: implicitHeight
            width: parent.width
--- a/sources/plasmoid-kf5/package/metadata.desktop
+++ b/sources/plasmoid-kf5/package/metadata.desktop
@ -14,7 +14,7 @@ X-Plasma-RemoteLocation=
 X-KDE-PluginInfo-Author=Evgeniy Alekseev
 X-KDE-PluginInfo-Email=esalexeev@gmail.com
 X-KDE-PluginInfo-Name=org.kde.plasma.netctl
-X-KDE-PluginInfo-Version=1.4.3
+X-KDE-PluginInfo-Version=1.4.4
 X-KDE-PluginInfo-Website=http://arcanis.name/projects/netctl-gui
 X-KDE-PluginInfo-Category=Network
 X-KDE-PluginInfo-Depends=
--- a/sources/plasmoid-kf5/plugin/CMakeLists.txt
+++ b/sources/plasmoid-kf5/plugin/CMakeLists.txt
@ -1,4 +1,5 @@
 set (PLUGIN_NAME netctlplugin)
+add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.netctl\")

 add_definitions (${Qt5Core_DEFINITIONS} ${Qt5DBus_DEFINITIONS} ${Qt5Qml_DEFINITIONS})
 set (Qt_INCLUDE ${Qt5Core_INCLUDE_DIRS}
@ -26,6 +27,6 @@ file (GLOB SUBPROJECT_NOTIFY *.notifyrc)
 add_library (${PLUGIN_NAME} SHARED ${SUBPROJECT_SOURCE})
 target_link_libraries (${PLUGIN_NAME} ${Qt_LIBRARIES} ${Kf5_LIBRARIES})

-install (TARGETS ${PLUGIN_NAME} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/netctl)
-install (FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/netctl)
+install (TARGETS ${PLUGIN_NAME} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/netctl)
+install (FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/netctl)
 install (FILES ${SUBPROJECT_NOTIFY} DESTINATION ${KNOTIFYRC_INSTALL_DIR})
--- a/sources/plasmoid-kf5/plugin/netctl.cpp
+++ b/sources/plasmoid-kf5/plugin/netctl.cpp
@ -32,7 +32,7 @@ static QObject *netctl_singletontype_provider(QQmlEngine *engine, QJSEngine *scr

 void NetctlPlugin::registerTypes(const char *uri)
 {
-    Q_ASSERT(uri == QLatin1String("org.kde.plasma.private.netctl"));
+    Q_ASSERT(uri == QLatin1String("org.kde.plasma.netctl"));

    qmlRegisterSingletonType<NetctlAdds>(uri, 1, 0, "NetctlAdds", netctl_singletontype_provider);
 }
--- a/sources/plasmoid-kf5/plugin/qmldir
+++ b/sources/plasmoid-kf5/plugin/qmldir
@ -1,3 +1,3 @@
-module org.kde.plasma.private.netctl
+module org.kde.plasma.netctl

 plugin netctlplugin