diff options
| author | Timothy Pearson <[email protected]> | 2013-02-04 14:01:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-04 14:01:17 -0600 |
| commit | fa0cf93ec2bf31ebec29c5ddf07ce1771084ca7e (patch) | |
| tree | 82a6377924abfbbd5514a7c31eca3061a0f15fb8 | |
| parent | bc80a5e4638301ce3153d792c7e3c49a4270c4eb (diff) | |
| download | gtk3-tqt-engine-fa0cf93ec2bf31ebec29c5ddf07ce1771084ca7e.tar.gz gtk3-tqt-engine-fa0cf93ec2bf31ebec29c5ddf07ce1771084ca7e.zip | |
Rename KIcon to enhance compatibility with KDE4
| -rw-r--r-- | tdegtk/tdegtk-draw.cpp | 8 | ||||
| -rw-r--r-- | tdegtk/tdegtk-theme.cpp | 26 |
2 files changed, 17 insertions, 17 deletions
diff --git a/tdegtk/tdegtk-draw.cpp b/tdegtk/tdegtk-draw.cpp index 60f90ed..74cc4af 100644 --- a/tdegtk/tdegtk-draw.cpp +++ b/tdegtk/tdegtk-draw.cpp @@ -1532,7 +1532,7 @@ tdegtk_draw_common_background (DRAW_ARGS) TQMenuItem tqt3MenuItem; int maxAcceleratorTextWidth = 0; - int maxIconWidth = IconSize(KIcon::Small) + 4; + int maxIconWidth = IconSize(TDEIcon::Small) + 4; TQStyleOption menuOpt(&tqt3MenuItem, maxIconWidth, maxAcceleratorTextWidth); TQStyle::SFlags sflags = gtkToTQtStyleFlags(engine, state, TQT3WT_TQMenuItem, widget); @@ -1801,7 +1801,7 @@ tdegtk_draw_common_frame (DRAW_ARGS) TQMenuItem tqt3MenuItem; int maxAcceleratorTextWidth = 0; - int maxIconWidth = IconSize(KIcon::Small) + 4; + int maxIconWidth = IconSize(TDEIcon::Small) + 4; TQStyleOption menuOpt(&tqt3MenuItem, maxIconWidth, maxAcceleratorTextWidth); TQRect paintDeviceRect; @@ -2495,7 +2495,7 @@ tdegtk_draw_radio (DRAW_ARGS) bool checked = ((state & GTK_STATE_FLAG_ACTIVE) != 0); int maxAcceleratorTextWidth = 0; - int maxIconWidth = IconSize(KIcon::Small) + 4; + int maxIconWidth = IconSize(TDEIcon::Small) + 4; TQStringList objectTypes; objectTypes.append(TQPOPUPMENU_OBJECT_NAME_STRING); @@ -2555,7 +2555,7 @@ tdegtk_draw_separator (DRAW_ARGS) TQMenuItem tqt3MenuItem; tqt3MenuItem.setSeparator(true); int maxAcceleratorTextWidth = 0; - int maxIconWidth = IconSize(KIcon::Small) + 4; + int maxIconWidth = IconSize(TDEIcon::Small) + 4; TQStyleOption menuOpt(&tqt3MenuItem, maxIconWidth, maxAcceleratorTextWidth); // if (???) elementFlags = elementFlags | TQStyle::TQStyle::CEF_IsCheckable; diff --git a/tdegtk/tdegtk-theme.cpp b/tdegtk/tdegtk-theme.cpp index 05273ac..36fdbe5 100644 --- a/tdegtk/tdegtk-theme.cpp +++ b/tdegtk/tdegtk-theme.cpp @@ -143,13 +143,13 @@ G_MODULE_EXPORT GtkThemingEngine* create_engine(void) { // initialize icon sizes icon_sizes.push_back(std::make_pair("panel-menu", 16)); icon_sizes.push_back(std::make_pair("panel", 32)); - icon_sizes.push_back(std::make_pair("gtk-small-toolbar", IconSize(KIcon::Toolbar))); - icon_sizes.push_back(std::make_pair("gtk-large-toolbar", IconSize(KIcon::MainToolbar))); - icon_sizes.push_back(std::make_pair("gtk-dnd", IconSize(KIcon::Small))); - icon_sizes.push_back(std::make_pair("gtk-button", IconSize(KIcon::Small))); - icon_sizes.push_back(std::make_pair("gtk-menu", IconSize(KIcon::Small))); - icon_sizes.push_back(std::make_pair("gtk-dialog", IconSize(KIcon::Small))); - icon_sizes.push_back(std::make_pair("", IconSize(KIcon::Small))); + icon_sizes.push_back(std::make_pair("gtk-small-toolbar", IconSize(TDEIcon::Toolbar))); + icon_sizes.push_back(std::make_pair("gtk-large-toolbar", IconSize(TDEIcon::MainToolbar))); + icon_sizes.push_back(std::make_pair("gtk-dnd", IconSize(TDEIcon::Small))); + icon_sizes.push_back(std::make_pair("gtk-button", IconSize(TDEIcon::Small))); + icon_sizes.push_back(std::make_pair("gtk-menu", IconSize(TDEIcon::Small))); + icon_sizes.push_back(std::make_pair("gtk-dialog", IconSize(TDEIcon::Small))); + icon_sizes.push_back(std::make_pair("", IconSize(TDEIcon::Small))); if (gtk3TQtDebug) { writeGtkThemeControlFile(true); @@ -502,12 +502,12 @@ void writeGtkThemeControlFile(int forceRecreate) { } TQString iconSettingsString; - iconSettingsString.append(TQString("gtk-menu=%1,%2").arg(IconSize(KIcon::Small)).arg(IconSize(KIcon::Small))); - iconSettingsString.append(TQString(":gtk-button=%1,%2").arg(IconSize(KIcon::Small)).arg(IconSize(KIcon::Small))); - iconSettingsString.append(TQString(":gtk-small-toolbar=%1,%2").arg(IconSize(KIcon::Toolbar)).arg(IconSize(KIcon::Toolbar))); - iconSettingsString.append(TQString(":gtk-large-toolbar=%1,%2").arg(IconSize(KIcon::MainToolbar)).arg(IconSize(KIcon::MainToolbar))); - iconSettingsString.append(TQString(":gtk-dnd=%1,%2").arg(IconSize(KIcon::Small)).arg(IconSize(KIcon::Small))); - iconSettingsString.append(TQString(":gtk-dialog=%1,%2").arg(IconSize(KIcon::Small)).arg(IconSize(KIcon::Small))); + iconSettingsString.append(TQString("gtk-menu=%1,%2").arg(IconSize(TDEIcon::Small)).arg(IconSize(TDEIcon::Small))); + iconSettingsString.append(TQString(":gtk-button=%1,%2").arg(IconSize(TDEIcon::Small)).arg(IconSize(TDEIcon::Small))); + iconSettingsString.append(TQString(":gtk-small-toolbar=%1,%2").arg(IconSize(TDEIcon::Toolbar)).arg(IconSize(TDEIcon::Toolbar))); + iconSettingsString.append(TQString(":gtk-large-toolbar=%1,%2").arg(IconSize(TDEIcon::MainToolbar)).arg(IconSize(TDEIcon::MainToolbar))); + iconSettingsString.append(TQString(":gtk-dnd=%1,%2").arg(IconSize(TDEIcon::Small)).arg(IconSize(TDEIcon::Small))); + iconSettingsString.append(TQString(":gtk-dialog=%1,%2").arg(IconSize(TDEIcon::Small)).arg(IconSize(TDEIcon::Small))); // Set up global application settings GtkSettings* gtksettings = gtk_settings_get_default(); |