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 <[email protected]>

1 files changed, 6 insertions, 2 deletions

diff --git a/kxkb/kxkbtraywindow.h b/kxkb/kxkbtraywindow.h
index 484bae632..3e1ae2c05 100644
--- a/kxkb/kxkbtraywindow.h
+++ b/kxkb/kxkbtraywindow.h
@@ -17,16 +17,19 @@
 #include <tqstring.h>
 #include <tqvaluelist.h>
 
-#include "kxkbconfig.h"
+#include "layoutunit.h"
 
 class XkbRules;
+class KxkbConfig;
+class LayoutIconManager;
 
 class KxkbSystemTray : public KSystemTray
 {
     TQ_OBJECT
 
     public:
-        KxkbSystemTray();
+        KxkbSystemTray(KxkbConfig *kxkbConfig);
+        ~KxkbSystemTray();
         void initLayoutList(const TQValueList<LayoutUnit>& layouts, const XkbRules& rule);
         void setCurrentLayout(const LayoutUnit& layout);
         void setError(const TQString& layoutInfo = TQString::null);
@@ -45,6 +48,7 @@ class KxkbSystemTray : public KSystemTray
         void toggled();
 
     private:
+        LayoutIconManager *m_icoMgr;
         int m_prevLayoutCount;
         TQMap<TQString, TQString> m_descriptionMap;
 };