|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -6,7 +6,7 @@
<service name="tar_git">
<param name="url">https://github.com/kimmoli/tohkbd2.git</param>
<param name="branch">master</param>
- <param name="revision">5c8edeaccf679db8357aa6fe665383aca6a167bb</param>
+ <param name="revision">83eeb4c34a37f798d187eb316b87a18b155368cb</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.3.14.tar.bz2/daemon/src/tohkeyboard.cpp
^
|
| @@ -1027,9 +1027,9 @@
*/
void Tohkbd::setShortcut(const QString &key, const QString &appPath)
{
- printf("shortcut %s = %s\n", qPrintable(key), qPrintable(appPath));
+ printf("shortcut %s = \"%s\"\n", qPrintable(key), qPrintable(appPath));
- if (key.startsWith("F") && appPath.contains(".desktop"))
+ if (key.startsWith("F") && (appPath.contains(".desktop") || appPath.isEmpty()))
{
QSettings settings(QSettings::SystemScope, "harbour-tohkbd2", "tohkbd2");
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.3.14.tar.bz2/daemon/src/uinputevpoll.cpp
^
|
| @@ -46,6 +46,8 @@
if (epfd < 0)
{
printf("failed to create epoll instance\n");
+
+ emit finished();
return;
}
@@ -58,6 +60,8 @@
{
printf("Couldn't add to epoll\n");
close(epfd);
+
+ emit finished();
return;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.3.14.tar.bz2/daemon/src/uinputif.cpp
^
|
| @@ -39,7 +39,9 @@
KEY_POWER, KEY_PLAYCD, KEY_PAUSECD, KEY_VOLUMEDOWN, KEY_VOLUMEUP,
KEY_CAPSLOCK, KEY_SLASH, KEY_BACKSLASH, KEY_GRAVE, KEY_102ND,
KEY_LEFTBRACE, KEY_RIGHTBRACE,
- -1 };
+ KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6,
+ KEY_F7, KEY_F8, KEY_F9, KEY_F10, KEY_F11, KEY_F12,
+ -1 };
static const int switchesToRegister[] = { SW_LID, SW_KEYPAD_SLIDE,
-1 };
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.3.14.tar.bz2/settings-ui/i18n/engineering_en.ts
^
|
| @@ -241,5 +241,15 @@
<extracomment>Main menu selection for layout selection</extracomment>
<translation type="unfinished"></translation>
</message>
+ <message id="shortcut-not-configured">
+ <source>Not configured</source>
+ <extracomment>Label shown instead of application name if Fn is not configured</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="shortcut-nothing">
+ <source>Nothing, use as %1</source>
+ <extracomment>Pulldown menu option clear shortcut. Allows using Fn as Fn</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.3.14.tar.bz2/settings-ui/qml/pages/ApplicationSelectionPage.qml
^
|
| @@ -29,6 +29,21 @@
}
}
+ PullDownMenu
+ {
+ MenuItem
+ {
+ //: Pulldown menu option clear shortcut. Allows using Fn as Fn
+ //% "Nothing, use as %1"
+ text: qsTrId("shortcut-nothing").arg(keyId)
+ onClicked:
+ {
+ selected(keyId, "")
+ pageStack.pop()
+ }
+ }
+ }
+
model: applicationsModel
delegate: Rectangle
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.3.14.tar.bz2/settings-ui/qml/pages/Shortcuts.qml
^
|
| @@ -74,6 +74,8 @@
id: shortcutItem
highlighted: down || kbdif.upDownSelection === index
+ height: Theme.itemSizeLarge
+
Image
{
id: keyFrame
@@ -142,8 +144,6 @@
text: name
}
- height: Theme.itemSizeLarge
-
onClicked:
{
kbdif.upDownSelection = index
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.3.14.tar.bz2/settings-ui/settings-ui.pro
^
|
| @@ -12,7 +12,7 @@
DEFINES += "APPVERSION=\\\"$${SPECVERSION}\\\""
-#system(lupdate qml -no-obsolete -ts $$PWD/i18n/engineering_en.ts)
+#system(lupdate src qml -no-obsolete -ts $$PWD/i18n/engineering_en.ts)
system(lrelease -idbased $$PWD/i18n/*.ts)
translations.path = /usr/share/$${TARGET}/i18n
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-ambience-tohkbd2-0.3.14.tar.bz2/settings-ui/src/settingsui.cpp
^
|
| @@ -126,7 +126,7 @@
for (int i = KEY_1 ; i<=KEY_EQUAL ; i++)
{
- QString appPath = settings.value(QString("KEY_F%1").arg((i-KEY_1)+1), "none" ).toString();
+ QString appPath = settings.value(QString("KEY_F%1").arg((i-KEY_1)+1), "" ).toString();
map.clear();
map.insert("key", QString("F%1").arg((i-KEY_1)+1));
map.insert("filePath", appPath);
@@ -134,18 +134,26 @@
MDesktopEntry app(appPath);
if (app.isValid())
+ {
map.insert("name", app.name());
- else
- map.insert("name", "Not configured");
- if (app.icon().startsWith("icon-launcher-") || app.icon().startsWith("icon-l-") || app.icon().startsWith("icons-Applications"))
- map.insert("iconId", QString("image://theme/%1").arg(app.icon()));
- else if (app.icon().startsWith("/"))
- map.insert("iconId", QString("%1").arg(app.icon()));
- else
- map.insert("iconId", QString("/usr/share/icons/hicolor/86x86/apps/%1.png").arg(app.icon()));
+ if (app.icon().startsWith("icon-launcher-") || app.icon().startsWith("icon-l-") || app.icon().startsWith("icons-Applications"))
+ map.insert("iconId", QString("image://theme/%1").arg(app.icon()));
+ else if (app.icon().startsWith("/"))
+ map.insert("iconId", QString("%1").arg(app.icon()));
+ else
+ map.insert("iconId", QString("/usr/share/icons/hicolor/86x86/apps/%1.png").arg(app.icon()));
- map.insert("isAndroid", app.exec().contains("apkd-launcher"));
+ map.insert("isAndroid", app.exec().contains("apkd-launcher"));
+ }
+ else
+ {
+ //: Label shown instead of application name if Fn is not configured
+ //% "Not configured"
+ map.insert("name", qtTrId("shortcut-not-configured"));
+ map.insert("iconId", QString());
+ map.insert("isAndroid", false);
+ }
tmp.append(map);
}
@@ -161,6 +169,8 @@
tohkbd2daemon->setShortcut(key, appPath);
+ QThread::msleep(200);
+
emit shortcutsChanged();
}
@@ -170,6 +180,8 @@
tohkbd2daemon->setSettingInt(key, value);
+ QThread::msleep(200);
+
emit settingsChanged();
}
@@ -179,6 +191,8 @@
tohkbd2daemon->setSettingString(key, value);
+ QThread::msleep(200);
+
emit settingsChanged();
}
@@ -188,6 +202,8 @@
tohkbd2daemon->setShortcutsToDefault();
+ QThread::msleep(200);
+
emit shortcutsChanged();
}
@@ -209,6 +225,8 @@
setSettingInt("lockingAltEnabled", LOCKING_ALT_ENABLED ? 1 : 0);
setSettingInt("lockingSymEnabled", LOCKING_SYM_ENABLED ? 1 : 0);
+ QThread::msleep(200);
+
emit settingsChanged();
}
|
