diff options
Diffstat (limited to 'tdegtk')
| -rw-r--r-- | tdegtk/CMakeLists.txt | 69 | ||||
| -rw-r--r-- | tdegtk/Makefile.am | 60 | ||||
| -rw-r--r-- | tdegtk/tdegtk-draw.cpp | 112 | ||||
| -rw-r--r-- | tdegtk/tdegtk-tabwidgetdata.h | 2 | ||||
| -rw-r--r-- | tdegtk/tdegtk-theme.cpp | 38 | ||||
| -rw-r--r-- | tdegtk/tdegtk-utils.h | 2 | ||||
| -rw-r--r-- | tdegtk/tqtcairopainter.cpp | 45 | ||||
| -rw-r--r-- | tdegtk/tqtcairopainter.h | 21 |
8 files changed, 178 insertions, 171 deletions
diff --git a/tdegtk/CMakeLists.txt b/tdegtk/CMakeLists.txt new file mode 100644 index 0000000..0737888 --- /dev/null +++ b/tdegtk/CMakeLists.txt @@ -0,0 +1,69 @@ +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CAIRO_INCLUDE_DIRS} + ${GTK3_INCLUDE_DIRS} + ${PANGO_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} + ${CAIRO_LIBARY_DIRS} + ${GTK3_LIBRARY_DIRS} + ${PANGO_LIBRARY_DIRS} +) + + +##### tqtcairo (shared) + +tde_add_library( tqtcairo SHARED AUTOMOC + + SOURCES + tqtcairopainter.cpp + + LINK + tdeui-shared + ${GLADE_LIBRARIES} + ${GTK3_LIBRARIES} + + VERSION 0.0.0 + + DESTINATION ${LIB_INSTALL_DIR} +) + + +##### tdegtk (shared) + +tde_add_library( tdegtk SHARED AUTOMOC + + SOURCES + exponential-blur.c + gtkroundedbox.c + tdegtk-cairo-support.c + tdegtk-draw.cpp + tdegtk-engine.c + tdegtk-support.c + tdegtk-hooks.cpp + tdegtk-signals.cpp + tdegtk-widgetlookup.cpp + tdegtk-utils.cpp + tdegtk-tabwidgetdata.cpp + tdegtk-animations.cpp + tdegtk-baseengine.cpp + tdegtk-theme.cpp + + LINK + tdecore-shared + tdeui-shared + tqtcairo-shared + ${GLADE_LIBRARIES} + ${GTK3_LIBRARIES} + + VERSION 0.0.0 + + DESTINATION ${GTK3_LIBDIR}/gtk-3.0/${GTK3_BIN_VERSION}/theming-engines +) diff --git a/tdegtk/Makefile.am b/tdegtk/Makefile.am deleted file mode 100644 index abc1c82..0000000 --- a/tdegtk/Makefile.am +++ /dev/null @@ -1,60 +0,0 @@ -INCLUDES= $(all_includes) $(KDE_INCLUDES)/tde - -source_h = \ - $(srcdir)/tdegtk.h \ - $(srcdir)/exponential-blur.h \ - $(srcdir)/gtkroundedboxprivate.h \ - $(srcdir)/tdegtk-cairo-support.h \ - $(srcdir)/tdegtk-draw.h \ - $(srcdir)/tdegtk-engine.h \ - $(srcdir)/tdegtk-support.h \ - $(srcdir)/tdegtk-hooks.h \ - $(srcdir)/tdegtk-signals.h \ - $(srcdir)/tdegtk-widgetlookup.h \ - $(srcdir)/tdegtk-utils.h \ - $(srcdir)/tdegtk-tabwidgetdata.h \ - $(srcdir)/tdegtk-animations.h \ - $(srcdir)/tdegtk-datamap.h \ - $(srcdir)/tdegtk-baseengine.h \ - $(srcdir)/tdegtk-genericengine.h \ - $(srcdir)/tdegtk-tabwidgetengine.h \ - $(srcdir)/tdegtk-types.h - -source_c = \ - $(srcdir)/exponential-blur.c \ - $(srcdir)/gtkroundedbox.c \ - $(srcdir)/tdegtk-cairo-support.c \ - $(srcdir)/tdegtk-draw.cpp \ - $(srcdir)/tdegtk-engine.c \ - $(srcdir)/tdegtk-support.c \ - $(srcdir)/tdegtk-hooks.cpp \ - $(srcdir)/tdegtk-signals.cpp \ - $(srcdir)/tdegtk-widgetlookup.cpp \ - $(srcdir)/tdegtk-utils.cpp \ - $(srcdir)/tdegtk-tabwidgetdata.cpp \ - $(srcdir)/tdegtk-animations.cpp \ - $(srcdir)/tdegtk-baseengine.cpp \ - $(srcdir)/tdegtk-theme.cpp - -enginedir = $(GTK3_LIBDIR)/gtk-3.0/$(GTK3_VERSION)/theming-engines -engine_LTLIBRARIES = libtdegtk.la - -libtdegtk_la_SOURCES = $(source_h) $(source_c) - -libtdegtk_la_CFLAGS = $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) -libtdegtk_la_CXXFLAGS = $(KDE_CXXFLAGS) $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) - -libtdegtk_la_LIBADD = $(KDE_LIBADD) libtqtcairo.la $(all_libraries) $(CAIRO_LIBS) $(GTK3_LIBS) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) - -libtdegtk_la_LDFLAGS = $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS) - -lib_LTLIBRARIES = libtqtcairo.la - -libtqtcairo_la_SOURCES = tqtcairopainter.h tqtcairopainter.cpp - -libtqtcairo_la_CFLAGS = $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) -libtqtcairo_la_CXXFLAGS = $(KDE_CXXFLAGS) $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) - -libtqtcairo_la_LIBADD = $(KDE_LIBADD) $(LIB_TQT) $(LIB_TDEUI) - -libtqtcairo_la_LDFLAGS = $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS) diff --git a/tdegtk/tdegtk-draw.cpp b/tdegtk/tdegtk-draw.cpp index 33cd63b..28c6987 100644 --- a/tdegtk/tdegtk-draw.cpp +++ b/tdegtk/tdegtk-draw.cpp @@ -477,7 +477,7 @@ draw_combobox_frame(DRAW_ARGS, const GtkWidgetPath* path, GtkStateFlags state, G TQPainter p(&pd); TQStringList objectTypes; - objectTypes.append(TQCOMBOBOX_OBJECT_NAME_STRING); + objectTypes.append("TQComboBox"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -520,7 +520,7 @@ draw_progressbar_frame(DRAW_ARGS, const GtkWidgetPath* path, GtkStateFlags state TQPainter p(&pd); TQStringList objectTypes; - objectTypes.append(TQPROGRESSBAR_OBJECT_NAME_STRING); + objectTypes.append("TQProgressBar"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -610,7 +610,7 @@ draw_slider_frame(DRAW_ARGS, const GtkWidgetPath* path, GtkStateFlags state, Gtk GtkScale* scaleWidget = GTK_SCALE(widget); TQStringList objectTypes; - objectTypes.append(TQSLIDER_OBJECT_NAME_STRING); + objectTypes.append("TQSlider"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -669,7 +669,7 @@ draw_scrollbar_frame(DRAW_ARGS, const GtkWidgetPath* path, GtkStateFlags state, GtkScrollbar* scrollbarWidget = GTK_SCROLLBAR(widget); TQStringList objectTypes; - objectTypes.append(TQSLIDER_OBJECT_NAME_STRING); + objectTypes.append("TQSlider"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -812,7 +812,7 @@ draw_scrollbar_frame(DRAW_ARGS, const GtkWidgetPath* path, GtkStateFlags state, static void draw_checkbox(DRAW_ARGS, const GtkWidgetPath* path, GtkStateFlags state, GtkWidget* widget, TQt3WidgetType tqt3WidgetType) { TQStringList objectTypes; - objectTypes.append(TQCHECKBOX_OBJECT_NAME_STRING); + objectTypes.append("TQCheckBox"); TQPalette objectPalette = tqApp->palette(objectTypes); TQRect boundingRect(0, 0, width, height); @@ -835,7 +835,7 @@ draw_checkbox(DRAW_ARGS, const GtkWidgetPath* path, GtkStateFlags state, GtkWidg static void draw_radiobutton(DRAW_ARGS, const GtkWidgetPath* path, GtkStateFlags state, GtkWidget* widget, TQt3WidgetType tqt3WidgetType) { TQStringList objectTypes; - objectTypes.append(TQCHECKBOX_OBJECT_NAME_STRING); + objectTypes.append("TQCheckBox"); TQPalette objectPalette = tqApp->palette(objectTypes); TQRect boundingRect(0, 0, width, height); @@ -858,7 +858,7 @@ draw_radiobutton(DRAW_ARGS, const GtkWidgetPath* path, GtkStateFlags state, GtkW static void draw_pushbutton(DRAW_ARGS, const GtkWidgetPath* path, GtkStateFlags state, GtkWidget* widget, TQt3WidgetType tqt3WidgetType) { TQStringList objectTypes; - objectTypes.append(TQCHECKBOX_OBJECT_NAME_STRING); + objectTypes.append("TQCheckBox"); TQPalette objectPalette = tqApp->palette(objectTypes); TQRect boundingRect(0, 0, width, height); @@ -886,7 +886,7 @@ draw_toolbar_button(DRAW_ARGS, const GtkWidgetPath* path, GtkStateFlags state, G bool mousedown = (state & GTK_STATE_FLAG_ACTIVE) != 0; TQStringList objectTypes; - objectTypes.append(TQTOOLBUTTON_OBJECT_NAME_STRING); + objectTypes.append("TQToolButton"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -904,7 +904,7 @@ draw_toolbar_button(DRAW_ARGS, const GtkWidgetPath* path, GtkStateFlags state, G GtkWidget* parent = (widget)?Gtk::gtk_widget_find_parent(widget, GTK_TYPE_TOOLBAR):0L; if (parent) { TQStringList parentObjectTypes; - parentObjectTypes.append(TQTOOLBAR_OBJECT_NAME_STRING); + parentObjectTypes.append("TQToolBar"); TQPalette parentObjectPalette = tqApp->palette(parentObjectTypes); const GtkAllocation allocation = Gtk::gtk_widget_get_allocation(parent); @@ -983,7 +983,7 @@ tdegtk_draw_activity (DRAW_ARGS) if (gtk_widget_path_is_type(path, GTK_TYPE_PROGRESS_BAR)) { #if 0 TQStringList objectTypes; - objectTypes.append(TQPROGRESSBAR_OBJECT_NAME_STRING); + objectTypes.append("TQProgressBar"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -1062,7 +1062,7 @@ tdegtk_draw_arrow (GtkThemingEngine *engine, if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_SCROLLBAR)) { #ifdef DRAW_SCROLLBAR_PIECES_INSTEAD_OF_ENTIRE_BAR TQStringList objectTypes; - objectTypes.append(TQSCROLLBAR_OBJECT_NAME_STRING); + objectTypes.append("TQScrollBar"); TQPalette objectPalette = tqApp->palette(objectTypes); GtkRange* rangeWidget = GTK_RANGE(widget); @@ -1162,12 +1162,12 @@ tdegtk_draw_arrow (GtkThemingEngine *engine, TQt3WidgetType tqt3WidgetType = TQT3WT_NONE; TQStringList objectTypes; - objectTypes.append(TQWIDGET_OBJECT_NAME_STRING); + objectTypes.append("TQWidget"); if ((gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENU)) || (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENUITEM))) { GtkWidget* parent(widget?gtk_widget_get_parent(widget):0L); if (!GTK_IS_MENU_BAR(parent)) { objectTypes.clear(); - objectTypes.append(TQPOPUPMENU_OBJECT_NAME_STRING); + objectTypes.append("TQPopupMenu"); tqt3WidgetType = TQT3WT_TQMenuItem; } } @@ -1208,7 +1208,7 @@ tdegtk_draw_cell_background (DRAW_ARGS, if (gtk_widget_path_is_type(path, GTK_TYPE_TREE_VIEW)) { TQStringList objectTypes; - objectTypes.append(TQLISTVIEW_OBJECT_NAME_STRING); + objectTypes.append("TQListView"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -1262,7 +1262,7 @@ tdegtk_draw_cell_frame (DRAW_ARGS, if (gtk_widget_path_is_type(path, GTK_TYPE_TREE_VIEW)) { #if 0 TQStringList objectTypes; - objectTypes.append(TQLISTVIEW_OBJECT_NAME_STRING); + objectTypes.append("TQListView"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -1355,7 +1355,7 @@ tdegtk_draw_common_background (DRAW_ARGS) if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_SCROLLBAR)) { #ifdef DRAW_SCROLLBAR_PIECES_INSTEAD_OF_ENTIRE_BAR TQStringList objectTypes; - objectTypes.append(TQSCROLLBAR_OBJECT_NAME_STRING); + objectTypes.append("TQScrollBar"); TQPalette objectPalette = tqApp->palette(objectTypes); GtkRange* rangeWidget = GTK_RANGE(widget); @@ -1378,7 +1378,7 @@ tdegtk_draw_common_background (DRAW_ARGS) else if (gtk_widget_path_is_type(path, GTK_TYPE_SCROLLED_WINDOW)) { if ((x == 0) && (y == 0)) { TQStringList objectTypes; - objectTypes.append(TQFRAME_OBJECT_NAME_STRING); + objectTypes.append("TQFrame"); TQPalette objectPalette = tqApp->palette(objectTypes); int groupBoxLineWidth = 1; @@ -1413,7 +1413,7 @@ tdegtk_draw_common_background (DRAW_ARGS) || (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_COMBOBOX_ENTRY)) ) { TQStringList objectTypes; - objectTypes.append(TQLINEEDIT_OBJECT_NAME_STRING); + objectTypes.append("TQLineEdit"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw background @@ -1426,7 +1426,7 @@ tdegtk_draw_common_background (DRAW_ARGS) bool mousedown = (state & GTK_STATE_FLAG_ACTIVE) != 0; TQStringList objectTypes; - objectTypes.append(TQCOMBOBOX_OBJECT_NAME_STRING); + objectTypes.append("TQComboBox"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -1448,7 +1448,7 @@ tdegtk_draw_common_background (DRAW_ARGS) else if (gtk_widget_path_is_type(path, GTK_TYPE_BUTTON)) { #if 0 TQStringList objectTypes; - objectTypes.append(TQBUTTON_OBJECT_NAME_STRING); + objectTypes.append("TQButton"); TQPalette objectPalette = tqApp->palette(objectTypes); if (Gtk::gtk_widget_path_has_type(path, GTK_TYPE_TOOLBAR)) { @@ -1471,7 +1471,7 @@ tdegtk_draw_common_background (DRAW_ARGS) else if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_TOOLBAR)) { TQStringList objectTypes; - objectTypes.append(TQTOOLBAR_OBJECT_NAME_STRING); + objectTypes.append("TQToolBar"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw background @@ -1481,7 +1481,7 @@ tdegtk_draw_common_background (DRAW_ARGS) else if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENUBAR)) { TQStringList objectTypes; - objectTypes.append(TQMENUBAR_OBJECT_NAME_STRING); + objectTypes.append("TQMenuBar"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw background @@ -1491,7 +1491,7 @@ tdegtk_draw_common_background (DRAW_ARGS) else if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_TOOLTIP)) { TQStringList objectTypes; - objectTypes.append(TQTIPLABEL_OBJECT_NAME_STRING); + objectTypes.append("TQTipLabel"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw background @@ -1519,7 +1519,7 @@ tdegtk_draw_common_background (DRAW_ARGS) // bool selectedTab = (tabIndex==currentPage); TQStringList objectTypes; - objectTypes.append(TQPOPUPMENU_OBJECT_NAME_STRING); + objectTypes.append("TQPopupMenu"); TQPalette objectPalette = tqApp->palette(objectTypes); bool pressed = false; @@ -1550,7 +1550,7 @@ tdegtk_draw_common_background (DRAW_ARGS) else if (gtk_widget_path_is_type(path, GTK_TYPE_NOTEBOOK)) { TQStringList objectTypes; - objectTypes.append(TQTABWIDGET_OBJECT_NAME_STRING); + objectTypes.append("TQTabWidget"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw background @@ -1564,7 +1564,7 @@ tdegtk_draw_common_background (DRAW_ARGS) else if (gtk_widget_path_is_type(path, GTK_TYPE_HANDLE_BOX)) { TQStringList objectTypes; - objectTypes.append(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING); + objectTypes.append("TQDockWindowHandle"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw background @@ -1574,7 +1574,7 @@ tdegtk_draw_common_background (DRAW_ARGS) else if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_CELL)) { TQStringList objectTypes; - objectTypes.append(TQLISTVIEW_OBJECT_NAME_STRING); + objectTypes.append("TQListView"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -1602,7 +1602,7 @@ tdegtk_draw_common_background (DRAW_ARGS) else if (gtk_widget_path_is_type(path, GTK_TYPE_LABEL)) { if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_FRAME)) { TQStringList objectTypes; - objectTypes.append(TQFRAME_OBJECT_NAME_STRING); + objectTypes.append("TQFrame"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw background @@ -1620,7 +1620,7 @@ tdegtk_draw_common_background (DRAW_ARGS) else if (gtk_widget_path_is_type(path, GTK_TYPE_SWITCH)) { TQStringList objectTypes; - objectTypes.append(TQSCROLLBAR_OBJECT_NAME_STRING); + objectTypes.append("TQScrollBar"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -1637,7 +1637,7 @@ tdegtk_draw_common_background (DRAW_ARGS) #ifdef GTK_TYPE_LEVEL_BAR else if (gtk_widget_path_is_type(path, GTK_TYPE_LEVEL_BAR)) { TQStringList objectTypes; - objectTypes.append(TQPROGRESSBAR_OBJECT_NAME_STRING); + objectTypes.append("TQProgressBar"); TQPalette objectPalette = tqApp->palette(objectTypes); if (gtk_theming_engine_has_class(engine, "fill-block")) { @@ -1675,7 +1675,7 @@ tdegtk_draw_common_background (DRAW_ARGS) else if (widgetThemingEnginePath.endsWith("GtkTreeView.view")) { TQStringList objectTypes; - objectTypes.append(TQLISTVIEW_OBJECT_NAME_STRING); + objectTypes.append("TQListView"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw background @@ -1691,7 +1691,7 @@ tdegtk_draw_common_background (DRAW_ARGS) || (gtk_widget_path_is_type(path, GTK_TYPE_FRAME)) ) { TQStringList objectTypes; - objectTypes.append(TQWIDGET_OBJECT_NAME_STRING); + objectTypes.append("TQWidget"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw background @@ -1727,7 +1727,7 @@ tdegtk_draw_common_frame (DRAW_ARGS) state = gtk_theming_engine_get_state(engine); widget = m_widgetLookup.find(cr, path); - TQString widgetPath(Gtk::gtk_widget_path(widget)); + TQString widgetPath(Gtk::gtk_widget_path(widget).c_str()); if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_SCROLLBAR)) { #ifdef DRAW_SCROLLBAR_PIECES_INSTEAD_OF_ENTIRE_BAR @@ -1736,7 +1736,7 @@ tdegtk_draw_common_frame (DRAW_ARGS) } else { TQStringList objectTypes; - objectTypes.append(TQSCROLLBAR_OBJECT_NAME_STRING); + objectTypes.append("TQScrollBar"); TQPalette objectPalette = tqApp->palette(objectTypes); GtkRange* rangeWidget = GTK_RANGE(widget); @@ -1791,7 +1791,7 @@ tdegtk_draw_common_frame (DRAW_ARGS) GtkWidget* parent(widget?gtk_widget_get_parent(widget):0L); if (GTK_IS_MENU_BAR(parent)) { TQStringList objectTypes; - objectTypes.append(TQMENUBAR_OBJECT_NAME_STRING); + objectTypes.append("TQMenuBar"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -1820,7 +1820,7 @@ tdegtk_draw_common_frame (DRAW_ARGS) // Certain styles (highcolor) paint over the color swatches if this is enabled, rendering the picker useless else if (widgetPath.endsWith(".GtkColorSwatch")) { TQStringList objectTypes; - objectTypes.append(TQLINEEDIT_OBJECT_NAME_STRING); + objectTypes.append("TQLineEdit"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw frame @@ -1835,7 +1835,7 @@ tdegtk_draw_common_frame (DRAW_ARGS) else if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_ENTRY)) { TQStringList objectTypes; - objectTypes.append(TQLINEEDIT_OBJECT_NAME_STRING); + objectTypes.append("TQLineEdit"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw frame @@ -1866,7 +1866,7 @@ tdegtk_draw_common_frame (DRAW_ARGS) else if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENU)) { TQStringList objectTypes; - objectTypes.append(TQPOPUPMENU_OBJECT_NAME_STRING); + objectTypes.append("TQPopupMenu"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -1881,7 +1881,7 @@ tdegtk_draw_common_frame (DRAW_ARGS) else if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_TOOLTIP)) { TQStringList objectTypes; - objectTypes.append(TQTOOLTIP_OBJECT_NAME_STRING); + objectTypes.append("TQToolTip"); TQPalette objectPalette = tqApp->palette(objectTypes); int groupBoxLineWidth = 1; @@ -1921,7 +1921,7 @@ tdegtk_draw_common_frame (DRAW_ARGS) TQPainter p2(&pd2); TQStringList objectTypes; - objectTypes.append(TQPROGRESSBAR_OBJECT_NAME_STRING); + objectTypes.append("TQProgressBar"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -2059,7 +2059,7 @@ tdegtk_draw_extension (DRAW_ARGS, bool selectedTab = (tabIndex==currentPage); TQStringList objectTypes; - objectTypes.append(TQTABBAR_OBJECT_NAME_STRING); + objectTypes.append("TQTabBar"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -2072,7 +2072,7 @@ tdegtk_draw_extension (DRAW_ARGS, TQStyleOption tabOpt(&tqt3Tab, (prelight)?&tqt3Tab:(TQTab*)NULL); elementFlags = elementFlags | TQStyle::CEF_HasParentWidget; - ceData.parentWidgetData.widgetObjectTypes.append(TQTABBAR_OBJECT_NAME_STRING); + ceData.parentWidgetData.widgetObjectTypes.append("TQTabBar"); int tab_overlap = tqApp->style().pixelMetric(TQStyle::PM_TabBarTabOverlap); int tab_to_frame_gap_height = 2; @@ -2191,16 +2191,16 @@ tdegtk_draw_focus (DRAW_ARGS) || (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_ENTRY)) || (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_COMBOBOX_ENTRY)) ) { - objectTypes.append(TQLINEEDIT_OBJECT_NAME_STRING); + objectTypes.append("TQLineEdit"); } else if (gtk_widget_path_is_type(path, GTK_TYPE_TREE_VIEW)) { - objectTypes.append(TQLISTVIEW_OBJECT_NAME_STRING); + objectTypes.append("TQListView"); } else if (gtk_widget_path_is_type(path, GTK_TYPE_BUTTON)) { - objectTypes.append(TQPUSHBUTTON_OBJECT_NAME_STRING); + objectTypes.append("TQPushButton"); } else { - objectTypes.append(TQWIDGET_OBJECT_NAME_STRING); + objectTypes.append("TQWidget"); } TQPalette objectPalette = tqApp->palette(objectTypes); @@ -2219,7 +2219,7 @@ tdegtk_draw_focus (DRAW_ARGS) if (gtk_widget_path_is_type(path, GTK_TYPE_BUTTON)) { TQStringList objectTypes; - objectTypes.append(TQBUTTON_OBJECT_NAME_STRING); + objectTypes.append("TQButton"); ceData.widgetObjectTypes = objectTypes; ceData.rect = boundingRect; @@ -2272,7 +2272,7 @@ tdegtk_draw_frame_gap (DRAW_ARGS, GtkShadowType gtkShadowType = gtk_frame_get_shadow_type(frame); TQStringList objectTypes; - objectTypes.append(TQGROUPBOX_OBJECT_NAME_STRING); + objectTypes.append("TQGroupBox"); TQPalette objectPalette = tqApp->palette(objectTypes); int groupBoxLineWidth = 1; @@ -2343,7 +2343,7 @@ tdegtk_draw_grip (DRAW_ARGS) widget = m_widgetLookup.find(cr, path); TQStringList objectTypes; - objectTypes.append(TQSTATUSBAR_OBJECT_NAME_STRING); + objectTypes.append("TQStatusBar"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw background @@ -2378,7 +2378,7 @@ tdegtk_draw_handle (DRAW_ARGS) if (gtk_widget_path_is_type(path, GTK_TYPE_HANDLE_BOX)) { TQStringList objectTypes; - objectTypes.append(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING); + objectTypes.append("TQDockWindowHandle"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw handle @@ -2387,7 +2387,7 @@ tdegtk_draw_handle (DRAW_ARGS) else if (gtk_widget_path_is_type(path, GTK_TYPE_PANED)) { TQStringList objectTypes; - objectTypes.append(TQSPLITTER_OBJECT_NAME_STRING); + objectTypes.append("TQSplitter"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw handle @@ -2453,7 +2453,7 @@ tdegtk_draw_notebook (DRAW_ARGS, if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_NOTEBOOK)) { TQStringList objectTypes; - objectTypes.append(TQTABWIDGET_OBJECT_NAME_STRING); + objectTypes.append("TQTabWidget"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw background @@ -2498,7 +2498,7 @@ tdegtk_draw_radio (DRAW_ARGS) int maxIconWidth = IconSize(TDEIcon::Small) + 4; TQStringList objectTypes; - objectTypes.append(TQPOPUPMENU_OBJECT_NAME_STRING); + objectTypes.append("TQPopupMenu"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -2541,7 +2541,7 @@ tdegtk_draw_separator (DRAW_ARGS) if (gtk_widget_path_is_type(path, GTK_TYPE_SEPARATOR_MENU_ITEM)) { TQStringList objectTypes; - objectTypes.append(TQPOPUPMENU_OBJECT_NAME_STRING); + objectTypes.append("TQPopupMenu"); TQPalette objectPalette = tqApp->palette(objectTypes); bool pressed = false; @@ -2631,7 +2631,7 @@ tdegtk_draw_slider (DRAW_ARGS, if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_SCROLLBAR)) { #ifdef DRAW_SCROLLBAR_PIECES_INSTEAD_OF_ENTIRE_BAR TQStringList objectTypes; - objectTypes.append(TQSCROLLBAR_OBJECT_NAME_STRING); + objectTypes.append("TQScrollBar"); TQPalette objectPalette = tqApp->palette(objectTypes); GtkRange* rangeWidget = GTK_RANGE(widget); @@ -2666,7 +2666,7 @@ tdegtk_draw_slider (DRAW_ARGS, else if (gtk_widget_path_is_type(path, GTK_TYPE_SWITCH)) { TQStringList objectTypes; - objectTypes.append(TQSCROLLBAR_OBJECT_NAME_STRING); + objectTypes.append("TQScrollBar"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; diff --git a/tdegtk/tdegtk-tabwidgetdata.h b/tdegtk/tdegtk-tabwidgetdata.h index e7284bf..fb2a243 100644 --- a/tdegtk/tdegtk-tabwidgetdata.h +++ b/tdegtk/tdegtk-tabwidgetdata.h @@ -1,5 +1,5 @@ #ifndef tdegtk_tabwidgetdata_h -#define tdegtk_widgetdata_h +#define tdegtk_tabwidgetdata_h /* * this file was largely taken from the oxygen gtk engine * Copyright (c) 2010 Hugo Pereira Da Costa <hugo@oxygen-icons.org> diff --git a/tdegtk/tdegtk-theme.cpp b/tdegtk/tdegtk-theme.cpp index b99c485..acdd499 100644 --- a/tdegtk/tdegtk-theme.cpp +++ b/tdegtk/tdegtk-theme.cpp @@ -47,23 +47,25 @@ bool m_scrollbarForward1 = false; bool m_scrollbarBack2 = false; bool m_scrollbarForward2 = false; +#include <gmodule.h> +#include <kdemacros.h> + extern "C" { - #include <gmodule.h> #include <gtk/gtk.h> #include "tdegtk-engine.h" - G_MODULE_EXPORT void theme_init(GTypeModule *module); + TDE_EXPORT void theme_init(GTypeModule *module); - G_MODULE_EXPORT void theme_exit(void); + TDE_EXPORT void theme_exit(void); - G_MODULE_EXPORT GtkThemingEngine* create_engine(void); + TDE_EXPORT GtkThemingEngine* create_engine(void); - G_MODULE_EXPORT void theme_init(GTypeModule *module) { + TDE_EXPORT void theme_init(GTypeModule *module) { tdegtk_engine_register_types(module); } - G_MODULE_EXPORT void theme_exit(void) { + TDE_EXPORT void theme_exit(void) { // } } @@ -199,7 +201,7 @@ TQString tdeFindDir(const TQString& suffix, const TQString& file1, const TQStrin } TQString runCommand(const TQString& command) { - FILE* p = popen(command.latin1(), "r"); + FILE* p = popen(command.local8Bit(), "r"); if (p == NULL) { return TQString(); } @@ -343,7 +345,7 @@ GtkIconSet* generateIconSet(const std::string& gtkIconName, const std::string& t // loop over provided path to see if at least one icon is found for (TQStringList::const_iterator pathIter = pathList.begin(); pathIter != pathList.end(); ++pathIter) { - std::string filename((*pathIter + '/' + iconFileStream.str()).latin1()); + std::string filename((*pathIter + '/' + iconFileStream.str().c_str()).local8Bit()); if (!std::ifstream(filename.c_str())) { continue; } @@ -409,7 +411,7 @@ void setColour(TQString name, TQString state, TQColor color, TQString widgetType if (state == ":normal") { state = ""; } - gtk3_tqt_load_resource_string(parse_rc_string(name + ": " + colorString(color), widgetTypes + state).latin1()); + gtk3_tqt_load_resource_string(parse_rc_string(name + ": " + colorString(color), widgetTypes + state).local8Bit()); } static TQStringList iconInheritsDirs(const TQString& icondir) { @@ -494,7 +496,7 @@ void writeGtkThemeControlFile(int forceRecreate) { // Menu items { TQStringList objectTypes; - objectTypes.append(TQPOPUPMENU_OBJECT_NAME_STRING); + objectTypes.append("TQPopupMenu"); TQPalette objectPalette = tqApp->palette(objectTypes); setColour("color", "hover:insensitive", objectPalette.color(TQPalette::Disabled, TQColorGroup::Text), "GtkMenu>GtkMenuItem"); // setColour("color", "hover:normal", objectPalette.color(TQPalette::Active, TQColorGroup::HighlightedText), "GtkMenu>GtkMenuItem"); @@ -749,13 +751,13 @@ void writeGtkThemeControlFile(int forceRecreate) { if (!forceRecreate && themeFile.exists()) { themeFile.open(IO_ReadOnly); - stream.setDevice(TQT_TQIODEVICE(&themeFile)); + stream.setDevice(&themeFile); if (stream.readLine() == "/* " + iconTheme + ", " + tqApp->style().name() + ", " + RC_CACHE_VERSION + ", " + __DATE__ + ", " + __TIME__ + " */") { // This cache matches the current icon theme and style themeFile.close(); - gtk3_tqt_reload_theme_definition_file(themeFilePath.latin1()); + gtk3_tqt_reload_theme_definition_file(themeFilePath.local8Bit()); return; } @@ -765,11 +767,11 @@ void writeGtkThemeControlFile(int forceRecreate) { if (gtk3TQtDebug) { // Load possibly modified theme control file before writing a new one - gtk3_tqt_reload_theme_definition_file(themeFilePath.latin1()); + gtk3_tqt_reload_theme_definition_file(themeFilePath.local8Bit()); } themeFile.open(IO_WriteOnly | IO_Truncate); - stream.setDevice(TQT_TQIODEVICE(&themeFile)); + stream.setDevice(&themeFile); stream << "/* " << iconTheme << ", " << tqApp->style().name() << ", " << RC_CACHE_VERSION << ", " << __DATE__ << ", " << __TIME__ << " */\n\n"; stream << "/* This file was generated by the Gtk TQt Theme Engine */\n"; @@ -907,7 +909,7 @@ void writeGtkThemeControlFile(int forceRecreate) { probeRect = TQRect(0, 0, 100, 100); TQStringList objectTypes; - objectTypes.append(TQCOMBOBOX_OBJECT_NAME_STRING); + objectTypes.append("TQComboBox"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -954,7 +956,7 @@ void writeGtkThemeControlFile(int forceRecreate) { // See upstream GTK bug #687363 { TQStringList objectTypes; - objectTypes.append(TQTEXTEDIT_OBJECT_NAME_STRING); + objectTypes.append("TQTextEdit"); TQPalette objectPalette = tqApp->palette(objectTypes); // stream << parse_rc_string("background-color: " + colorString(objectPalette.color(TQPalette::Active, TQColorGroup::Base)), "GtkTextView"); // stream << parse_rc_string("background-color: " + colorString(objectPalette.color(TQPalette::Disabled, TQColorGroup::Base)), "GtkTextView:insensitive"); @@ -971,7 +973,7 @@ void writeGtkThemeControlFile(int forceRecreate) { int tdeMenuFrameWidth; { TQStringList objectTypes; - objectTypes.append(TQPOPUPMENU_OBJECT_NAME_STRING); + objectTypes.append("TQPopupMenu"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -1028,7 +1030,7 @@ void writeGtkThemeControlFile(int forceRecreate) { themeFile.close(); if (!gtk3TQtDebug) { - gtk3_tqt_reload_theme_definition_file(themeFilePath.latin1()); + gtk3_tqt_reload_theme_definition_file(themeFilePath.local8Bit()); } } // ========================================================================================================= diff --git a/tdegtk/tdegtk-utils.h b/tdegtk/tdegtk-utils.h index 66be2c9..7841310 100644 --- a/tdegtk/tdegtk-utils.h +++ b/tdegtk/tdegtk-utils.h @@ -210,7 +210,7 @@ //! returns true if given path has given type bool gtk_widget_path_has_type( const GtkWidgetPath*, GType ); - //! returns true if widget is a groupbox (a la Qt) + //! returns true if widget is a groupbox (a la TQt) inline bool gtk_widget_is_groupbox( GtkWidget* widget ) { return diff --git a/tdegtk/tqtcairopainter.cpp b/tdegtk/tqtcairopainter.cpp index dac2c72..f680e9c 100644 --- a/tdegtk/tqtcairopainter.cpp +++ b/tdegtk/tqtcairopainter.cpp @@ -25,7 +25,6 @@ #include "tqtcairopainter.h" -#define TQT_NO_COMPAT_NAMES #include "tqpainter.h" #include "tqpixmap.h" #include "tqbitmap.h" @@ -37,8 +36,6 @@ #include <kpixmapio.h> #endif // USE_TDE_SPECIFIC_LIBRARIES -#undef Qt - #define CAIRO_PEN_PIXEL_OFFSET (0.5) #define CAIRO_BRUSH_PIXEL_OFFSET (0.0) #define CAIRO_FONT_SIZE_FUDGE_FACTOR (1.4) @@ -62,7 +59,7 @@ inline int cairoPainterRectSubtraction(TQPen* pen) { } inline void standardAlphaToPremultipliedAlpha(unsigned char *a, unsigned char *r, unsigned char *g, unsigned char *b) { - register double alpha_adjust; + double alpha_adjust; alpha_adjust = (*a / 255.0); *r = char( *r * alpha_adjust ); @@ -72,7 +69,7 @@ inline void standardAlphaToPremultipliedAlpha(unsigned char *a, unsigned char *r } inline void premultipliedAlphaToStandardAlpha(unsigned char *a, unsigned char *r, unsigned char *g, unsigned char *b) { - register double alpha_adjust; + double alpha_adjust; alpha_adjust = (*a / 255.0); *r = char( *r / alpha_adjust ); @@ -180,9 +177,9 @@ void TQt3CairoPaintDevice::transferIntermediateSurface() { cairo_surface_flush(m_surface); cairo_surface_flush(m_intermediateSurface); updateSurfaceDimensions(); - register int height = m_height; - register int width = m_width; - register int stride = cairo_format_stride_for_width(cairo_image_surface_get_format(m_surface), width); + int height = m_height; + int width = m_width; + int stride = cairo_format_stride_for_width(cairo_image_surface_get_format(m_surface), width); cairo_surface_t *usableDeviceSurface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height); cairo_t *copyPainter = cairo_create(usableDeviceSurface); cairo_set_source_surface(copyPainter, m_surface, 0, 0); @@ -192,21 +189,21 @@ void TQt3CairoPaintDevice::transferIntermediateSurface() { cairo_destroy(copyPainter); unsigned char* device_surface_data = cairo_image_surface_get_data(usableDeviceSurface); unsigned char* intermediate_surface_data = cairo_image_surface_get_data(m_intermediateSurface); - register int x; - register int y; - register long long offset; - register unsigned char devicePixel_a; - register unsigned char devicePixel_r; - register unsigned char devicePixel_g; - register unsigned char devicePixel_b; - register unsigned char intermediatePixel_a; - register unsigned char intermediatePixel_r; - register unsigned char intermediatePixel_g; - register unsigned char intermediatePixel_b; - register unsigned char combinedPixel_a; - register unsigned char combinedPixel_r; - register unsigned char combinedPixel_g; - register unsigned char combinedPixel_b; + int x; + int y; + long long offset; + unsigned char devicePixel_a; + unsigned char devicePixel_r; + unsigned char devicePixel_g; + unsigned char devicePixel_b; + unsigned char intermediatePixel_a; + unsigned char intermediatePixel_r; + unsigned char intermediatePixel_g; + unsigned char intermediatePixel_b; + unsigned char combinedPixel_a; + unsigned char combinedPixel_r; + unsigned char combinedPixel_g; + unsigned char combinedPixel_b; // Execute the desired raster operation // WARNING // This is VERY SLOW @@ -1199,7 +1196,7 @@ void TQt3CairoPaintDevice::setCairoTransformations(cairo_t* cr, bool forceDisabl /*! \class TQt3CairoPaintDevice tdeqt4painter.h \brief The TQt3CairoPaintDevice class is a paint device that translates - Qt paint events to a TQt painter. + TQt paint events to a TQt painter. \ingroup graphics \ingroup shared diff --git a/tdegtk/tqtcairopainter.h b/tdegtk/tqtcairopainter.h index dcca6f9..c8f53de 100644 --- a/tdegtk/tqtcairopainter.h +++ b/tdegtk/tqtcairopainter.h @@ -21,16 +21,15 @@ #ifndef TQTCAIROPAINTER_H #define TQTCAIROPAINTER_H -#define TQT_NO_COMPAT_NAMES -#include "ntqpaintdevice.h" -#include "ntqbuffer.h" -#include "ntqcolor.h" -#include "ntqpen.h" -#include "ntqbrush.h" -#include "ntqfont.h" -#include "ntqimage.h" -#include "ntqptrstack.h" -#include "ntqpainter.h" +#include "tqpaintdevice.h" +#include "tqbuffer.h" +#include "tqcolor.h" +#include "tqpen.h" +#include "tqbrush.h" +#include "tqfont.h" +#include "tqimage.h" +#include "tqptrstack.h" +#include "tqpainter.h" #include <cairo.h> #include <pango/pangocairo.h> @@ -39,7 +38,7 @@ typedef TQPtrStack<TQWMatrix> TQWMatrixStack; class KPixmapIO; -class Q_EXPORT TQt3CairoPaintDevice : public TQPaintDevice // picture class +class TQ_EXPORT TQt3CairoPaintDevice : public TQPaintDevice // picture class { public: TQt3CairoPaintDevice( cairo_surface_t *, int x = 0, int y = 0, int width = -1, int height = -1, cairo_t *overridepainter = NULL ); |