diff options
| author | Mavridis Philippe <mavridisf@gmail.com> | 2024-11-12 23:23:00 +0200 |
|---|---|---|
| committer | Mavridis Philippe <mavridisf@gmail.com> | 2024-11-12 23:23:00 +0200 |
| commit | 753873e6d73ffcf00199d31e084e6a96b9eb84e0 (patch) | |
| tree | f9a04c6245200db777e2942ed9dc1fecd44d9a9e /kxkb/kcmlayout.cpp | |
| parent | 71068b3b258a340be30a91c3a5af92718da70cdd (diff) | |
| download | tdebase-753873e6d73ffcf00199d31e084e6a96b9eb84e0.tar.gz tdebase-753873e6d73ffcf00199d31e084e6a96b9eb84e0.zip | |
Kxkb: Improvements for tray window pixmap manager, optimize settings reloadings
* Rename LayoutIcon to LayoutIconManager for clarity
* Remove use of singleton pattern for LayoutIconManager
* Do not reload all Kxkb settings every time we are requested to get a pixmap!
* Use pointer to global KxkbConfig instance instead of keeping own copy
* Make "Transparent background" checkbox available for theme colors in the GUI
* Minor code cleanup in LayoutIconManager
* KxkbConfig: do not reload settings every time getKxkbOptions() is called; if settings actually need to be re-read, it must be done maunally before calling this function
Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>
Diffstat (limited to 'kxkb/kcmlayout.cpp')
| -rw-r--r-- | kxkb/kcmlayout.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kxkb/kcmlayout.cpp b/kxkb/kcmlayout.cpp index fac058a6f..236acb3d9 100644 --- a/kxkb/kcmlayout.cpp +++ b/kxkb/kcmlayout.cpp @@ -107,6 +107,9 @@ LayoutConfig::LayoutConfig(TQWidget *parent, const char *name) m_forceGrpOverwrite(false) { X11Helper::initializeTranslations(); + + m_icoMgr = new LayoutIconManager(&m_kxkbConfig); + TQVBoxLayout *main = new TQVBoxLayout(this, 0, KDialog::spacingHint()); widget = new LayoutConfigWidget(this, "widget"); @@ -189,7 +192,8 @@ LayoutConfig::LayoutConfig(TQWidget *parent, const char *name) LayoutConfig::~LayoutConfig() { - delete m_rules; + delete m_rules; + delete m_icoMgr; } @@ -1141,7 +1145,7 @@ void LayoutConfig::loadRules() TQString layoutName = it2.current(); TQListViewItem *item = new TQListViewItem(widget->listLayoutsSrc); - item->setPixmap(LAYOUT_COLUMN_FLAG, LayoutIcon::getInstance().findPixmap(layout, false)); + item->setPixmap(LAYOUT_COLUMN_FLAG, m_icoMgr->find(layout, PIXMAP_STYLE_CONTEXTMENU)); item->setText(LAYOUT_COLUMN_NAME, i18n(layoutName.latin1())); item->setText(LAYOUT_COLUMN_MAP, layout); ++it2; |