diff options
| author | Timothy Pearson <[email protected]> | 2013-10-28 14:06:47 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-10-28 14:06:47 -0500 |
| commit | 740cdbc24975f0469962aea07732dddf6aee5b78 (patch) | |
| tree | 52da2c654a5b0cc041f162d6d4f81e3ff886902b /kcontrol/taskbar/kcmtaskbar.h | |
| parent | a039120e05fd8c03569e1135a30bbbb797e887b2 (diff) | |
| parent | d1324133ee949acedcbf1776c8a80d3e28218c23 (diff) | |
| download | tdebase-740cdbc24975f0469962aea07732dddf6aee5b78.tar.gz tdebase-740cdbc24975f0469962aea07732dddf6aee5b78.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kcontrol/taskbar/kcmtaskbar.h')
| -rw-r--r-- | kcontrol/taskbar/kcmtaskbar.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/kcontrol/taskbar/kcmtaskbar.h b/kcontrol/taskbar/kcmtaskbar.h index b0fe0c7ea..f14500a68 100644 --- a/kcontrol/taskbar/kcmtaskbar.h +++ b/kcontrol/taskbar/kcmtaskbar.h @@ -14,6 +14,12 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software + + -------------------------------------------------------------- + Additional changes: + - 2013/10/22 Michele Calgaro + * added support for display mode (Icons and Text, Text only, Icons only) + and removed "Show application icons" */ #ifndef __kcmtaskbar_h__ @@ -84,6 +90,8 @@ private: static TQStringList i18nGroupModeList(); static const TQStringList& showTaskStatesList(); static TQStringList i18nShowTaskStatesList(); + static const TQStringList& displayIconsNText(); + static TQStringList i18ndisplayIconsNText(); TaskbarConfigUI *m_widget; TQString m_configFileName; TaskBarSettings* m_settingsObject; |