[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kde-workspace/amourphiouskb] kcontrol/keyboard: Move keyboard layout preview source files into subd
From: Andriy Rysin <arysin () gmail ! com>
Date: 2012-10-21 14:48:57
Message-ID: 20121021144857.43983A6078 () git ! kde ! org
[Download RAW message or body]
Git commit 407671c95472e21855e19d7b9f16d983eb42f237 by Andriy Rysin.
Committed on 21/10/2012 at 16:48.
Pushed by rysin into branch 'amourphiouskb'.
Move keyboard layout preview source files into subdirectory
M +8 -7 kcontrol/keyboard/CMakeLists.txt
M +1 -1 kcontrol/keyboard/kcm_add_layout_dialog.cpp
M +1 -1 kcontrol/keyboard/kcm_add_layout_dialog.h
M +5 -5 kcontrol/keyboard/kcm_keyboard_widget.cpp
M +2 -2 kcontrol/keyboard/kcm_keyboard_widget.h
R +0 -0 kcontrol/keyboard/preview/KeyboardPainter.ui [from: kcontrol/keyboard/KeyboardPainter.ui - \
100% similarity] R +0 -0 kcontrol/keyboard/preview/kbpreviewframe.cpp [from: \
kcontrol/keyboard/kbpreviewframe.cpp - 100% similarity] R +0 -0 \
kcontrol/keyboard/preview/kbpreviewframe.h [from: kcontrol/keyboard/kbpreviewframe.h - 100% similarity] R \
+0 -0 kcontrol/keyboard/preview/keyaliases.cpp [from: kcontrol/keyboard/keyaliases.cpp - 100% \
similarity] R +0 -0 kcontrol/keyboard/preview/keyaliases.h [from: kcontrol/keyboard/keyaliases.h - \
100% similarity] R +0 -0 kcontrol/keyboard/preview/keyboardlayout.cpp [from: \
kcontrol/keyboard/keyboardlayout.cpp - 100% similarity] R +0 -0 \
kcontrol/keyboard/preview/keyboardlayout.h [from: kcontrol/keyboard/keyboardlayout.h - 100% similarity] R \
+3 -2 kcontrol/keyboard/preview/keyboardpainter.cpp [from: kcontrol/keyboard/keyboardpainter.cpp - \
096% similarity] R +1 -1 kcontrol/keyboard/preview/keyboardpainter.h [from: \
kcontrol/keyboard/keyboardpainter.h - 097% similarity] R +0 -0 kcontrol/keyboard/preview/keys.cpp \
[from: kcontrol/keyboard/keys.cpp - 100% similarity] R +0 -0 kcontrol/keyboard/preview/keys.h \
[from: kcontrol/keyboard/keys.h - 100% similarity] R +0 -0 kcontrol/keyboard/preview/keysym.cpp \
[from: kcontrol/keyboard/keysym.cpp - 100% similarity] R +0 -0 kcontrol/keyboard/preview/keysym.h \
[from: kcontrol/keyboard/keysym.h - 100% similarity]
http://commits.kde.org/kde-workspace/407671c95472e21855e19d7b9f16d983eb42f237
diff --git a/kcontrol/keyboard/CMakeLists.txt b/kcontrol/keyboard/CMakeLists.txt
index 653ff6a..04f61b5 100644
--- a/kcontrol/keyboard/CMakeLists.txt
+++ b/kcontrol/keyboard/CMakeLists.txt
@@ -98,6 +98,7 @@ install( TARGETS keyboard_layout_widget DESTINATION ${PLUGIN_INSTALL_DIR} )
### kcm keyboard ###
+include_directories("preview")
set(kcm_keyboard_PART_SRCS
kcm_keyboard.cpp
@@ -112,16 +113,16 @@ set(kcm_keyboard_PART_SRCS
iso_codes.cpp
kcmmisc.cpp
bindings.cpp
- keyaliases.cpp
- keyboardlayout.cpp
- keyboardpainter.cpp
- keys.cpp
- keysym.cpp
- kbpreviewframe.cpp
+ preview/keyaliases.cpp
+ preview/keyboardlayout.cpp
+ preview/keyboardpainter.cpp
+ preview/keys.cpp
+ preview/keysym.cpp
+ preview/kbpreviewframe.cpp
)
-kde4_add_ui_files(kcm_keyboard_PART_SRCS kcm_keyboard.ui kcm_add_layout_dialog.ui kcmmiscwidget.ui \
KeyboardPainter.ui) +kde4_add_ui_files(kcm_keyboard_PART_SRCS kcm_keyboard.ui kcm_add_layout_dialog.ui \
kcmmiscwidget.ui preview/KeyboardPainter.ui)
kde4_add_plugin(kcm_keyboard ${kcm_keyboard_PART_SRCS})
diff --git a/kcontrol/keyboard/kcm_add_layout_dialog.cpp b/kcontrol/keyboard/kcm_add_layout_dialog.cpp
index 0e30d07..3042f64 100644
--- a/kcontrol/keyboard/kcm_add_layout_dialog.cpp
+++ b/kcontrol/keyboard/kcm_add_layout_dialog.cpp
@@ -17,7 +17,7 @@
*/
#include "kcm_add_layout_dialog.h"
-#include<QApplication>
+#include <QApplication>
#include <klocalizedstring.h>
#include "xkb_rules.h"
diff --git a/kcontrol/keyboard/kcm_add_layout_dialog.h b/kcontrol/keyboard/kcm_add_layout_dialog.h
index 0c9f6d3..fb3ce63 100644
--- a/kcontrol/keyboard/kcm_add_layout_dialog.h
+++ b/kcontrol/keyboard/kcm_add_layout_dialog.h
@@ -23,7 +23,7 @@
#include <QtGui/QDialog>
#include "keyboard_config.h"
-#include "keyboardpainter.h"
+#include "preview/keyboardpainter.h"
class Rules;
class Flags;
diff --git a/kcontrol/keyboard/kcm_keyboard_widget.cpp b/kcontrol/keyboard/kcm_keyboard_widget.cpp
index 9d59a8b..e513a41 100644
--- a/kcontrol/keyboard/kcm_keyboard_widget.cpp
+++ b/kcontrol/keyboard/kcm_keyboard_widget.cpp
@@ -33,7 +33,7 @@
#include <QtGui/QX11Info>
#include "keyboard_config.h"
-#include "keyboardpainter.h"
+#include "preview/keyboardpainter.h"
#include "xkb_rules.h"
#include "flags.h"
#include "x11_helper.h"
@@ -375,7 +375,7 @@ void KCMKeyboardWidget::previewLayout(){
q.exec();
}
else{
- layoutprev=new KeyboardPainter();
+ KeyboardPainter* layoutPreview = new KeyboardPainter();
const LayoutInfo* layoutInfo = rules->getLayoutInfo(country);
foreach(const VariantInfo* variantInfo, layoutInfo->variantInfos) {
if(variant==variantInfo->description){
@@ -383,9 +383,9 @@ void KCMKeyboardWidget::previewLayout(){
break;
}
}
- layoutprev->generateKeyboardLayout(country,variant);
- layoutprev->exec();
- layoutprev->setModal(true);
+ layoutPreview->generateKeyboardLayout(country,variant);
+ layoutPreview->exec();
+ layoutPreview->setModal(true);
}
}
diff --git a/kcontrol/keyboard/kcm_keyboard_widget.h b/kcontrol/keyboard/kcm_keyboard_widget.h
index b74b3a1..efb1330 100644
--- a/kcontrol/keyboard/kcm_keyboard_widget.h
+++ b/kcontrol/keyboard/kcm_keyboard_widget.h
@@ -21,7 +21,7 @@
#define KCM_KEYBOARD_WIDGET_H_
#include "ui_kcm_keyboard.h"
-#include "keyboardpainter.h"
+//#include "keyboardpainter.h"
#include <kcomponentdata.h>
#include <QtGui/QTabWidget>
@@ -81,7 +81,7 @@ private:
LayoutsTableModel* layoutsTableModel;
KCMiscKeyboardWidget* kcmMiscWidget;
bool uiUpdating;
- KeyboardPainter *layoutprev;
+// KeyboardPainter *layoutprev;
void initializeLayoutsUI();
void initializeXkbOptionsUI();
diff --git a/kcontrol/keyboard/KeyboardPainter.ui b/kcontrol/keyboard/preview/KeyboardPainter.ui
similarity index 100%
rename from kcontrol/keyboard/KeyboardPainter.ui
rename to kcontrol/keyboard/preview/KeyboardPainter.ui
diff --git a/kcontrol/keyboard/kbpreviewframe.cpp b/kcontrol/keyboard/preview/kbpreviewframe.cpp
similarity index 100%
rename from kcontrol/keyboard/kbpreviewframe.cpp
rename to kcontrol/keyboard/preview/kbpreviewframe.cpp
diff --git a/kcontrol/keyboard/kbpreviewframe.h b/kcontrol/keyboard/preview/kbpreviewframe.h
similarity index 100%
rename from kcontrol/keyboard/kbpreviewframe.h
rename to kcontrol/keyboard/preview/kbpreviewframe.h
diff --git a/kcontrol/keyboard/keyaliases.cpp b/kcontrol/keyboard/preview/keyaliases.cpp
similarity index 100%
rename from kcontrol/keyboard/keyaliases.cpp
rename to kcontrol/keyboard/preview/keyaliases.cpp
diff --git a/kcontrol/keyboard/keyaliases.h b/kcontrol/keyboard/preview/keyaliases.h
similarity index 100%
rename from kcontrol/keyboard/keyaliases.h
rename to kcontrol/keyboard/preview/keyaliases.h
diff --git a/kcontrol/keyboard/keyboardlayout.cpp b/kcontrol/keyboard/preview/keyboardlayout.cpp
similarity index 100%
rename from kcontrol/keyboard/keyboardlayout.cpp
rename to kcontrol/keyboard/preview/keyboardlayout.cpp
diff --git a/kcontrol/keyboard/keyboardlayout.h b/kcontrol/keyboard/preview/keyboardlayout.h
similarity index 100%
rename from kcontrol/keyboard/keyboardlayout.h
rename to kcontrol/keyboard/preview/keyboardlayout.h
diff --git a/kcontrol/keyboard/keyboardpainter.cpp b/kcontrol/keyboard/preview/keyboardpainter.cpp
similarity index 96%
rename from kcontrol/keyboard/keyboardpainter.cpp
rename to kcontrol/keyboard/preview/keyboardpainter.cpp
index 7355619..cc1489c 100644
--- a/kcontrol/keyboard/keyboardpainter.cpp
+++ b/kcontrol/keyboard/preview/keyboardpainter.cpp
@@ -18,8 +18,9 @@
#include "keyboardpainter.h"
#include "ui_keyboardpainter.h"
-#include<QtGui/QHBoxLayout>
-#include<QtGui/QVBoxLayout>
+
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QVBoxLayout>
KeyboardPainter::KeyboardPainter() :
ui(new Ui::keyboardpainter),
diff --git a/kcontrol/keyboard/keyboardpainter.h b/kcontrol/keyboard/preview/keyboardpainter.h
similarity index 97%
rename from kcontrol/keyboard/keyboardpainter.h
rename to kcontrol/keyboard/preview/keyboardpainter.h
index d9a5bb2..64df088 100644
--- a/kcontrol/keyboard/keyboardpainter.h
+++ b/kcontrol/keyboard/preview/keyboardpainter.h
@@ -21,7 +21,7 @@
#define KEYBOARDPAINTER_H
#include <QtGui/QDialog>
-#include<QtGui/QPushButton>
+#include <QtGui/QPushButton>
#include"kbpreviewframe.h"
diff --git a/kcontrol/keyboard/keys.cpp b/kcontrol/keyboard/preview/keys.cpp
similarity index 100%
rename from kcontrol/keyboard/keys.cpp
rename to kcontrol/keyboard/preview/keys.cpp
diff --git a/kcontrol/keyboard/keys.h b/kcontrol/keyboard/preview/keys.h
similarity index 100%
rename from kcontrol/keyboard/keys.h
rename to kcontrol/keyboard/preview/keys.h
diff --git a/kcontrol/keyboard/keysym.cpp b/kcontrol/keyboard/preview/keysym.cpp
similarity index 100%
rename from kcontrol/keyboard/keysym.cpp
rename to kcontrol/keyboard/preview/keysym.cpp
diff --git a/kcontrol/keyboard/keysym.h b/kcontrol/keyboard/preview/keysym.h
similarity index 100%
rename from kcontrol/keyboard/keysym.h
rename to kcontrol/keyboard/preview/keysym.h
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic