1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189 | diff --git a/system_tray_menu.cpp b/system_tray_menu.cpp
index 7be2cea..5b21f51 100644
--- a/system_tray_menu.cpp
+++ b/system_tray_menu.cpp
@@ -46,22 +46,18 @@ SystemTrayMenu::~SystemTrayMenu()
{
if(configtoolPro)
free(configtoolPro);
- #ifdef IS_QT_4
- delete mVKListMenu;
- delete mSkinMenu;
- delete mMozcHiraganaMenu;
- delete mMozcToolMenu;
- #endif
+ delete mVKListMenu;
+ delete mSkinMenu;
+ delete mMozcHiraganaMenu;
+ delete mMozcToolMenu;
}
void SystemTrayMenu::init()
{
- #ifdef IS_QT_4
- mVKListMenu = new QMenu(gettext("Virtual Keyboard"), this);
- mSkinMenu = new QMenu(gettext("Skin"), this);
- mMozcHiraganaMenu = new QMenu(gettext("Mozc Edit mode"), this);
- mMozcToolMenu = new QMenu(gettext("Mozc Tool"), this);
- #endif
+ mVKListMenu = new QMenu(gettext("Virtual Keyboard"), this);
+ mSkinMenu = new QMenu(gettext("Skin"), this);
+ mMozcHiraganaMenu = new QMenu(gettext("Mozc Edit mode"), this);
+ mMozcToolMenu = new QMenu(gettext("Mozc Tool"), this);
QObject::connect(this, SIGNAL(aboutToHide()), this,
SLOT(clearMenu()));
@@ -186,23 +182,13 @@ void SystemTrayMenu::doUpdateVKListMenu(const QList<KimpanelProperty> &prop_list
{
MyAction *menu;
QList<KimpanelProperty>::const_iterator iter;
- #ifdef IS_QT_5
- for (iter = prop_list.begin(); iter != prop_list.end(); ++ iter) {
- menu = new MyAction(QIcon::fromTheme(iter->icon), iter->label, this);
- menu->setMyActionType(VKAction);
- menu->setProp(*iter);
- this->addAction(menu);
- }
- #endif
- #ifdef IS_QT_4
mVKListMenu->clear();
for (iter = prop_list.begin(); iter != prop_list.end(); ++ iter) {
menu = new MyAction(QIcon::fromTheme(iter->icon), iter->label, this);
menu->setProp(*iter);
mVKListMenu->addAction(menu);
}
- this->addMenu(mVKListMenu);
- #endif
+ this->addMenu(mVKListMenu);
}
QString SystemTrayMenu::doUpdateIMListMenu(const QList<KimpanelProperty> &prop_list)
@@ -251,46 +237,25 @@ void SystemTrayMenu::doUpdateMozcToolListMenu(const QList<KimpanelProperty> &pro
{
MyAction *menu;
QList<KimpanelProperty>::const_iterator iter;
- #ifdef IS_QT_5
- for (iter = prop_list.begin(); iter != prop_list.end(); ++ iter) {
- menu = new MyAction(QIcon(iter->icon), iter->label, this);
- menu->setMyActionType(MozcToolAction);
- menu->setProp(*iter);
- this->addAction(menu);
- }
- #endif
- #ifdef IS_QT_4
mMozcHiraganaMenu->clear();
for (iter = prop_list.begin(); iter != prop_list.end(); ++ iter) {
menu = new MyAction(QIcon(iter->icon), iter->label, this);
menu->setProp(*iter);
mMozcHiraganaMenu->addAction(menu);
}
- this->addMenu(mMozcHiraganaMenu);
- #endif
+ this->addMenu(mMozcHiraganaMenu);
}
void SystemTrayMenu::doUpdateMozcHiraganaListMenu(const QList<KimpanelProperty> &prop_list)
{
MyAction *menu;
QList<KimpanelProperty>::const_iterator iter;
- #ifdef IS_QT_5
- for (iter = prop_list.begin(); iter != prop_list.end(); ++ iter) {
- menu = new MyAction(QIcon(iter->icon), iter->label, this);
- menu->setMyActionType(MozcHiraganaAction);
- menu->setProp(*iter);
- this->addAction(menu);
- }
- this->addSeparator();
- #endif
- #ifdef IS_QT_4
mMozcToolMenu->clear();
for (iter = prop_list.begin(); iter != prop_list.end(); ++ iter) {
menu =new MyAction(QIcon(iter->icon), iter->label, this);
menu->setProp(*iter);
mMozcToolMenu->addAction(menu);
}
- this->addMenu(mMozcToolMenu);
- #endif
+ this->addMenu(mMozcToolMenu);
}
bool SystemTrayMenu::isIMList(const QString &key)
@@ -471,9 +436,7 @@ void SystemTrayMenu::doUpdateSkinListMenu()
SkinClass skinClass;
bool localExist;
MyAction *skinNameMenu = NULL;
- #ifdef IS_QT_4
- mSkinMenu->clear();
- #endif
+ mSkinMenu->clear();
QString localSkinPath = qgetenv("HOME") + "/.config/fcitx-qimpanel/skin/";
for (i = 0; i < 1; i ++) {
@@ -496,12 +459,7 @@ void SystemTrayMenu::doUpdateSkinListMenu()
menu->setMyActionType(SkinAction);
menu->setSkinPath(iter->absoluteFilePath() + "/");
menu->setSkinClass(skinClass);
- #ifdef IS_QT_5
- this->addAction(menu);
- #endif
- #ifdef IS_QT_4
- mSkinMenu->addAction(menu);
- #endif
+ mSkinMenu->addAction(menu);
if (firstMenu == NULL)
firstMenu = menu;
menu->setCheckable(true);
@@ -552,12 +510,7 @@ void SystemTrayMenu::doUpdateSkinListMenu()
//qDebug() << iter->absoluteFilePath();
menu->setSkinPath(iter->absoluteFilePath() + "/");
menu->setSkinClass(skinClass);
- #ifdef IS_QT_5
- this->addAction(menu);
- #endif
- #ifdef IS_QT_4
- mSkinMenu->addAction(menu);
- #endif
+ mSkinMenu->addAction(menu);
if (firstMenu == NULL)
firstMenu = menu;
menu->setCheckable(true);
@@ -591,12 +544,7 @@ void SystemTrayMenu::doUpdateSkinListMenu()
menu->setMyActionType(SkinAction);
menu->setSkinPath(iter->absoluteFilePath() + "/");
menu->setSkinClass(skinClass);
- #ifdef IS_QT_5
- this->addAction(menu);
- #endif
- #ifdef IS_QT_4
- mSkinMenu->addAction(menu);
- #endif
+ mSkinMenu->addAction(menu);
if (firstMenu == NULL)
firstMenu = menu;
menu->setCheckable(true);
@@ -618,9 +566,7 @@ void SystemTrayMenu::doUpdateSkinListMenu()
FcitxXDGFreePath(skinPath);
skinMenuItemOnClick(skinNameMenu);
- #ifdef IS_QT_4
this->addMenu(mSkinMenu);
- #endif
}
void SystemTrayMenu::skinMenuItemOnClick(QAction* action)
diff --git a/system_tray_menu.h b/system_tray_menu.h
index 367d910..a5aa9fb 100644
--- a/system_tray_menu.h
+++ b/system_tray_menu.h
@@ -82,12 +82,10 @@ private:
QList<KimpanelProperty> mMozcHiraganaList;
QList<KimpanelProperty> mStatusMenuList;
QProcess *configtoolPro ;
-#ifdef IS_QT_4
QMenu *mSkinMenu;
QMenu *mVKListMenu;
QMenu *mMozcToolMenu;
QMenu *mMozcHiraganaMenu;
-#endif
private:
void skinMenuItemOnClick(QAction* action);
void doUpdateSkinListMenu();
|