TDE
/
qt4-tqt-theme-engine
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/qt4-tqt-theme-engine
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KIcon to enhance compatibility with KDE4

Browse Source
r14.0.x
Timothy Pearson 11 years ago
parent ebdb595c7f
commit e3c309e27d
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File

22
plugin/simplestyle.cpp
Unescape View File

@ -171,7 +171,7 @@ Qt4TDEStyle::Qt4TDEStyle() : m_aboutData(NULL), m_tqApplication(NULL), m_tdeAppl
} }
// Set the Qt4 icon set to the TDE icon set // Set the Qt4 icon set to the TDE icon set
QIcon::setThemeName(convertTQt3ToQt4String(KIconTheme::current())); QIcon::setThemeName(convertTQt3ToQt4String(TDEIconTheme::current()));
// Set the Qt4 default font // Set the Qt4 default font
QApplication::setFont(convertTQt3ToQt4Font(TQApplication::font())); QApplication::setFont(convertTQt3ToQt4Font(TQApplication::font()));
@ -180,16 +180,16 @@ Qt4TDEStyle::Qt4TDEStyle() : m_aboutData(NULL), m_tqApplication(NULL), m_tdeAppl
// FIXME // FIXME
// m_tqt3DialogButtons_ShowIcons, m_tqt3IconSize_MenuItem, and m_tqt3IconSize_Large are still hardcoded // m_tqt3DialogButtons_ShowIcons, m_tqt3IconSize_MenuItem, and m_tqt3IconSize_Large are still hardcoded
// Verify all mappings // Verify all mappings
m_tqt3IconSize_NoGroup = IconSize(KIcon::NoGroup); m_tqt3IconSize_NoGroup = IconSize(TDEIcon::NoGroup);
m_tqt3IconSize_Desktop = IconSize(KIcon::Desktop); m_tqt3IconSize_Desktop = IconSize(TDEIcon::Desktop);
m_tqt3IconSize_FirstGroup = IconSize(KIcon::FirstGroup); m_tqt3IconSize_FirstGroup = IconSize(TDEIcon::FirstGroup);
m_tqt3IconSize_Toolbar = IconSize(KIcon::Toolbar); m_tqt3IconSize_Toolbar = IconSize(TDEIcon::Toolbar);
m_tqt3IconSize_MainToolbar = IconSize(KIcon::MainToolbar); m_tqt3IconSize_MainToolbar = IconSize(TDEIcon::MainToolbar);
m_tqt3IconSize_Small = IconSize(KIcon::Small); m_tqt3IconSize_Small = IconSize(TDEIcon::Small);
m_tqt3IconSize_Large = 32; m_tqt3IconSize_Large = 32;
m_tqt3IconSize_Panel = IconSize(KIcon::Panel); m_tqt3IconSize_Panel = IconSize(TDEIcon::Panel);
m_tqt3IconSize_LastGroup = IconSize(KIcon::LastGroup); m_tqt3IconSize_LastGroup = IconSize(TDEIcon::LastGroup);
m_tqt3IconSize_User = IconSize(KIcon::User); m_tqt3IconSize_User = IconSize(TDEIcon::User);
m_tqt3IconSize_MenuItem = 16; m_tqt3IconSize_MenuItem = 16;
m_tqt3IconSize_Tabbar = m_tqt3IconSize_MenuItem; m_tqt3IconSize_Tabbar = m_tqt3IconSize_MenuItem;
m_tqt3IconSize_Listview = m_tqt3IconSize_MenuItem; m_tqt3IconSize_Listview = m_tqt3IconSize_MenuItem;
@ -634,7 +634,7 @@ QIcon Qt4TDEStyle::standardIconImplementation(StandardPixmap standardIcon, const
} }
else if (retswitch == 3) { else if (retswitch == 3) {
// convert string to icon // convert string to icon
reticon = QIcon(convertTQt3ToQt4String(TDEGlobal::iconLoader()->iconPath(iconLookupName, KIcon::Desktop, true))); reticon = QIcon(convertTQt3ToQt4String(TDEGlobal::iconLoader()->iconPath(iconLookupName, TDEIcon::Desktop, true)));
} }
else { else {
// Tell Qt4 to get the information // Tell Qt4 to get the information

Write Preview
Loading…
Cancel
Save