diff options
Diffstat (limited to 'kxkb/kcmlayout.h')
-rw-r--r-- | kxkb/kcmlayout.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/kxkb/kcmlayout.h b/kxkb/kcmlayout.h index 987fff2b0..db0f89690 100644 --- a/kxkb/kcmlayout.h +++ b/kxkb/kcmlayout.h @@ -16,7 +16,7 @@ class XkbRules; class LayoutConfig : public TDECModule { - Q_OBJECT + TQ_OBJECT public: LayoutConfig(TQWidget *parent = 0L, const char *name = 0L); @@ -27,23 +27,27 @@ public: void defaults(); void initUI(); virtual TQString handbookDocPath() const; - + protected: TQString createOptionString(); void updateIndicator(TQListViewItem* selLayout); + OptionListItem* itemForOption(TQString option); protected slots: void moveUp(); void moveDown(); + void hotkeyComboChanged(); void variantChanged(); void displayNameChanged(const TQString& name); - void latinChanged(); void layoutSelChanged(TQListViewItem *); void loadRules(); void updateLayoutCommand(); void updateOptionsCommand(); + void updateHotkeyCombo(); + void updateHotkeyCombo(bool initial); void add(); void remove(); + void resolveConflicts(TQListViewItem *lvi); void changed(); @@ -53,10 +57,16 @@ private: XkbRules *m_rules; KxkbConfig m_kxkbConfig; TQDict<OptionListItem> m_optionGroups; + bool m_forceGrpOverwrite; + KKeyChooser *m_keyChooser; + TDEGlobalAccel *keys; TQWidget* makeOptionsTab(); + TQWidget* makeShortcutsTab(); void updateStickyLimit(); static LayoutUnit getLayoutUnitKey(TQListViewItem *sel); + void checkConflicts(OptionListItem *current, TQStringList conflicting, + TQStringList &conflicts); }; |