Commit ea415539 authored by Yuri Chornoivan's avatar Yuri Chornoivan
Browse files

Fix minor EBN issues

parent 6298005f
......@@ -174,7 +174,7 @@ void AppMenuApplet::trigger(QQuickItem *ctx, int idx)
QMenu *actionMenu = createMenu(idx);
if (actionMenu) {
//this is a workaround where Qt will fail to realise a mouse has been released
//this is a workaround where Qt will fail to realize a mouse has been released
// this happens if a window which does not accept focus spawns a new window that takes focus and X grab
// whilst the mouse is depressed
// https://bugreports.qt.io/browse/QTBUG-59044
......@@ -218,7 +218,7 @@ void AppMenuApplet::trigger(QQuickItem *ctx, int idx)
QMenu *oldMenu = m_currentMenu;
m_currentMenu = actionMenu;
if (oldMenu && oldMenu != actionMenu) {
//dont initialize the currentIndex when another menu is already shown
//don't initialize the currentIndex when another menu is already shown
disconnect(oldMenu, &QMenu::aboutToHide, this, &AppMenuApplet::onMenuAboutToHide);
oldMenu->hide();
}
......
......@@ -19,6 +19,9 @@
*
******************************************************************/
#ifndef APPMENUMODEL_H
#define APPMENUMODEL_H
#include <QAbstractListModel>
#include <QAbstractNativeEventFilter>
#include <QStringList>
......@@ -84,3 +87,4 @@ private:
QPointer<KDBusMenuImporter> m_importer;
};
#endif
......@@ -51,4 +51,4 @@ Item {
}
}
}
}
\ No newline at end of file
}
......@@ -251,7 +251,7 @@ MouseArea {
} else if (deviceItem.state == 1) {
return i18nc("Accessing is a less technical word for Mounting; translation should be short and mean \'Currently mounting this device\'", "Accessing...")
} else {
return i18nc("Removing is a less technical word for Unmounting; translation shoud be short and mean \'Currently unmounting this device\'", "Removing...")
return i18nc("Removing is a less technical word for Unmounting; translation should be short and mean \'Currently unmounting this device\'", "Removing...")
}
}
}
......
add_subdirectory(plugin)
plasma_install_package(package org.kde.plasma.digitalclock)
\ No newline at end of file
plasma_install_package(package org.kde.plasma.digitalclock)
......@@ -17,4 +17,4 @@
import QtQuick 2.0
import org.kde.plasma.calendar 2.0 as PlasmaCalendar
PlasmaCalendar.MonthMenu { }
\ No newline at end of file
PlasmaCalendar.MonthMenu { }
......@@ -17,8 +17,8 @@
*/
#ifndef NOTIFICATIONSHELPERPLUGIN_H
#define NOTIFICATIONSHELPERPLUGIN_H
#ifndef DIGITALCLOCKPLUGIN_H
#define DIGITALCLOCKPLUGIN_H
#include <QQmlExtensionPlugin>
......@@ -31,4 +31,4 @@ public:
void registerTypes(const char *uri) override;
};
#endif // NOTIFICATIONSHELPERPLUGIN_H
#endif // DIGITALCLOCKPLUGIN_H
......@@ -151,7 +151,7 @@ ListView {
}
}
// first item determins the ListView height
// first item determines the ListView height
Binding {
target: previewList
property: "implicitHeight"
......
......@@ -164,7 +164,7 @@ void Thumbnailer::showContextMenu(int x, int y, const QString &path, QQuickItem
dialog->show();
});
//this is a workaround where Qt will fail to realise a mouse has been released
//this is a workaround where Qt will fail to realize a mouse has been released
// this happens if a window which does not accept focus spawns a new window that takes focus and X grab
// whilst the mouse is depressed
// https://bugreports.qt.io/browse/QTBUG-59044
......
......@@ -85,4 +85,4 @@ Applet {
}
}
}
}
\ No newline at end of file
}
......@@ -163,7 +163,7 @@ void SystemTray::showPlasmoidMenu(QQuickItem *appletInterface, int x, int y)
connect(this, &QObject::destroyed, desktopMenu, &QMenu::close);
desktopMenu->setAttribute(Qt::WA_DeleteOnClose);
//this is a workaround where Qt will fail to realise a mouse has been released
//this is a workaround where Qt will fail to realize a mouse has been released
// this happens if a window which does not accept focus spawns a new window that takes focus and X grab
// whilst the mouse is depressed
......@@ -413,7 +413,7 @@ void SystemTray::restorePlasmoids()
}
}
// insertMulti becase it is possible (though poor form) to have multiple applets
// insertMulti because it is possible (though poor form) to have multiple applets
// with the same visible name but different plugins
sortedApplets.insertMulti(info.name(), info);
}
......
......@@ -23,8 +23,8 @@
DEALINGS IN THE SOFTWARE.
*/
#ifndef KDBUSMENUIMPORTER_H
#define KDBUSMENUIMPORTER_H
#ifndef KDBUSIMPORTER_H
#define KDBUSIMPORTER_H
#include <dbusmenuimporter.h>
......@@ -51,4 +51,4 @@ protected:
}
};
#endif //KDBUSMENUIMPORTER_H
#endif //KDBUSIMPORTER_H
......@@ -20,8 +20,8 @@
THE SOFTWARE.
*/
#ifndef WIDGETEXPLORERPLUGIN_H
#define WIDGETEXPLORERPLUGIN_H
#ifndef SHELLPRIVATEPLUGIN_H
#define SHELLPRIVATEPLUGIN_H
#include <QQmlExtensionPlugin>
......
......@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef SWITCHWINDOW_HEADER
#define SWITCHWINDOW_HEADER
#ifndef LAUNCH_H
#define LAUNCH_H
#include <QMenu>
......
......@@ -224,7 +224,7 @@ void ContextMenu::lockScreen()
void ContextMenu::startLogout()
{
// this short delay is due to two issues:
// a) KWorkSpace's DBus alls are all syncronous
// a) KWorkSpace's DBus alls are all synchronous
// b) the destrution of the menu that this action is in is delayed
//
// (a) leads to the menu hanging out where everyone can see it because
......
......@@ -16,8 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef TASKJOB_H
#define TASKJOB_H
#ifndef APPJOB_H
#define APPJOB_H
// plasma
#include <Plasma/ServiceJob>
......@@ -42,4 +42,4 @@ class AppJob : public Plasma::ServiceJob
};
#endif // TASKJOB_H
#endif // APPJOB_H
......@@ -16,8 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef TASKSENGINE_H
#define TASKSENGINE_H
#ifndef APPSENGINE_H
#define APPSENGINE_H
// plasma
#include <Plasma/DataEngine>
......
......@@ -16,8 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef TASKSERVICE_H
#define TASKSERVICE_H
#ifndef APPSERVICE_H
#define APPSERVICE_H
// plasma
#include <Plasma/Service>
......@@ -45,4 +45,4 @@ class AppService : public Plasma::Service
AppSource *m_source;
};
#endif // TASKSERVICE_H
#endif // APPSERVICE_H
......@@ -16,8 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef TASKSOURCE_H
#define TASKSOURCE_H
#ifndef APPSOURCE_H
#define APPSOURCE_H
// plasma
#include <Plasma/DataContainer>
......@@ -56,4 +56,4 @@ class AppSource : public Plasma::DataContainer
};
#endif // TASKSOURCE_H
#endif // APPSOURCE_H
......@@ -38,7 +38,7 @@ QString NotificationSanitizer::parse(const QString &text)
// can happen for example when "\n \n" is sent, this replaces
// all <br/>s in succsession with just one
t.replace(QRegularExpression(QStringLiteral("<br/>\\s*<br/>(\\s|<br/>)*")), QLatin1String("<br/>"));
// This fancy RegExp escapes every occurence of & since QtQuick Text will blatantly cut off
// This fancy RegExp escapes every occurrence of & since QtQuick Text will blatantly cut off
// text where it finds a stray ampersand.
// Only &{apos, quot, gt, lt, amp}; as well as &#123 character references will be allowed
t.replace(QRegularExpression(QStringLiteral("&(?!(?:apos|quot|[gl]t|amp);|#)")), QLatin1String("&amp;"));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment