[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [plasma-desktop] kcms/keyboard: merge with master
From: Andriy Rysin <arysin () gmail ! com>
Date: 2014-10-22 3:32:21
Message-ID: E1Xgmer-0006lW-P2 () scm ! kde ! org
[Download RAW message or body]
Git commit b067904ccbcd564420ce7ba3e1318168b3ba1643 by Andriy Rysin.
Committed on 22/10/2014 at 03:28.
Pushed by rysin into branch 'master'.
merge with master
M +2 -2 kcms/keyboard/flags.cpp
M +3 -4 kcms/keyboard/kcm_add_layout_dialog.cpp
M +0 -2 kcms/keyboard/keyboard_daemon.h
M +4 -5 kcms/keyboard/layout_memory.cpp
M +6 -6 kcms/keyboard/layout_tray_icon.cpp
M +5 -5 kcms/keyboard/layout_widget.cpp
M +2 -3 kcms/keyboard/layouts_menu.cpp
M +0 -2 kcms/keyboard/preview/keyaliases.cpp
M +1 -2 kcms/keyboard/preview/keyboardpainter.cpp
M +0 -1 kcms/keyboard/preview/keysymbols.cpp
M +1 -2 kcms/keyboard/preview/keysymbols.h
M +0 -1 kcms/keyboard/tests/iso_codes_test.cpp
M +0 -1 kcms/keyboard/tests/xkb_rules_test.cpp
M +2 -3 kcms/keyboard/xkb_rules.cpp
http://commits.kde.org/plasma-desktop/b067904ccbcd564420ce7ba3e1318168b3ba1643
diff --cc kcms/keyboard/kcm_add_layout_dialog.cpp
index 07d1731,2ac98a7..64551d9
--- a/kcms/keyboard/kcm_add_layout_dialog.cpp
+++ b/kcms/keyboard/kcm_add_layout_dialog.cpp
@@@ -17,8 -17,6 +17,7 @@@
*/
#include "kcm_add_layout_dialog.h"
- #include <QApplication>
+#include <QDebug>
#include <klocalizedstring.h>
#include "xkb_rules.h"
@@@ -66,13 -63,9 +65,13 @@@ AddLayoutDialog::AddLayoutDialog(const
}
languageChanged(0);
- connect(layoutDialogUi->languageComboBox, SIGNAL(activated(int)), this, \
SLOT(languageChanged(int)));
- connect(layoutDialogUi->layoutComboBox, SIGNAL(activated(int)), this, \
SLOT(layoutChanged(int))); + connect(layoutDialogUi->languageComboBox, \
static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, \
&AddLayoutDialog::languageChanged); + connect(layoutDialogUi->layoutComboBox, \
static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, \
&AddLayoutDialog::layoutChanged); +#ifdef NEW_GEOMETRY
- connect(layoutDialogUi->prevbutton, SIGNAL(clicked()), this, SLOT(preview()));
+ connect(layoutDialogUi->prevbutton, &QPushButton::clicked, this, \
&AddLayoutDialog::preview); +#else
+ layoutDialogUi->prevbutton->setVisible(false);
+#endif
}
void AddLayoutDialog::languageChanged(int langIdx)
diff --cc kcms/keyboard/keyboard_daemon.h
index 760c86c,c349925..4d7587f
--- a/kcms/keyboard/keyboard_daemon.h
+++ b/kcms/keyboard/keyboard_daemon.h
@@@ -29,10 -29,6 +29,9 @@@
#include "bindings.h"
+Q_DECLARE_LOGGING_CATEGORY(KCM_KEYBOARD)
+
+
- class KActionCollection;
class XInputEventNotifier;
class LayoutTrayIcon;
class KeyboardConfig;
diff --cc kcms/keyboard/layout_memory.cpp
index cf894a6,7b10ef5..5ac6729
--- a/kcms/keyboard/layout_memory.cpp
+++ b/kcms/keyboard/layout_memory.cpp
@@@ -18,9 -18,9 +18,8 @@@
#include "layout_memory.h"
- #include <QSet>
#include <QX11Info>
-#include <kdebug.h>
#include <kwindowsystem.h>
#include "x11_helper.h"
diff --cc kcms/keyboard/layouts_menu.cpp
index fefa0e4,a46008c..630ed63
--- a/kcms/keyboard/layouts_menu.cpp
+++ b/kcms/keyboard/layouts_menu.cpp
@@@ -18,11 -18,12 +18,10 @@@
#include "layouts_menu.h"
-#include <kmenu.h>
#include <ktoolinvocation.h>
#include <klocalizedstring.h>
-#include <kdebug.h>
#include <QAction>
- #include <QMenu>
#include "keyboard_config.h"
#include "x11_helper.h"
diff --cc kcms/keyboard/preview/keyaliases.cpp
index 6ac988e,ee6b1db..4981d31
--- a/kcms/keyboard/preview/keyaliases.cpp
+++ b/kcms/keyboard/preview/keyaliases.cpp
@@@ -17,10 -17,7 +17,9 @@@
*/
#include "keyaliases.h"
+#include "xkb_rules.h"
+
#include <QString>
- #include <QMap>
#include <QMessageBox>
#include <QFile>
#include <QDir>
diff --cc kcms/keyboard/preview/keyboardpainter.cpp
index 99dcec0,2d471a1..1146d09
--- a/kcms/keyboard/preview/keyboardpainter.cpp
+++ b/kcms/keyboard/preview/keyboardpainter.cpp
@@@ -17,39 -17,25 +17,38 @@@
*/
#include "keyboardpainter.h"
+#include "geometry_components.h"
+#include "../flags.h"
- #include <QHBoxLayout>
#include <QVBoxLayout>
#include <QPushButton>
-
-#include <KLocalizedString>
+#include <QComboBox>
+#include <QDebug>
+#include <KLocale>
KeyboardPainter::KeyboardPainter():
+ kbDialog(new QDialog(this)),
kbframe(new KbPreviewFrame(this)),
- exitButton(new QPushButton(i18n("Close"),this))
+ exitButton(new QPushButton(i18n("Close"), this)),
+ levelBox(new QComboBox(this))
{
- kbframe->setFixedSize( 1030, 490 );
+ kbframe->setFixedSize(1100, 490);
exitButton->setFixedSize(120, 30);
+ levelBox->setFixedSize(360, 30);
+
+ QVBoxLayout *vLayout = new QVBoxLayout(this);
+ QHBoxLayout *hLayout = new QHBoxLayout();
+
+ hLayout->addWidget(exitButton, 0, Qt::AlignLeft);
+ hLayout->addWidget(levelBox, 0, Qt::AlignRight);
+ hLayout->addSpacing(30);
- QVBoxLayout* vLayout = new QVBoxLayout( this );
vLayout->addWidget(kbframe);
- vLayout->addWidget(exitButton);
+ vLayout->addLayout(hLayout);
- connect(exitButton, SIGNAL(clicked()), this, SLOT(close()));
+ connect(exitButton, &QPushButton::clicked, this, &KeyboardPainter::close);
+ connect(levelBox, SIGNAL(activated(int)), this, SLOT(levelChanged(int)));
setWindowTitle(kbframe->getLayoutName());
}
diff --cc kcms/keyboard/tests/iso_codes_test.cpp
index f767cf2,9d723cd..94aa0a5
--- a/kcms/keyboard/tests/iso_codes_test.cpp
+++ b/kcms/keyboard/tests/iso_codes_test.cpp
@@@ -16,8 -16,8 +16,7 @@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
- #include <QApplication>
-#include <kdebug.h>
-#include <qtest_kde.h>
+#include <QtTest/QtTest>
#include "../iso_codes.h"
diff --cc kcms/keyboard/tests/xkb_rules_test.cpp
index 9cb786a,dc0cf81..7f47b59
--- a/kcms/keyboard/tests/xkb_rules_test.cpp
+++ b/kcms/keyboard/tests/xkb_rules_test.cpp
@@@ -16,8 -16,8 +16,7 @@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
- #include <QApplication>
-#include <kdebug.h>
-#include <qtest_kde.h>
+#include <QtTest/QtTest>
#include "../xkb_rules.h"
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic