summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix plastique, cleanlooks and motif animation timerHEADmasterBłażej Szczygieł2017-03-116-52/+116
| | | | | | | | | | | | Move plastique and cleanlooks timer event to "event()" method, because "timerEvent()" doesn't work on class derivated from "QProxyStyle". Also unify plastique, cleanlooks and motif animation timer methods. This allows to kill timer for plastique and motif styles when it will be no longer necessary (as in cleanlooks style). Change-Id: I1365e57d56bf35bf07c3efc604482a5405608930 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Motif/CDE: Fix QSpinBox height in layoutBłażej Szczygieł2017-03-093-1/+14
| | | | | | | Calculate correct height for QSpinBox for Motif and CDE styles. Change-Id: I4cb3acd37a1e9129c5b3faef7dbf980a32744329 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Plastique: Fix QSpinBox height in layoutBłażej Szczygieł2017-02-201-1/+0
| | | | | | | | QCommonStyle properly handles the QSpinBox size, so no need to call method for QLineEdit which returns incorrect height in this case. Change-Id: I3c5e8cbeb1c340f8300bdc2a8116b48c83ee40cc Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* QPlastiqueStyle: Use QCommonStyle instead of QProxyStyleBłażej Szczygieł2017-01-191-1/+1
| | | | | | | | This change allows to draw the QProgresBar properly as in Qt4. Now the percent text is inside the progress bar. Change-Id: I1dac6b958e863d6d450602ab2990c3c2e8ca67c1 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* QCleanlooksStyle: Use QCommonStyle instead of QProxyStyleBłażej Szczygieł2017-01-181-1/+1
| | | | | | | | | | | | This allows to use correct color (non-white) for label text in a QComboBox. Same as 0daddff57d17715e17b96a02eb7dab9489801e64, but for Cleanlooks. Also improves progress bar drawing - now looks like in Qt4, the progress bar content now fills the entire groove vertically. Change-Id: Ib652bb9a8dfe6806299c0f11211cfa83898f6eef Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Fix build with Qt >= 5.8.0Alexander Volkov2016-12-151-1/+5
| | | | | | | | | | platformsupport-private was modularized in Qt 5.8. Use the appropriate theme_support-private module to build QGtk2Theme. Change-Id: I56c8b4c83ca483206baf09cb744d93e2e3c6ff39 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Remove unused sync.profileAlexander Volkov2016-12-141-9/+0
| | | | | Change-Id: I255d467349d8db7cdb02cd9f0a02552e57a4ed8c Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Remove obsolete and unused QBB10StylePlugin::keys()Alexander Volkov2016-12-012-6/+0
| | | | | | | | | It was supposed to be an overrider of QStylePlugin::keys(), but QStylePlugin::keys() was removed by 09992c654db860b22d6b109707462346bfb5ca26 in qtbase (before Qt 5.0). Change-Id: I8d61dcf2c6c5a0ea43bcdbc9608b72f0edd4d196 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Add missing PLUGIN_CLASS_NAMEsAlexander Volkov2016-10-245-1/+5
| | | | | | | | | | | | | It will create a separate imported target for each plugin instead of a single Qt5Widgets_.cmake for an arbirary one. An imported target can be used e.g. for reading the location property of a plugin. Also change PLUGIN_CLASS_NAME for the bb10style plugin to match the class name. Change-Id: I0bdf98c4d47ee9e33611cb35a2f05f41e1948c7f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Build the BB10 style with Qt 5.7 or later onlyJ-P Nurmi2016-10-221-2/+6
| | | | | Change-Id: I18449b542ffc4d43ee31cabb58611f79396983fd Reviewed-by: Louai Al-Khanji <louai.al-khanji@qt.io>
* Add Q_DECL_OVERRIDEAlexander Volkov2016-10-217-78/+78
| | | | | Change-Id: Ic2c19bb404ea829d3187fa88b0a98141fb0305ea Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Remove use of deprecated QStyleOption*V<N>Alexander Volkov2016-10-124-101/+50
| | | | | Change-Id: I6686a9c94bd8ee7e1804272b2fd827c084efbcd3 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* skip building gtk2 platform theme if gtk+-2.0 is missingAlexander Volkov2016-10-051-1/+4
| | | | | | Change-Id: I35e648023168155e28790045f9a74a1d4c609a00 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Allow building of gtk2 style when GConf is missingAlexander Volkov2016-10-051-1/+1
| | | | | | | | GConf is not required since 55a73061196cdf0c57a65989fefed055ec0f6df0. Change-Id: Idb77d4dd59efae012b240d485ffa252a7cd1e725 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Import gtk2 platform theme from qtbase 5.6Dmitry Shachnev2016-09-029-1/+1025
| | | | | | | | | | | | | | | | | Some people still want to use GTK+ 2.x integration which has been removed from qtbase, so we will ship it in this repository. The changes compared to qtbase 5.6 branch are: * Using pkgconfig to link against gtk+-2.0. * QPlatformTheme::StyleNames hint suggests the gtk2 style. * QGtk2Dialog::show(): add missing null-check to avoid warnings (cherry-picked from 2e2b32a9ab459f66 in qtbase 5.7 branch). This can be used by exporting QT_QPA_PLATFORMTHEME=gtk2. Change-Id: I8b5e424d304f146fae72545b98b0ba4cbcf1e6a6 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* gtk2 style: get rid of GConf usageDmitry Shachnev2016-09-025-64/+4
| | | | | | | | The only thing relying on it was ButtonsHaveIcons property, which can be retrieved via GtkSettings API. Change-Id: I5701e3201076c2e0f23c7f836edd358d8aa442a7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Relocate bb10style from qtbaseLouai Al-Khanji2015-11-20118-1/+1138
| | | | | Change-Id: If34021832c5d860260b36688a3bbccb1436357e6 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* GTK style: Disable Ubuntu scrollbarsAurélien Gâteau2015-09-252-0/+10
| | | | | | | | | They don't play well with Qt. Change-Id: I1c64bc65441a975eb5c7558895e7df7eb88e2fd4 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* Ensure the right color is used for drawing the label text in a comboboxAndy Shaw2015-09-241-1/+1
| | | | | | | | | | After QWindowsStyle was changed to use a different color from the palette for the CE_ComboBoxLabel case it caused it to override the color used by the plastique style. By going right to QCommonStyle we bypass the changes done by the Windows style and thus ensure it is drawn correctly. Change-Id: Ic1398afc16e2498f25287f55526301fb7f17731c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* QGtkStyle: fix spinbox arrowsJ-P Nurmi2015-09-021-0/+1
| | | | | | | Change-Id: I24b94f677a87411637cceaa82f1b47b84cdfb20a Task-number: QTBUG-23346 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Import gtk2 style from qtbaseDmitry Shachnev2015-08-2813-0/+6286
| | | | | | | | | | | | We are going to drop gtk2 support from qtbase, so move that style plugin from qtbase to here. As a bonus, we can now link directly to the libraries we use, instead of loading them dynamically (in qtbase this style was part of QtWidgets library, and we didn't want it to link against gtk2). Change-Id: I2fc3325fbc0a9f2588b99e94aa906eebbe76d45c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Sync QStyleHelper code with the latest code in qtbase dev branchDmitry Shachnev2015-08-262-47/+83
| | | | | Change-Id: Ib50a7a9d2732f84edfb8cc926d695db34ed0a791 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Cleanlooks style: Fix floating point exceptionAlexandre Rostovtsev2014-06-051-1/+1
| | | | | | | | | | | | | | | | In QCleanlooksStyle::drawControl, if indeterminate == true and rect.width() == 4, we will end up with slideWidth of zero, and take a mod by zero when calculating the value of step. Identical code in Qt4 Cleanlooks causes a crash in Quassel 0.10; see https://bugs.gentoo.org/show_bug.cgi?id=507124 Instead, calculate slideWidth based on max(width, minWidth) where minWidth was already set as 4, ensuring that slideWidth >= 2. Change-Id: Id3e39437665be326358f68c48eaf1249b6880c4a Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Do not use export macros for pluginsv5.0.0Patrick Spendrin2013-02-134-4/+4
| | | | | | | | | this fixes build problems under windows and won't change anything under other platforms Change-Id: I96575aaa449b6a94e7971d401ae8ba9bf76a9078 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* sync.profile: point to qtbase/stableJ-P Nurmi2013-01-281-1/+1
| | | | | Change-Id: I800c2513961f8b097005275b3d2afdca2aa67965 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Plastique: inherit QProxyStyle instead of QWindowsStyleJ-P Nurmi2012-11-202-26/+27
| | | | | | | | | The QStyle specializations will be made internal in Qt 5. Clients must use QProxyStyle and/or QStyleFactory instead of creating or inheriting specific style classes directly. Change-Id: I2830f92c377e81eb9bbe78f14ae93b1a6445a971 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Cleanlooks: inherit QProxyStyle instead of QWindowsStyleJ-P Nurmi2012-11-202-27/+28
| | | | | | | | | The QStyle specializations will be made internal in Qt 5. Clients must use QProxyStyle and/or QStyleFactory instead of creating or inheriting specific style classes directly. Change-Id: I4ffe1e8e03624b071bd8fa6158911691976ed2c4 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fix shared.priJ-P Nurmi2012-11-051-4/+4
| | | | | | | | | Relying on DEPENDPATH is no longer enough: WARNING: Failure to find: <shared file> Change-Id: Ia757c81a877a4d579d6150421d2dd91d1b322fe1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Adjust to qt_plugin.prf changesJ-P Nurmi2012-11-053-12/+3
| | | | | | | | | DESTDIR and INSTALLS+=target are set up automatically now, but PLUGIN_TYPE needs to be defined. Change-Id: Id652b3067aac4a47ccb64332c03ba2ba1b815c17 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Restored QCDEStyleJ-P Nurmi2012-11-025-1/+382
| | | | | Change-Id: Ic09381943ebb92ec680073301739fc494d02fe5a Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* QMotifStyle is backJ-P Nurmi2012-11-026-0/+2719
| | | | | Change-Id: I9c14d2e3ca95426cf9383a6086555681d34f2f0f Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Revive QPlastiqueStyleJ-P Nurmi2012-11-026-1/+6061
| | | | | Change-Id: I8dec6a97c9cc71ce3f4e86766518b00994f82312 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Bring QCleanlooksStyle back to lifeJ-P Nurmi2012-11-026-1/+4683
| | | | | Change-Id: I7ca4d5b3c33a8389e42162a4d677832627b7db2c Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Copied QHexString, QStyleHelper & QStyleCache from QtBaseJ-P Nurmi2012-11-015-0/+654
| | | | | Change-Id: I26263f71cb69e36ca4c82f524b8952e559942586 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Setup the repo infrastructureJ-P Nurmi2012-10-259-0/+39
| | | | | | | Change-Id: I4c0511d2d7231712ec7b6b31794b04bd32605715 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Initial empty repositorySergio Ahumada2012-10-240-0/+0