Merge branch 'homerun/1.2'

KDE · Mar 22, 2014 · 260f6ef · 260f6ef
2 parents 6a57c8c + f0d462e
commit 260f6ef
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/NEWS b/NEWS
@@ -1,3 +1,8 @@
+# 2014.03.22 - 1.2.2
+
+- Fixed a bug causing icon setting changes from the configuration dialog of
+  the Homerun Launcher applet to fail.
+
 # 2014.03.21 - 1.2.1
 
 - Fixed a bug causing duplicates to appear in the "All Applications" section

diff --git a/fullscreen/applet/homerunlauncher.cpp b/fullscreen/applet/homerunlauncher.cpp
@@ -138,6 +138,8 @@ void HomerunLauncher::createConfigurationInterface(KConfigDialog *parent)
 {
     QWidget *widget = new QWidget;
     m_generalUi.setupUi(widget);
+    connect(parent, SIGNAL(applyClicked()), this, SLOT(configAccepted()));
+    connect(parent, SIGNAL(okClicked()), this, SLOT(configAccepted()));
     parent->addPage(widget, i18n("General"), "homerun");
 
     m_generalUi.iconButton->setIcon(m_icon->icon());

diff --git a/kicker/package/metadata.desktop.cmake b/kicker/package/metadata.desktop.cmake
@@ -17,6 +17,7 @@ Name[pt_BR]=Homerun Kicker
 Name[sk]=Spúšťač Homerun
 Name[sl]=Majhen zaganjalnik Homerun
 Name[sv]=Homerun startprogram
+Name[tr]=Homerun Kicker
 Name[uk]=Меню Homerun
 Name[x-test]=xxHomerun Kickerxx
 Comment=Non-fullscreen version of Homerun
@@ -36,6 +37,7 @@ Comment[pt_BR]=Versão do Homerun em janela
 Comment[sk]=Neplnoobrazovková verzia Homerun
 Comment[sl]=Različica Homeruna, ki ni celozaslonska
 Comment[sv]=Version av Homerun utan fullskärmsläge
+Comment[tr]=Homerun'ın tam ekran olmayan sürümü
 Comment[uk]=Неповноекранна версія Homerun
 Comment[x-test]=xxNon-fullscreen version of Homerunxx